]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/log
ceph-ansible.git
9 years agoci: set replica count to 1 since we have a single osd 1260/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>
(cherry picked from commit 6e9da95b3303277c8175e25314f4638ae7930aa8)

9 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>
(cherry picked from commit 40a2df5bbf13685c83ddc0b784b97e8a76414006)

Conflicts:
roles/ceph-common/handlers/main.yml
roles/ceph-common/tasks/generate_ceph_conf.yml

9 years agoMerge pull request #1259 from ceph/backport-1254
Andrew Schoen [Tue, 31 Jan 2017 14:55:04 +0000 (08:55 -0600)]
Merge pull request #1259 from ceph/backport-1254

Backport: "Osd dir exist and purge fixes #1254"

9 years agoceph-common: update apt cache in it's own task 1259/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>
(cherry picked from commit 7dc9c4b5b683a0d870a0b4401f99dfa30071350b)

9 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>
(cherry picked from commit 1149825f8f5498b09fc26bb52da99c82db68c8e5)

9 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>
(cherry picked from commit d5dd658cfa1a11fdb92d162c368a0e664d98d525)

9 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>
(cherry picked from commit cb57a359ba77bbb62d531666a547bef5b5d67c44)

9 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>
(cherry picked from commit e371bd591c45ad9e18fda9fcd938b736044146e2)

9 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>
(cherry picked from commit 0e2e270ab238f63285422fed90fc773d9e4ae0be)

9 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>
(cherry picked from commit 6f53774ee9800bc8755ad90ff85f66420e414581)

9 years agoMerge pull request #1255 from ceph/backport-1250
Andrew Schoen [Fri, 27 Jan 2017 17:22:45 +0000 (11:22 -0600)]
Merge pull request #1255 from ceph/backport-1250

Backport: 'CI testing updates'

9 years agotests/purge_cluster: setup a xenial cluster instead of centos7 1255/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>
(cherry picked from commit 2a87c13f17ed155a60e689909e28b4c18b927586)

9 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>
(cherry picked from commit d3cb8dba4e05f2081051855949b8ec5de34b19f0)

9 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>
(cherry picked from commit b2a6f095f1199a318a7ffaaf00f643811d336b02)

9 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>
(cherry picked from commit e05df64fd0f4e2558eaaeb029899cc3e995c7f32)

9 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>
(cherry picked from commit 20705aa35aee8839865a2ab948a3e13a170523c8)

9 years agoMerge pull request #1251 from ceph/backport-1214
Andrew Schoen [Fri, 27 Jan 2017 01:16:53 +0000 (19:16 -0600)]
Merge pull request #1251 from ceph/backport-1214

Backport: 'mon: make sure osd_pool_default_size is honoured'

9 years agomon: make sure osd_pool_default_size is honoured 1251/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>
(cherry picked from commit e35070f6ce604ee8201d3aa9845366737f7ebbc6)

9 years agoMerge pull request #1249 from ceph/backport-1235
Sébastien Han [Wed, 25 Jan 2017 22:27:00 +0000 (23:27 +0100)]
Merge pull request #1249 from ceph/backport-1235

Backport of purge cluster updates

9 years agopurge: remove dm-crypt devices 1249/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

(cherry picked from commit 73ca1a7a00ae2b8147fb80b7177f54d738439128)

Resolves: backport#1235

9 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>
(cherry picked from commit adeb3decf38bddb2972e597f22a27bf9638fb41e)

Resolves: backport#1235

9 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>
(cherry picked from commit b7fcbe5ca218639e0930a13a7001918606aa64e2)

Resolves: backport#1235

9 years agoMerge pull request #1248 from ceph/backport-1247 v2.1.4
Sébastien Han [Tue, 24 Jan 2017 17:30:48 +0000 (18:30 +0100)]
Merge pull request #1248 from ceph/backport-1247

Backport: Adds ip_version configuration option

9 years agoAdds ip_version configuration option 1248/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
(cherry picked from commit 03cb803bd1bd6da888e0483db40d444cd4ee86e3)

9 years agoMerge pull request #1245 from ceph/backport-1146
Andrew Schoen [Mon, 23 Jan 2017 16:59:05 +0000 (10:59 -0600)]
Merge pull request #1245 from ceph/backport-1146

backport of PR #1146

9 years agotests/xenial_cluster: adds a client node 1245/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>
(cherry picked from commit a774ea025d5c9854efbab1be28e0a832b882140a)

9 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>
(cherry picked from commit 48a8cd1a43aa7f2bd60126eb54fb19702f54d671)

9 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>
(cherry picked from commit 90648e7518fdf858a0af6c8b0cae7160bb6ddf2c)

9 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>
(cherry picked from commit ddac3a1fb5e319d6f778256504c2787746454c79)

9 years agoMerge pull request #1237 from ceph/ceph-docker-common-backport
Alfredo Deza [Wed, 18 Jan 2017 15:51:29 +0000 (10:51 -0500)]
Merge pull request #1237 from ceph/ceph-docker-common-backport

ceph-docker-common backport

9 years agoceph-osd: use ceph_docker_registry when preparing OSDs 1237/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>
(cherry picked from commit 0c55a35963713927e8614d5546a9e6ae3a2414f1)

9 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>
(cherry picked from commit e0d73b52454de521d84f2b1e5afc5978b089aac9)

9 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>
(cherry picked from commit 655b8449aea06aeead3e574a561c0c1c1522e9c1)

9 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>
(cherry picked from commit 3713824b796c9f33ac69056c06f55f56097b3773)

9 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>
(cherry picked from commit 9449dbf083a0810eaeb8c172a9f1bfb3d46574da)

9 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>
(cherry picked from commit 25277587fa5a8e6d47be0406257d3542203e3cfc)

9 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>
(cherry picked from commit c07b7ddbaaf4effa9c8246a8759644898fb1a37c)

9 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>
(cherry picked from commit f770780ddafb9c2004e21e781acc546a73440873)

9 years agoMerge pull request #1233 from ceph/bump-ansible v2.1.3
Andrew Schoen [Tue, 17 Jan 2017 18:17:31 +0000 (12:17 -0600)]
Merge pull request #1233 from ceph/bump-ansible

Bump ansible to 2.2.1

9 years agotests: bump ansible testing version to 2.2.1 for the 2.2 environment 1233/head
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>
(cherry picked from commit 1a4886a561cb3288f015e97d8adef5309ef55947)

9 years agoMerge pull request #1231 from ceph/purge-cluster-fixes v2.1.2
Andrew Schoen [Tue, 17 Jan 2017 17:33:37 +0000 (11:33 -0600)]
Merge pull request #1231 from ceph/purge-cluster-fixes

Purge cluster fixes

9 years agotests: copy purge-cluster.yml to root of ceph-ansible 1231/head
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>
(cherry picked from commit 48ac9579b69972d6aab352662fb7edb61db62ae4)

9 years agopurge-cluster: do not include ceph-osd and ceph-common defaults for osds
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>
(cherry picked from commit dd8389cdf7651f3bb9a02dc00c65bc48a5582bfd)

9 years agotests: adds a purge_cluster_collocated scenario
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>
(cherry picked from commit 0ce18daa493032d78d1d6073187c89e3ca2b07ee)

9 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>
(cherry picked from commit 321cea8ba96cbca19b58aa9bbb76a584c268e2b1)

9 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>
(cherry picked from commit c9e5914377b847f6892d068456ff9dae3074d19d)

9 years agoMerge pull request #1219 from ceph/rhcs-mds-repo-2.1 v2.1.1
Andrew Schoen [Fri, 6 Jan 2017 00:46:34 +0000 (18:46 -0600)]
Merge pull request #1219 from ceph/rhcs-mds-repo-2.1

common: enable tool repo for mds install of rhcs

9 years agocommon: rename rh_storage to rhcs to match product name 1219/head
Sébastien Han [Tue, 20 Dec 2016 12:47:44 +0000 (13:47 +0100)]
common: rename rh_storage to rhcs to match product name

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit d44927de0383d9613e81cabb998b74b17656b78a)

9 years agocommon: enable tool repo for mds install of rhcs
Sébastien Han [Tue, 20 Dec 2016 12:42:24 +0000 (13:42 +0100)]
common: enable tool repo for mds install of rhcs

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1405985
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 775d61ed09632191747694985e70579e1a994a28)

9 years agoMerge pull request #1218 from ceph/ceph-common-tag-2.1
Andrew Schoen [Thu, 5 Jan 2017 22:58:32 +0000 (16:58 -0600)]
Merge pull request #1218 from ceph/ceph-common-tag-2.1

ceph-common: always include release.yml

9 years agoceph-common: always include release.yml 1218/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.

(cherry picked from commit 63e5b5c4061c1307fa864089f198c338d77561a6)

9 years agoMerge pull request #1153 from ceph/cluster-name-test v2.1.0
Andrew Schoen [Fri, 16 Dec 2016 19:10:52 +0000 (13:10 -0600)]
Merge pull request #1153 from ceph/cluster-name-test

test: add cluster name support test scenario

9 years agodocker: only use systemd to manage containers 1153/head
Sébastien Han [Fri, 16 Dec 2016 13:53:14 +0000 (14:53 +0100)]
docker: only use systemd to manage containers

Prior to this patch we had several ways to runs containers, we could use
ansible's docker module on some distro and on containers distros we were
using systemd. We strongly believe threating containers as services with
systemd is the right approach so this patch generalizes to all the
distros. These days most of the distros are running systemd so it's fair
assumption.

Signed-off-by: Sébastien Han <seb@redhat.com>
9 years agodocker: add support for cluster name
Sébastien Han [Wed, 14 Dec 2016 20:22:13 +0000 (21:22 +0100)]
docker: add support for cluster name

We need to honour the cluster name that was chosen by ceph-ansible and
pass it to ceph-docker.

Signed-off-by: Sébastien Han <seb@redhat.com>
9 years agoMerge pull request #1179 from Logan2211/rgw-keystone-v3
Sébastien Han [Fri, 16 Dec 2016 12:52:52 +0000 (13:52 +0100)]
Merge pull request #1179 from Logan2211/rgw-keystone-v3

RGW/Keystone integration improvements

9 years agoMerge pull request #1198 from ceph/mon-key-fix
Sébastien Han [Fri, 16 Dec 2016 12:38:23 +0000 (13:38 +0100)]
Merge pull request #1198 from ceph/mon-key-fix

Mon key fix

9 years agomon: add the initial mon keyring to the mon store 1198/head
Sébastien Han [Fri, 16 Dec 2016 10:42:17 +0000 (11:42 +0100)]
mon: add the initial mon keyring to the mon store

Once we have our first monitor up and running we need to add it to the
monitor store as a safety measure. Just in case the local file gets
deleted and you need to add a new monitor. Now you can retrieve this key
like this:

ceph config-key get initial_mon_keyring > initial_mon_keyring.txt

Signed-off-by: Sébastien Han <seb@redhat.com>
9 years agocommon: do not become root on local task
Sébastien Han [Fri, 16 Dec 2016 10:36:42 +0000 (11:36 +0100)]
common: do not become root on local task

There is no need to become root on local_action. This will event trigger
an error on some systems as it will try to run a sudo command. If the
current user does not have passwordless sudo, Ansible will fail. Anyway
using the current user is perfectly fine and no elevation privilege is
needed.

Signed-off-by: Sébastien Han <seb@redhat.com>
9 years agoAdd support for Keystone v3 API 1179/head
Logan V [Thu, 14 Jul 2016 19:27:03 +0000 (14:27 -0500)]
Add support for Keystone v3 API

The Keystone v2 APIs are deprecated and scheduled to be removed in
Q release of Openstack. This adds support for configuring RGW to
use the current Keystone v3 API.

9 years agoAdd a switch to disable nss PKI database initialization
Logan V [Thu, 14 Jul 2016 19:09:31 +0000 (14:09 -0500)]
Add a switch to disable nss PKI database initialization

The PKI keys are used to decrypt the Keystone revocation list when
PKI tokens are used. When UUID or Fernet token providers are used in
Keystone, PKI certs may not exist, so we now accommodate this scenario
by allowing the operator to disable the PKI tasks.

9 years agoAdd support for Keystone user authentication with RGW
Logan V [Mon, 11 Jul 2016 12:52:11 +0000 (07:52 -0500)]
Add support for Keystone user authentication with RGW

Jewel added support for user/pass authentication with Keystone,
allowing deployers to disable Keystone admin token as required
for production deployments.

This implements configuration for the new RGW Keystone user/pass
authentication feature added in Jewel.

See docs here: http://docs.ceph.com/docs/master/radosgw/keystone/

9 years agoMerge pull request #1178 from zhsj/dev-partition
Sébastien Han [Thu, 15 Dec 2016 21:50:23 +0000 (22:50 +0100)]
Merge pull request #1178 from zhsj/dev-partition

Add prepare osd with partition devices in raw_multi_journal

9 years agoMerge pull request #1194 from ceph/testing-output
Alfredo Deza [Thu, 15 Dec 2016 19:16:31 +0000 (14:16 -0500)]
Merge pull request #1194 from ceph/testing-output

tests: preserve newlines in ansible output when testing

9 years agotests: preserve newlines in ansible output when testing 1194/head
Andrew Schoen [Thu, 15 Dec 2016 18:23:17 +0000 (12:23 -0600)]
tests: preserve newlines in ansible output when testing

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
9 years agoMerge pull request #1195 from ceph/rpm-require-ansible-2.2
Andrew Schoen [Thu, 15 Dec 2016 18:04:26 +0000 (12:04 -0600)]
Merge pull request #1195 from ceph/rpm-require-ansible-2.2

rpm: require Ansible >= 2.2.0.0

9 years agorpm: require Ansible >= 2.2.0.0 1195/head
Ken Dreyer [Thu, 15 Dec 2016 18:01:24 +0000 (11:01 -0700)]
rpm: require Ansible >= 2.2.0.0

This is the only version that our CI uses for testing, so it's the only
version we can confidently say works.

Update the RPM packaging to specifically require this version of
Ansible.

9 years agoMerge pull request #1192 from davidebelloni/master
Sébastien Han [Thu, 15 Dec 2016 16:38:38 +0000 (17:38 +0100)]
Merge pull request #1192 from davidebelloni/master

Adding Proxy support

9 years agoAdding Proxy support 1192/head
Davide Belloni [Thu, 15 Dec 2016 14:28:59 +0000 (15:28 +0100)]
Adding Proxy support

9 years agocommon: add the name of the ceph conf file in the play
Sébastien Han [Wed, 7 Dec 2016 17:22:39 +0000 (18:22 +0100)]
common: add the name of the ceph conf file in the play

Just for clarity and because we can we now show the name of the
ceph configuration file that is generated.

Signed-off-by: Sébastien Han <seb@redhat.com>
9 years agotest: add cluster name support test scenario
Sébastien Han [Tue, 6 Dec 2016 10:20:23 +0000 (11:20 +0100)]
test: add cluster name support test scenario

We need to test the cluster name support in this CI as well. This
commit might be prone to debate because it tests 2 things in a single
scenario. We first test our ability to deploy a cluster AND the cluster
name support. However it's easier to do it this way and will reduce the
amount of time for testingg. If we don't do this we will have a
duplicate those 2 existing tests into new ones 'only' to test the
cluster name support.

Signed-off-by: Sébastien Han <seb@redhat.com>
9 years agoMerge pull request #1167 from guits/ceph-fsid
Sébastien Han [Thu, 15 Dec 2016 14:16:40 +0000 (15:16 +0100)]
Merge pull request #1167 from guits/ceph-fsid

common: do not regenerate initial mon keyring if cluster exists

9 years agoMerge pull request #1191 from ceph/docker-osd-check
Sébastien Han [Thu, 15 Dec 2016 14:16:15 +0000 (15:16 +0100)]
Merge pull request #1191 from ceph/docker-osd-check

osd: docker change required variables for check

9 years agoenable prepare osd with partition devices in raw_multi_journal 1178/head
Shengjing Zhu [Wed, 30 Nov 2016 10:00:39 +0000 (18:00 +0800)]
enable prepare osd with partition devices in raw_multi_journal

Address #895

Signed-off-by: Shengjing Zhu <zsj950618@gmail.com>
9 years agoinfrastructure playbook: add make osd partition
Shengjing Zhu [Wed, 14 Dec 2016 18:14:47 +0000 (02:14 +0800)]
infrastructure playbook: add make osd partition

Signed-off-by: Shengjing Zhu <zsj950618@gmail.com>
9 years agoosd: docker change required variables for check 1191/head
Sébastien Han [Thu, 15 Dec 2016 13:50:04 +0000 (14:50 +0100)]
osd: docker change required variables for check

when running a containerized deployment, some variable are not
applicable thus should not be checked.

Signed-off-by: Sébastien Han <seb@redhat.com>
9 years agocommon: do not regenerate initial mon keyring if cluster exists 1167/head
Guillaume Abrioux [Thu, 8 Dec 2016 15:58:22 +0000 (16:58 +0100)]
common: do not regenerate initial mon keyring if cluster exists

This commit solves the situation where you lost your fetch directory and
you are running ansible against an existing cluster. Since no fetch
directory is present the file containing the initial mon keyring
doesn't exist so we are generating a new one.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
9 years agoMerge pull request #1190 from zhsj/fix-rest-api
Sébastien Han [Thu, 15 Dec 2016 12:43:33 +0000 (13:43 +0100)]
Merge pull request #1190 from zhsj/fix-rest-api

fix ceph-rest-api not using correct configure file

9 years agofix ceph-rest-api not using correct configure file 1190/head
Shengjing Zhu [Thu, 15 Dec 2016 12:17:00 +0000 (20:17 +0800)]
fix ceph-rest-api not using correct configure file

Signed-off-by: Shengjing Zhu <zsj950618@gmail.com>
9 years agoMerge pull request #1186 from ceph/apt-pining
Sébastien Han [Thu, 15 Dec 2016 11:28:45 +0000 (12:28 +0100)]
Merge pull request #1186 from ceph/apt-pining

common: set apt pinning with Red Hat Ceph Storage

9 years agoMerge pull request #1187 from ceph/wait-for
Sébastien Han [Wed, 14 Dec 2016 20:13:11 +0000 (21:13 +0100)]
Merge pull request #1187 from ceph/wait-for

common: show which file we are waiting for

9 years agocommon: show which file we are waiting for 1187/head
Sébastien Han [Wed, 14 Dec 2016 20:08:18 +0000 (21:08 +0100)]
common: show which file we are waiting for

We can now see the name of the file we are waiting for, depending on the
cluster name this will change.

Signed-off-by: Sébastien Han <seb@redhat.com>
9 years agocommon: remove uncessary conditions and spell red hat entirely 1186/head
Sébastien Han [Wed, 14 Dec 2016 18:03:04 +0000 (19:03 +0100)]
common: remove uncessary conditions and spell red hat entirely

We do not need to run another condition for 'ceph_rhcs' since the
include we came from already has it, so we are already inside this
condition.
We also spell red hat entirely instead of rh and we remove capital
letters.

Signed-off-by: Sébastien Han <seb@redhat.com>
9 years agocommon: set apt pinning with Red Hat Ceph Storage
Sébastien Han [Wed, 14 Dec 2016 17:15:02 +0000 (18:15 +0100)]
common: set apt pinning with Red Hat Ceph Storage

When `ceph_stable_rh_storage` is True, every cluster node should have a
`/etc/apt/preferences.d/rhcs.pref` file with the following contents:

```
Explanation: Prefer Red Hat packages
Package: *
Pin: release o=/Red Hat/
Pin-Priority: 999
```

ceph-deploy already did this when used with ice-setup, and we need to do
the same thing with the ceph-ansible stack.

Closes: #1182 and https://bugzilla.redhat.com/show_bug.cgi?id=1404515
Signed-off-by: Sébastien Han <seb@redhat.com>
9 years agoMerge pull request #1180 from ceph/ceph-installer-sync
Sébastien Han [Wed, 14 Dec 2016 17:40:04 +0000 (18:40 +0100)]
Merge pull request #1180 from ceph/ceph-installer-sync

changes needed for ceph-installer support

9 years agoensure site.yml.sample always gathers facts and installs python2 1180/head
Andrew Schoen [Wed, 14 Dec 2016 15:13:55 +0000 (09:13 -0600)]
ensure site.yml.sample always gathers facts and installs python2

Then avoids an issue where if you're using tags to run the playbook then
no facts are gathered, resulting in subsequent tasks failing that depend
on them.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
9 years agoadds the infrastructure-playbooks dir to the rpm packaging
Andrew Schoen [Mon, 12 Dec 2016 21:52:23 +0000 (15:52 -0600)]
adds the infrastructure-playbooks dir to the rpm packaging

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
9 years agoMerge pull request #1184 from ceph/rhbz-1403576
Sébastien Han [Wed, 14 Dec 2016 13:51:43 +0000 (14:51 +0100)]
Merge pull request #1184 from ceph/rhbz-1403576

ceph-agent: do not check for subscription manager for agent install

9 years agoceph-agent: do not check for subscription manager for agent install 1184/head
Alfredo Deza [Wed, 14 Dec 2016 13:13:26 +0000 (08:13 -0500)]
ceph-agent: do not check for subscription manager for agent install

Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: rhbz#1403576

9 years agoMerge pull request #1183 from zhsj/fix-custom-repo
Sébastien Han [Wed, 14 Dec 2016 12:16:58 +0000 (13:16 +0100)]
Merge pull request #1183 from zhsj/fix-custom-repo

fix ceph_custom not usable

9 years agoMerge pull request #1181 from tynorth-cisco/key-issue
Sébastien Han [Wed, 14 Dec 2016 11:35:07 +0000 (12:35 +0100)]
Merge pull request #1181 from tynorth-cisco/key-issue

Change attribute call to .get call in ceph keys

9 years agoMerge pull request #1176 from jstuever/action_plugins
Sébastien Han [Wed, 14 Dec 2016 11:25:31 +0000 (12:25 +0100)]
Merge pull request #1176 from jstuever/action_plugins

Adding symlink to action_plugins so this works in ansible tower

9 years agofix ceph_custom not usable 1183/head
Shengjing Zhu [Wed, 14 Dec 2016 08:55:41 +0000 (16:55 +0800)]
fix ceph_custom not usable

Only when ceph_origin == "upstream", install_on_redhat.yml will include
redhat_ceph_repository.yml, same as debian.

In redhat_ceph_repository.yml, ceph_custom_repo will be added.

But in check_mandatory_vars.yml, ceph_origin=="upstream" can't be combined
with ceph_custom

9 years agoChange attribute call to .get call in ceph keys 1181/head
tynorth-cisco [Wed, 14 Dec 2016 00:48:14 +0000 (16:48 -0800)]
Change attribute call to .get call in ceph keys

If previous check was not run, .stdout_lines is not a valid key on the dictionary.
To get around this, use .get("stdout_lines") instead.

Also add in a default empty list

9 years agoMerge pull request #1158 from ceph/ceph-ansible-docker-vars
Andrew Schoen [Tue, 13 Dec 2016 21:55:51 +0000 (15:55 -0600)]
Merge pull request #1158 from ceph/ceph-ansible-docker-vars

docker: consolidate ceph-ansible and ceph-docker varible

9 years agoMerge pull request #1170 from font/docker_devices
Andrew Schoen [Tue, 13 Dec 2016 21:48:36 +0000 (15:48 -0600)]
Merge pull request #1170 from font/docker_devices

Add devices variable for Vagrantfile docker case

9 years agoMerge pull request #1174 from ceph/evelu-doc
Alfredo Deza [Mon, 12 Dec 2016 21:55:13 +0000 (16:55 -0500)]
Merge pull request #1174 from ceph/evelu-doc

README: Adding mailing list / irc / github entry points

9 years agoMerge pull request #1177 from ceph/makefile-version-detection
Andrew Schoen [Mon, 12 Dec 2016 21:45:35 +0000 (15:45 -0600)]
Merge pull request #1177 from ceph/makefile-version-detection

Makefile: strip "v" from RPM versions, and improve version detection

9 years agoMakefile: improve version detection 1177/head
Ken Dreyer [Mon, 12 Dec 2016 21:20:47 +0000 (14:20 -0700)]
Makefile: improve version detection

Prior to this change, if there was a stray tag in the repository that
did not start with a "v", the Makefile would still try to use that tag
as a version tag when constructing the RPMs.

Only use the tags that start with "v", in this case.

9 years agoMakefile: strip "v" from RPM versions
Ken Dreyer [Mon, 12 Dec 2016 21:17:52 +0000 (14:17 -0700)]
Makefile: strip "v" from RPM versions

Prior to this change, all RPMs would have a Version field that started
with "v", for example "ceph-ansible-v2.0.0-163.g2c98b1d.el7"

Strip the "v" out in these cases, so that the version is simply a
number.

9 years agoAdding symlink to action_plugins so this works in ansible tower 1176/head
Jeremiah Stuever [Mon, 12 Dec 2016 15:57:51 +0000 (10:57 -0500)]
Adding symlink to action_plugins so this works in ansible tower