]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/log
ceph-ansible.git
8 years agodocker: fix mkdir path for all the distros
Sébastien Han [Wed, 1 Feb 2017 16:19:07 +0000 (17:19 +0100)]
docker: fix mkdir path for all the distros

On ubntu systems mkdir is in /bin where on atomic it is /usr/bin/.
We use the shell built-in function "command" to find its right location.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agodocker: fail if systemd is not present
Sébastien Han [Wed, 1 Feb 2017 16:18:17 +0000 (17:18 +0100)]
docker: fail if systemd is not present

Since we treat containers as services using systemd, systemd is an
absolute requirement.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agodocker: use systemd to manage container
Sébastien Han [Wed, 1 Feb 2017 16:12:46 +0000 (17:12 +0100)]
docker: use systemd to manage container

Since we now only support systemd has an init system we can finally
treat containers as processes using systemd and this for all the
distros.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #995 from ceph/serial-task
Andrew Schoen [Tue, 31 Jan 2017 17:35:56 +0000 (11:35 -0600)]
Merge pull request #995 from ceph/serial-task

common: serialise host restart

8 years agoci: set replica count to 1 since we have a single osd 995/head
Sébastien Han [Tue, 31 Jan 2017 14:29:35 +0000 (15:29 +0100)]
ci: set replica count to 1 since we have a single osd

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agocommon: serialise host restart
Sébastien Han [Thu, 22 Sep 2016 15:03:14 +0000 (17:03 +0200)]
common: serialise host restart

This commits allows us to restart Ceph daemon machine by machine instead
of restarting all the daemons in a single shot.

Rework the structure of the handler for clarity as well.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1243 from guits/refact_code
Sébastien Han [Tue, 31 Jan 2017 11:07:43 +0000 (12:07 +0100)]
Merge pull request #1243 from guits/refact_code

Remove support of releases prior to Jewel.

8 years agoRemove support of releases prior to Jewel. 1243/head
Guillaume Abrioux [Fri, 20 Jan 2017 09:14:35 +0000 (10:14 +0100)]
Remove support of releases prior to Jewel.

According to #1216, we need to simply the code by removing the
support of anything before Jewel.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoRevert "ci: dummy commit to debug"
Sébastien Han [Tue, 31 Jan 2017 08:19:55 +0000 (09:19 +0100)]
Revert "ci: dummy commit to debug"

This reverts commit ff135a50243f35e2345a73de5fb25338dea3d74b.

8 years agoMerge pull request #1254 from ceph/osd-dir-exist
Sébastien Han [Tue, 31 Jan 2017 07:46:22 +0000 (08:46 +0100)]
Merge pull request #1254 from ceph/osd-dir-exist

Osd dir exist and purge fixes

8 years agoceph-common: update apt cache in it's own task 1254/head
Andrew Schoen [Mon, 30 Jan 2017 23:15:08 +0000 (17:15 -0600)]
ceph-common: update apt cache in it's own task

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoci: dummy commit to debug
Sébastien Han [Mon, 30 Jan 2017 14:41:18 +0000 (15:41 +0100)]
ci: dummy commit to debug

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1257 from clwells/rgw-restart-handler
Sébastien Han [Mon, 30 Jan 2017 13:38:35 +0000 (14:38 +0100)]
Merge pull request #1257 from clwells/rgw-restart-handler

Use ansible_hostname instead of ansible_host in handler

8 years agoMerge pull request #1256 from clwells/rgw-ceph-conf-zone-fix
Sébastien Han [Mon, 30 Jan 2017 13:37:53 +0000 (14:37 +0100)]
Merge pull request #1256 from clwells/rgw-ceph-conf-zone-fix

Using ini_file + ansible_hostname for rgw_zone setting

8 years agocommon: create ceph initial directories
Sébastien Han [Mon, 30 Jan 2017 10:05:01 +0000 (11:05 +0100)]
common: create ceph initial directories

Some users purge their environments and leave it in a non-optimal state.
e.g: packages are still installed but /etc/ceph and /var/lib/ceph don't
exist anymore. This will result in multiple failures across the play,
sometimes hard to detect. Populating these directories "just in case"
should help us solving these problems.

Closes: #1253
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agopurge: do not stop ceph.target on each daemon
Sébastien Han [Fri, 27 Jan 2017 14:40:41 +0000 (15:40 +0100)]
purge: do not stop ceph.target on each daemon

Doing this cause some all the daemons to go down at the same time. In a
scenario where we colocate a monitor and an osd, this osds will take
some time to go down which will make the 'umount' task fail.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agopurge: do not fail on purge ceph files
Sébastien Han [Fri, 27 Jan 2017 12:45:16 +0000 (13:45 +0100)]
purge: do not fail on purge ceph files

On systems running docker there is an issue with lxfs that results in
the find command returning 1 but actually did the job.
e.g: on a system with docker runnning find /var will give us the
following error:

find:
'/var/lib/lxcfs/cgroup/devices/lxc/x1/system.slice/systemd-update-utmp.service/devices.deny':
Permission denied
find:
'/var/lib/lxcfs/cgroup/devices/lxc/x1/system.slice/dev-random.mount/devices.allow':
Permission denied
...
...

However ceph files got deleted so we ignore the error.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agopurge: fix ubuntu purge when not using systemd
Sébastien Han [Fri, 27 Jan 2017 10:33:37 +0000 (11:33 +0100)]
purge: fix ubuntu purge when not using systemd

We now rely on the cli tool ceph-detect-init which will tell us the init
system in used on the distribution. We do this instead of the previous
lookup for systemd unit files to call the right task depending on the
init system.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agopurge: allow purge to run multiple times
Sébastien Han [Fri, 27 Jan 2017 10:21:04 +0000 (11:21 +0100)]
purge: allow purge to run multiple times

with_items is evaluated before the when so in a second run where the
variable is empty if will fail with "'dict object' has no attribute
'stdout_lines'". To fix this we had a default array so with_items does
not fail and the task is skipped with the when.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoosd: make sure osd directory exists
Sébastien Han [Fri, 27 Jan 2017 10:10:21 +0000 (11:10 +0100)]
osd: make sure osd directory exists

Sometimes users for testing, tend to delete the whole /var/lib/ceph and
then run ansible again, OSD will never come up if we do not create their
directory.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoUse hostname instead of host (host can be an IP) and hostname matches the default... 1257/head
Chris Wells [Sat, 28 Jan 2017 18:09:03 +0000 (13:09 -0500)]
Use hostname instead of host (host can be an IP) and hostname matches the default nomenclature in ceph.conf

8 years agoUsing ini_file with ansible_hostname to ensure each INI block gets the rgw_zone setti... 1256/head
Chris Wells [Sat, 28 Jan 2017 17:30:27 +0000 (12:30 -0500)]
Using ini_file with ansible_hostname to ensure each INI block gets the rgw_zone setting in a multi-RGW setup.  Also, ansible_hostname better matches what ceph-common does for the actual hostname (ansible_host != ansible_hostname under all conditions).

8 years agoMerge pull request #1250 from ceph/new-tests
Sébastien Han [Fri, 27 Jan 2017 13:30:45 +0000 (14:30 +0100)]
Merge pull request #1250 from ceph/new-tests

CI testing updates

8 years agoMerge pull request #1252 from font/docker_extra_env_vars
Sébastien Han [Fri, 27 Jan 2017 13:19:00 +0000 (14:19 +0100)]
Merge pull request #1252 from font/docker_extra_env_vars

Docker extra env vars

8 years agotests/purge_cluster: setup a xenial cluster instead of centos7 1250/head
Andrew Schoen [Fri, 27 Jan 2017 12:12:10 +0000 (06:12 -0600)]
tests/purge_cluster: setup a xenial cluster instead of centos7

The purge_dmcrypt scenario also tests centos7, so change this one to
xenial so we can have more test coverage.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agopurge-cluster: fix failure when raw_multi_journal is not defined
Andrew Schoen [Thu, 26 Jan 2017 18:07:42 +0000 (12:07 -0600)]
purge-cluster: fix failure when raw_multi_journal is not defined

Because the purge-cluster.yml playbook does not have access to the roles
default vars then we can be sure that raw_multi_journal is defined. For
example, if this was purging a dmcrypt journal then raw_multi_journal
might not be defined at all in group_vars/all.yml or
group_vars/osds.yml.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoUpdate to use consistent docker extra env vars 1252/head
Ivan Font [Thu, 26 Jan 2017 23:57:34 +0000 (15:57 -0800)]
Update to use consistent docker extra env vars

This playbook was still referencing the old version of the
ceph_*_docker_extra_env but only for Ceph MONs and Ceph NFS. This
playbook was not kept up-to-date when updating the
ceph_*_docker_extra_env variables to add the '-e' option to docker.
That's because the addition of '-e' breaks this playbook as it requires
a comma separated list of variables for the 'env:' docker module
parameter. Therefore this change just makes the playbook consistently
broken by referencing the same variable throughout.

8 years agoRemove reference to old OSD docker extra env vars
Ivan Font [Thu, 26 Jan 2017 23:53:39 +0000 (15:53 -0800)]
Remove reference to old OSD docker extra env vars

This variable is already defined as a global default in the OSD role and
was not being kept in sync as we now require the '-e' parameter prefixed
to each variable. This was also missing the CLUSTER environment variable
that is defined in the global default version of
ceph_osd_docker_extra_env.

8 years agoUpdate all docker sample extra environment vars
Ivan Font [Thu, 26 Jan 2017 23:50:49 +0000 (15:50 -0800)]
Update all docker sample extra environment vars

Bring docker sample extra environment variables in sync with the global
defaults for each role. Previous definitions were no longer used.

8 years agopurge-cluster: fix syntax when deleting dmcrypt devices
Andrew Schoen [Thu, 26 Jan 2017 17:28:30 +0000 (11:28 -0600)]
purge-cluster: fix syntax when deleting dmcrypt devices

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: adds purge_cluster and purge_dmcrypt scenarios
Andrew Schoen [Thu, 26 Jan 2017 16:38:10 +0000 (10:38 -0600)]
tests: adds purge_cluster and purge_dmcrypt scenarios

This also removes the purge_cluster_collocated scenario as it's not
needed now because of purge_cluster.

Moving all the purge commands into its own section allows for ease of
reuse when creating new purge scenarios.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests/journal_collocation: adds testing values to ceph_conf_overrides
Andrew Schoen [Thu, 26 Jan 2017 14:53:57 +0000 (08:53 -0600)]
tests/journal_collocation: adds testing values to ceph_conf_overrides

This gives test coverage to changes introduced in:

https://github.com/ceph/ceph-ansible/pull/1214

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1214 from ceph/rbd-pool-size
Andrew Schoen [Wed, 25 Jan 2017 23:10:29 +0000 (17:10 -0600)]
Merge pull request #1214 from ceph/rbd-pool-size

mon: make sure osd_pool_default_size is honoured

8 years agoMerge pull request #1235 from ceph/purge
Andrew Schoen [Wed, 25 Jan 2017 22:22:28 +0000 (16:22 -0600)]
Merge pull request #1235 from ceph/purge

Purge

8 years agomon: make sure osd_pool_default_size is honoured 1214/head
Sébastien Han [Tue, 3 Jan 2017 12:48:59 +0000 (13:48 +0100)]
mon: make sure osd_pool_default_size is honoured

This patch makes sure we set the proper pool size on the rbd pool.
Usually during bootstrap the rbd pool size is not honoured so we need to
add this workaround.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agopurge: remove dm-crypt devices 1235/head
Sébastien Han [Thu, 19 Jan 2017 14:28:44 +0000 (15:28 +0100)]
purge: remove dm-crypt devices

When running encrypted OSDs, an encrypted device mapper is used (because
created by the crypsetup tool). So before attempting to remove all the
partitions on a device we must delete all the encrypted device mappers,
then we can delete all the partitions.

Signed-off-by: Sébastien Han <seb@redhat.com>
 Please enter the commit message for your changes. Lines starting

8 years agoMerge pull request #1247 from ceph/BZ-1416010
Sébastien Han [Tue, 24 Jan 2017 17:22:42 +0000 (18:22 +0100)]
Merge pull request #1247 from ceph/BZ-1416010

Adds ip_version configuration option

8 years agoAdds ip_version configuration option 1247/head
Andrew Schoen [Tue, 24 Jan 2017 15:06:10 +0000 (09:06 -0600)]
Adds ip_version configuration option

This allows the user to set ip_version to either ipv4 or ipv6. This
resolves a bug where monitor_address is set to an ipv6 address, but the
template fails to render because it's hardcoded to look for an 'ipv4'
key in the ansible facts.

See: https://bugzilla.redhat.com/show_bug.cgi?id=1416010

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: bz#1416010

8 years agoMerge pull request #1246 from tynorth-cisco/unique-pools
Sébastien Han [Tue, 24 Jan 2017 11:08:51 +0000 (12:08 +0100)]
Merge pull request #1246 from tynorth-cisco/unique-pools

add unique filter to openstack pool names

8 years agoadd unique filter to openstack pool names 1246/head
tynorth-cisco [Mon, 23 Jan 2017 19:53:43 +0000 (11:53 -0800)]
add unique filter to openstack pool names

could have scenario where different openstack components would
use the same pool, but the logic would create the same pool
more than once

add unique filter to account for this

8 years agoMerge pull request #1146 from ceph/client-pool
Andrew Schoen [Mon, 23 Jan 2017 16:17:21 +0000 (10:17 -0600)]
Merge pull request #1146 from ceph/client-pool

mon: pool creation and pgs

8 years agotests/xenial_cluster: adds a client node 1146/head
Andrew Schoen [Mon, 23 Jan 2017 15:22:06 +0000 (09:22 -0600)]
tests/xenial_cluster: adds a client node

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotest: add tests for the client role
Sébastien Han [Wed, 18 Jan 2017 16:50:29 +0000 (17:50 +0100)]
test: add tests for the client role

Here we test the client role.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1226 from Logan2211/enhance-rgw-config
Sébastien Han [Fri, 20 Jan 2017 09:58:14 +0000 (10:58 +0100)]
Merge pull request #1226 from Logan2211/enhance-rgw-config

Enhance RGW config options

8 years agoRGW: Add resolve cname configuration parameter 1226/head
Logan V [Mon, 16 Jan 2017 14:29:56 +0000 (08:29 -0600)]
RGW: Add resolve cname configuration parameter

Adds a switch to enable bucket resolution using DNS CNAME provided
by the client's HTTP headers.

8 years agoRGW: Add static website hosting configuration
Logan V [Mon, 16 Jan 2017 14:27:44 +0000 (08:27 -0600)]
RGW: Add static website hosting configuration

8 years agoRGW: Allow configurable rgw frontends setting
Logan V [Mon, 16 Jan 2017 14:14:02 +0000 (08:14 -0600)]
RGW: Allow configurable rgw frontends setting

Allow for more operator flexibility in the `rgw frontends` setting
while maintaining backwards compatibility with the old vars. This
allows an operator to, for example, use the civetweb settings for
implementing SSL ports.

For available civetweb configuration parameters, see:
https://github.com/civetweb/civetweb/blob/master/docs/UserManual.md

8 years agoRGW: Add support for usage log configuration
Logan V [Thu, 15 Dec 2016 16:35:56 +0000 (10:35 -0600)]
RGW: Add support for usage log configuration

Adds support for configuring the RadosGW usage log described at
http://docs.ceph.com/docs/jewel/man/8/radosgw/#usage-logging.

8 years agoMerge pull request #1227 from Logan2211/resync-group-vars-sample
Andrew Schoen [Thu, 19 Jan 2017 15:57:54 +0000 (09:57 -0600)]
Merge pull request #1227 from Logan2211/resync-group-vars-sample

Remove libcephfs1 from group_vars sample

8 years agomon: fix mds pool creation
Sébastien Han [Thu, 19 Jan 2017 13:35:00 +0000 (14:35 +0100)]
mon: fix mds pool creation

It is not enough to check for the mds to exists, it actually always does
because we declare the variable. So we need to make sure that there is a
mds host.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1200 from ceph/contrib-branches
Sébastien Han [Thu, 19 Jan 2017 12:43:04 +0000 (13:43 +0100)]
Merge pull request #1200 from ceph/contrib-branches

contrib: push all new stable branches to the galaxy

8 years agocontrib: use prune to fetch 1200/head
Sébastien Han [Mon, 19 Dec 2016 09:05:44 +0000 (10:05 +0100)]
contrib: use prune to fetch

Sometimes git keeps data from remotes that are not up-to-date, i.e:
remote branches.
Using `--prune` will delete non-existing remote branches from git's caches.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agocontrib: push all new stable branches to the galaxy
Sébastien Han [Fri, 16 Dec 2016 22:27:33 +0000 (23:27 +0100)]
contrib: push all new stable branches to the galaxy

Prior to this patch we were only pushing 'master' and 'ansible-1.9'
branches. Each new release also introduces a new branch so we want to
push it as well.

Yes the 'grep' is a bit ugly, feel free to come up with something nicer :)

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agomon: pool creation and pgs
Sébastien Han [Mon, 5 Dec 2016 13:21:54 +0000 (14:21 +0100)]
mon: pool creation and pgs

Since we introduced config_overrides we removed a lot of options from
the default template. In some cases, like mds pool, openstack pools etc
we need to know the amount of PGs required. The idea here is to skip the
task if ceph_conf_overrides.global.osd_pool_default_pg_num is not define
in your `group_vars/all.yml`.

Closes: #1145
Signed-off-by: Sébastien Han <seb@redhat.com>
Co-Authored-By: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1240 from ceph/galaxy-script-update
Sébastien Han [Thu, 19 Jan 2017 10:30:05 +0000 (11:30 +0100)]
Merge pull request #1240 from ceph/galaxy-script-update

ceph-docker-common: include a README and add to galaxy deployment script

8 years agoceph-docker-common: adds a README file 1240/head
Andrew Schoen [Wed, 18 Jan 2017 17:06:25 +0000 (11:06 -0600)]
ceph-docker-common: adds a README file

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoadds ceph-docker-common to the script that updates ansible galaxy
Andrew Schoen [Wed, 18 Jan 2017 17:00:51 +0000 (11:00 -0600)]
adds ceph-docker-common to the script that updates ansible galaxy

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1239 from ceph/ceph-docker-common-meta
Sébastien Han [Wed, 18 Jan 2017 16:48:45 +0000 (17:48 +0100)]
Merge pull request #1239 from ceph/ceph-docker-common-meta

ceph-docker-common: include a meta/main.yml so we can use galaxy

8 years agoceph-docker-common: include a meta/main.yml so we can use galaxy 1239/head
Andrew Schoen [Wed, 18 Jan 2017 16:46:48 +0000 (10:46 -0600)]
ceph-docker-common: include a meta/main.yml so we can use galaxy

This role needs a meta/main.yml before we can upload it to ansible
galaxy.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1229 from ceph/docker-fixes
Sébastien Han [Wed, 18 Jan 2017 13:54:12 +0000 (14:54 +0100)]
Merge pull request #1229 from ceph/docker-fixes

adds a ceph-docker-common role and enables custom registry usage

8 years agopurge: remove zap_block_devs variable
Sébastien Han [Wed, 18 Jan 2017 09:55:01 +0000 (10:55 +0100)]
purge: remove zap_block_devs variable

The name of this variable was a bit confusing since its activation will
zap all the block devices no matter which osd scenario we are using.
Removing this variable and applying a condition on the OSD scenario is
now feasible and easier since we import group_vars variable files for
OSDs.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agopurge: cosmetic cleanup
Sébastien Han [Wed, 18 Jan 2017 09:53:21 +0000 (10:53 +0100)]
purge: cosmetic cleanup

Just applying our writing syntax convention in the playbook.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1230 from lae/kraken-run-ceph-create-keys
Sébastien Han [Tue, 17 Jan 2017 15:18:18 +0000 (16:18 +0100)]
Merge pull request #1230 from lae/kraken-run-ceph-create-keys

mon: run ceph-create-keys after startup for kraken release

8 years agomon: run ceph-create-keys after startup for kraken release 1230/head
Musee Ullah [Tue, 17 Jan 2017 12:13:43 +0000 (21:13 +0900)]
mon: run ceph-create-keys after startup for kraken release

8 years agoMerge pull request #1185 from ceph/ansible-test-version
Andrew Schoen [Mon, 16 Jan 2017 21:49:43 +0000 (15:49 -0600)]
Merge pull request #1185 from ceph/ansible-test-version

bump ansible testing version to 2.2.1 for the 2.2 environment

8 years agotests: remove the pip install ansible from stable github branch 1185/head
Alfredo Deza [Mon, 16 Jan 2017 21:19:25 +0000 (16:19 -0500)]
tests: remove the pip install ansible from stable github branch

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agotests: bump ansible testing version to 2.2.1 for the 2.2 environment
Alfredo Deza [Wed, 14 Dec 2016 15:57:40 +0000 (10:57 -0500)]
tests: bump ansible testing version to 2.2.1 for the 2.2 environment

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agoceph-osd: use ceph_docker_registry when preparing OSDs 1229/head
Andrew Schoen [Mon, 16 Jan 2017 17:39:13 +0000 (11:39 -0600)]
ceph-osd: use ceph_docker_registry when preparing OSDs

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoadd ceph_docker_registry to all.docker.yml.sample
Andrew Schoen [Mon, 16 Jan 2017 17:33:20 +0000 (11:33 -0600)]
add ceph_docker_registry to all.docker.yml.sample

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agouse ceph_docker_registry when starting containers
Andrew Schoen [Mon, 16 Jan 2017 17:17:41 +0000 (11:17 -0600)]
use ceph_docker_registry when starting containers

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoceph-docker-common: add symlink to ceph.ceph-docker-common
Andrew Schoen [Mon, 16 Jan 2017 16:17:36 +0000 (10:17 -0600)]
ceph-docker-common: add symlink to ceph.ceph-docker-common

This allows for the role to be used with ansible-galaxy and to fix the
include in all the meta/main.yml files in the roles.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agouse ceph_docker_registry in all the roles instead of docker.io
Andrew Schoen [Mon, 16 Jan 2017 15:52:20 +0000 (09:52 -0600)]
use ceph_docker_registry in all the roles instead of docker.io

This allows for ceph-ansible to use other docker registries.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoceph-common: include ceph_docker_registry when fetching the image
Andrew Schoen [Mon, 16 Jan 2017 15:51:20 +0000 (09:51 -0600)]
ceph-common: include ceph_docker_registry when fetching the image

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agouse ceph-docker-common in roles that support docker deployments
Andrew Schoen [Mon, 16 Jan 2017 15:30:53 +0000 (09:30 -0600)]
use ceph-docker-common in roles that support docker deployments

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoceph-docker-common: a new role to share things common to docker
Andrew Schoen [Mon, 16 Jan 2017 15:28:40 +0000 (09:28 -0600)]
ceph-docker-common: a new role to share things common to docker

We can use this to share common variables and tasks needed for every
containerized deployment.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoRemove libcephfs1 from group_vars sample 1227/head
Logan V [Mon, 16 Jan 2017 14:12:15 +0000 (08:12 -0600)]
Remove libcephfs1 from group_vars sample

The libcephfs1 package was removed from ceph-common in
cb1c06901e02a9f44c24a5d20737a9f33ac8ab2b, however it was not synced
to group_vars/all.yml.sample using the `generate_group_vars_sample.sh`
script. This fixes up the comment formatting in the ceph-common
defaults and brings the group_vars sample back into sync.

8 years agoMerge pull request #1225 from D3N14L/osd_directories_default
Andrew Schoen [Fri, 13 Jan 2017 19:29:51 +0000 (13:29 -0600)]
Merge pull request #1225 from D3N14L/osd_directories_default

Set empty list as default for osd_directories

8 years agoAdded osd_directories to osd group_vars sample file 1225/head
Daniel Marks [Fri, 13 Jan 2017 18:36:10 +0000 (19:36 +0100)]
Added osd_directories to osd group_vars sample file

8 years agoSet empty list as default for osd_directories
Daniel Marks [Fri, 13 Jan 2017 14:27:16 +0000 (15:27 +0100)]
Set empty list as default for osd_directories

As described in issue #1224 leaving this variable undefined may
cause a problem during execution of the ceph-osd role.

8 years agoMerge pull request #1221 from ceph/purge-cluster-fixes
Alfredo Deza [Wed, 11 Jan 2017 13:59:58 +0000 (08:59 -0500)]
Merge pull request #1221 from ceph/purge-cluster-fixes

tests: fixes for purge_cluster_collocated

8 years agopurge-cluster: do not include ceph-osd and ceph-common defaults for osds 1221/head
Andrew Schoen [Tue, 10 Jan 2017 22:57:58 +0000 (16:57 -0600)]
purge-cluster: do not include ceph-osd and ceph-common defaults for osds

When purging OSDs we do not need to include these defaults as nothing in
the following tasks uses them. Also, it has the side effect of
overwriting any variables defined in group_vars files that are relative
to the inventory you are using with the default values. That behavior
was causing the CI tests to fail.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: copy purge-cluster.yml to root of ceph-ansible
Andrew Schoen [Tue, 10 Jan 2017 22:56:07 +0000 (16:56 -0600)]
tests: copy purge-cluster.yml to root of ceph-ansible

There is an Ansible bug which makes the playbook fail when we are
running a playbook from the non-git root directory. The real problem is
that the ansible.cfg is not honoured and we are including variable from
roles/<role>/defaults/main.yml

The fix is too copy the purge cluster playbook on the git root directory
and execute it.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1220 from ceph/latest-ansible2.2
Alfredo Deza [Tue, 10 Jan 2017 21:56:29 +0000 (16:56 -0500)]
Merge pull request #1220 from ceph/latest-ansible2.2

tests: test with the latest ansible stable-2.2 branch from github

8 years agotests: test with the latest ansible stable-2.2 branch from github 1220/head
Andrew Schoen [Tue, 10 Jan 2017 12:53:17 +0000 (06:53 -0600)]
tests: test with the latest ansible stable-2.2 branch from github

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1208 from clwells/multisite-defined-endpoint
Sébastien Han [Tue, 10 Jan 2017 21:12:04 +0000 (16:12 -0500)]
Merge pull request #1208 from clwells/multisite-defined-endpoint

[rtr] Granular Multi-site PULL Variables

8 years agore-regenerated group vars 1208/head
Chris Wells [Sat, 7 Jan 2017 14:33:56 +0000 (09:33 -0500)]
re-regenerated group vars

8 years agoUpdated pull[port|proto] to pull_[port|proto] and regenerated base group vars
Chris Wells [Sat, 7 Jan 2017 14:33:24 +0000 (09:33 -0500)]
Updated pull[port|proto] to pull_[port|proto] and regenerated base group vars

8 years agoMerge pull request #1217 from ceph/ceph-common-tag
Andrew Schoen [Thu, 5 Jan 2017 22:18:01 +0000 (16:18 -0600)]
Merge pull request #1217 from ceph/ceph-common-tag

ceph-common: always include release.yml

8 years agoceph-common: always include release.yml 1217/head
Ken Dreyer [Thu, 5 Jan 2017 21:29:53 +0000 (14:29 -0700)]
ceph-common: always include release.yml

Prior to this change, a playbook run with '--tags' or '--skip-tags'
would fail, because the ceph-common role would not include the
release.yml task, and this file defines critical things like
ceph_release.

Thanks Andrew Schoen <aschoen@redhat.com> for help with the fix.

8 years agoMerge pull request #1215 from ceph/purge-cluster-tests
Alfredo Deza [Tue, 3 Jan 2017 22:18:29 +0000 (17:18 -0500)]
Merge pull request #1215 from ceph/purge-cluster-tests

tests: adds a purge_cluster_collocated scenario

8 years agotests: adds a purge_cluster_collocated scenario 1215/head
Andrew Schoen [Thu, 22 Dec 2016 20:13:08 +0000 (14:13 -0600)]
tests: adds a purge_cluster_collocated scenario

This scenario brings up a 1 mon 1 osd cluster using journal collocation,
purges the cluster and then verifies it can redeploy the cluster.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agopurge-cluster: get journal partitions after zapping osd disks
Andrew Schoen [Thu, 22 Dec 2016 19:47:22 +0000 (13:47 -0600)]
purge-cluster: get journal partitions after zapping osd disks

In my testing zapping the osd disks deleted the journal
partitions, making the 'zap ceph journal partitions' task fail because
the partitions it found previously do not exist anymore.

This moves the task that finds the journal partitions after 'zap osd disks'
to catch any partitions ceph-disk might have missed.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agopurge-cluster: use ignore_errors: true when including group_vars files
Andrew Schoen [Thu, 22 Dec 2016 17:37:41 +0000 (11:37 -0600)]
purge-cluster: use ignore_errors: true when including group_vars files

Using failed_when will still throw an exception and stop the playbook if
the file you're trying to include doesn't exist.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1171 from cbodley/wip-libcephfs2
Sébastien Han [Tue, 3 Jan 2017 09:48:56 +0000 (10:48 +0100)]
Merge pull request #1171 from cbodley/wip-libcephfs2

bump package version to libcephfs2

8 years agoMerge pull request #1212 from ceph/cluster-name-info
Sébastien Han [Tue, 3 Jan 2017 09:18:41 +0000 (10:18 +0100)]
Merge pull request #1212 from ceph/cluster-name-info

common: document "cluster" variable usage

8 years agoMerge pull request #1213 from ceph/cephx-initial-mon
Sébastien Han [Mon, 2 Jan 2017 12:43:22 +0000 (13:43 +0100)]
Merge pull request #1213 from ceph/cephx-initial-mon

mon: only put mon initial key in mon kv when cephx is enabled

8 years agomon: only put mon initial key in mon kv when cephx is enabled 1213/head
Sébastien Han [Mon, 2 Jan 2017 10:16:03 +0000 (11:16 +0100)]
mon: only put mon initial key in mon kv when cephx is enabled

Task put initial mon keyring in mon kv store from
ceph-mon/tasks/ceph_keys.yml is failing when cephx is disabled. The root
cause is that variable monitor_keyring is not populated by any task from
deploy_monitors.yml.

Fixes: #1211
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1209 from zhsj/fix-check-firewall
Sébastien Han [Mon, 2 Jan 2017 09:44:20 +0000 (10:44 +0100)]
Merge pull request #1209 from zhsj/fix-check-firewall

fix check nmapexist on debian

8 years agocommon: document "cluster" variable usage 1212/head
Sébastien Han [Mon, 2 Jan 2017 08:20:43 +0000 (09:20 +0100)]
common: document "cluster" variable usage

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1408848
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agofix check nmapexist on debian 1209/head
Shengjing Zhu [Wed, 28 Dec 2016 08:21:23 +0000 (16:21 +0800)]
fix check nmapexist on debian

command is a shell-buitin, so `command -v nmap` must use shell module

Signed-off-by: Shengjing Zhu <zsj950618@gmail.com>