]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/log
ceph-ansible.git
8 years agoremove ceph-iscsi-gw play from site.yml.sample 1591/head
Andrew Schoen [Tue, 6 Jun 2017 14:04:58 +0000 (09:04 -0500)]
remove ceph-iscsi-gw play from site.yml.sample

We ship ceph-iscsi-gw in a separate repo downstream and do not package
it with ceph-ansible. Including the play for ceph-iscsi-gw in
site.yml.sample makes the playbook fail when using the downstream
packages.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1454945
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit dd193df4b9d93a124c25b7c6db02350714cd87cc)

8 years agoMerge pull request #1588 from ceph/backport-1587 v2.2.9
Andrew Schoen [Mon, 5 Jun 2017 22:24:40 +0000 (17:24 -0500)]
Merge pull request #1588 from ceph/backport-1587

backport: "ceph-mon: fix support for ipv6 on containerized mons #1587"

8 years agoMerge pull request #1585 from ceph/backport-purge-docker
Andrew Schoen [Mon, 5 Jun 2017 21:28:10 +0000 (16:28 -0500)]
Merge pull request #1585 from ceph/backport-purge-docker

purge-docker-cluster.yml backports

8 years agoceph-mon: fix support for ipv6 on containerized mons 1588/head
Andrew Schoen [Mon, 5 Jun 2017 15:51:47 +0000 (10:51 -0500)]
ceph-mon: fix support for ipv6 on containerized mons

The fact ['ansible_$interface']['ipv4'] is a dictionary where
['ansible_$interface']['ipv6'] is a list. If we use
ansible_default_ipv6|ipv4 is is always a dictionary which allows us to
get the ipv6 and ipv4 address without adding more complexity to the
template.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit e8187f6a0fba6b158dfec37a198a64f712ee95c6)

8 years agotests: use docker playbook when redeploying a purged cluster 1585/head
Andrew Schoen [Wed, 31 May 2017 16:53:37 +0000 (11:53 -0500)]
tests: use docker playbook when redeploying a purged cluster

When we purge a containerized cluster we need to use the correct
playbook when redploying the cluster.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 22541a9c9a05bee2c2e24a8c4e75bf5870abe943)

Conflicts:
tox.ini

8 years agopurge-docker-cluster: include ceph_docker_registry
Andrew Schoen [Fri, 2 Jun 2017 12:42:34 +0000 (07:42 -0500)]
purge-docker-cluster: include ceph_docker_registry

We need to include ceph_docker_registry when removing containers/images
because if we don't it will assume docker.io which is not always where
the image originated from, causing the playbook to fail.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 59992c54cc60f4deb7eef5f864e08447fab0b6ff)

8 years agoMerge pull request #1575 from ceph/backport-1568 v2.2.8
Andrew Schoen [Wed, 31 May 2017 17:07:36 +0000 (12:07 -0500)]
Merge pull request #1575 from ceph/backport-1568

Backport: "purge-docker-cluster fix and test #1568"

8 years agopurge-docker-cluster: pip is only used on Debian 1575/head
Andrew Schoen [Tue, 30 May 2017 20:06:46 +0000 (15:06 -0500)]
purge-docker-cluster: pip is only used on Debian

We only need to purge packages installed by pip on Debian systems.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit f7677e439324800294e8c2f035566bfe44fcdc9c)

8 years agotests: adds a scenario for purging containerized clusters
Andrew Schoen [Thu, 25 May 2017 12:50:37 +0000 (07:50 -0500)]
tests: adds a scenario for purging containerized clusters

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit ecdb6f4967095b16f247f731846b023e8d66d2ae)

Conflicts:
tox.ini

8 years agopurge-docker-cluster: default raw_journal_devices to []
Andrew Schoen [Thu, 25 May 2017 12:30:25 +0000 (07:30 -0500)]
purge-docker-cluster: default raw_journal_devices to []

If we're purging a containerized cluster that did not use the
raw_multi_journal OSD scenario then raw_journal_devices will not be
defined which causes the playbook to fail.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1455187

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 8e322d4825a0c53ae260faa3324eef4dfd0b28b0)

8 years agoMerge pull request #1567 from ceph/fix-mgr-bkp v2.2.7
Andrew Schoen [Wed, 24 May 2017 15:50:22 +0000 (10:50 -0500)]
Merge pull request #1567 from ceph/fix-mgr-bkp

backport: mon: fix with_items being evaluated before when

8 years agomon: fix with_items being evaluated before when 1567/head
Sébastien Han [Tue, 11 Apr 2017 10:10:55 +0000 (12:10 +0200)]
mon: fix with_items being evaluated before when

Ansible evaluates the 'with_items' before the 'when' so if the inventory
does not have the group declared it'll fail. To fix this, we set an
empty array to make the with_items happy and then evaluate with the
'when'.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 05331a26348e162e4083131d2a259f6c983f3ec9)
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1565 from ceph/install-condition-bkp
Sébastien Han [Wed, 24 May 2017 14:07:37 +0000 (16:07 +0200)]
Merge pull request #1565 from ceph/install-condition-bkp

backport: Install condition bkp

8 years agoMerge pull request #1566 from ceph/rol-docker-bkp
Sébastien Han [Wed, 24 May 2017 14:07:08 +0000 (16:07 +0200)]
Merge pull request #1566 from ceph/rol-docker-bkp

backport: rolling-update: set/unset flags on the right container

8 years agorolling-update: set/unset flags on the right container 1566/head
Sébastien Han [Mon, 22 May 2017 07:38:08 +0000 (09:38 +0200)]
rolling-update: set/unset flags on the right container

Problem: we are delegating the set/unset flag to a monitor node but we
try to call an osd container

Solution: use the right container name.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 90389864d8d7cc8d426ef7c8687eeb43db92406e)
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agocommon: remove useless check 1565/head
Sébastien Han [Tue, 23 May 2017 10:02:24 +0000 (12:02 +0200)]
common: remove useless check

We only check for everything expect 'distro' because that
is a valid way of deploying RHCS, with preprepared repos
present on the nodes.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 468dc06bcd9fa9acd7b3baf55295e160679abf4b)
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agocommon: fix installation condition
Sébastien Han [Mon, 22 May 2017 12:18:45 +0000 (14:18 +0200)]
common: fix installation condition

Problem: we could end up in situation where we would install a package
on a machine that does not have the right repo enabled. Because the
condition was set to OR we weren't pinning a particular host but just a
condition. Let's say someone sets 'ceph_origin == "distro"', this would
try to install OSD packages on Monitors.

Solution: use a AND condition to first pin to the group_name (which
identifies a set of hosts) AND then after this one of the installation
condition.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1453119
Co-Authored-By: https://github.com/zhsj
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit f7e9585a2c9978faaeb99b3b8adcd1a2c58b72b4)
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1553 from ceph/rhel-os-version-bkp
Sébastien Han [Mon, 22 May 2017 09:35:46 +0000 (11:35 +0200)]
Merge pull request #1553 from ceph/rhel-os-version-bkp

backport: common: explicitly set rhel os version support

8 years agocommon: explicitly set rhel os version support 1553/head
Sébastien Han [Fri, 19 May 2017 08:37:31 +0000 (10:37 +0200)]
common: explicitly set rhel os version support

Clarify in the error message that only RHEL version >= 7.3 are
supported.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452431
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 8ad503b2488c1b9544165fa53c01e27d85af17ab)
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1549 from ceph/container-ipv6-bkp v2.2.6
Sébastien Han [Thu, 18 May 2017 13:35:22 +0000 (15:35 +0200)]
Merge pull request #1549 from ceph/container-ipv6-bkp

backport: Container ipv6 bkp

8 years agoMerge pull request #1550 from ceph/luminous-bkp
Sébastien Han [Thu, 18 May 2017 13:33:31 +0000 (15:33 +0200)]
Merge pull request #1550 from ceph/luminous-bkp

backport: ceph-common: add luminous to ceph_release_num

8 years agoMerge pull request #1540 from ceph/piwi3910-master-bkp
Sébastien Han [Thu, 18 May 2017 13:33:05 +0000 (15:33 +0200)]
Merge pull request #1540 from ceph/piwi3910-master-bkp

backport: added support for Sandisk FusionIO devices

8 years agoceph-common: add luminous to ceph_release_num 1550/head
Andrew Schoen [Wed, 3 May 2017 14:11:52 +0000 (09:11 -0500)]
ceph-common: add luminous to ceph_release_num

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 471cdb0c3999b375f2891472d4645eea5f4d7051)
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agomon: do not hardcode ipv4 1549/head
Sébastien Han [Thu, 18 May 2017 09:56:55 +0000 (11:56 +0200)]
mon: do not hardcode ipv4

Problem: fail to deploy a containerized Ceph cluster with ipv6
Solution: do not hardcode ipv4 when bootstrapping the container.

Now use ip_version: ipv6 to get a containerized cluster deployed with
ipv6.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1451786
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit c7aae7f965758eb08a806fc7be75d8075884b733)
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1542 from ceph/monitor_interface-bkp
Sébastien Han [Thu, 18 May 2017 09:13:38 +0000 (11:13 +0200)]
Merge pull request #1542 from ceph/monitor_interface-bkp

backport: monitor_interface: document need to use monitor_address when using IPv6

8 years agoMerge pull request #1538 from ceph/quick_fix-bkp
Sébastien Han [Thu, 18 May 2017 09:13:13 +0000 (11:13 +0200)]
Merge pull request #1538 from ceph/quick_fix-bkp

backport: ignore error when doesn't exist

8 years agoadded support for Sandisk FusionIO devices 1540/head
Pascal Watteel [Fri, 7 Apr 2017 14:59:00 +0000 (18:59 +0400)]
added support for Sandisk FusionIO devices

Signed-off-by: Pascal Watteel <pascal.watteel@emc.com>
(cherry picked from commit e4ef8bb87f9df22459908f71d8cc816b081d829a)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1541 from ceph/control-path-bkp
Sébastien Han [Thu, 18 May 2017 09:05:34 +0000 (11:05 +0200)]
Merge pull request #1541 from ceph/control-path-bkp

backport: Control path bkp

8 years agoMerge branch 'stable-2.2' into control-path-bkp 1541/head
Sébastien Han [Thu, 18 May 2017 09:05:12 +0000 (11:05 +0200)]
Merge branch 'stable-2.2' into control-path-bkp

8 years agoMerge pull request #1537 from ceph/ansible-ssh-control-path-bkp
Sébastien Han [Thu, 18 May 2017 09:04:08 +0000 (11:04 +0200)]
Merge pull request #1537 from ceph/ansible-ssh-control-path-bkp

backport: ansible: shorten default control_path

8 years agoMerge pull request #1539 from ceph/docker-registry-bkp v2.2.5
Andrew Schoen [Wed, 17 May 2017 20:51:18 +0000 (15:51 -0500)]
Merge pull request #1539 from ceph/docker-registry-bkp

backport: Docker registry bkp

8 years agoMerge pull request #1521 from ceph/bpk-1512
Sébastien Han [Wed, 17 May 2017 16:07:30 +0000 (18:07 +0200)]
Merge pull request #1521 from ceph/bpk-1512

backport: ansible: shorten default control_path

8 years agomonitor_interface: document need to use monitor_address when using IPv6 1542/head
Florian Klink [Thu, 11 May 2017 09:15:28 +0000 (11:15 +0200)]
monitor_interface: document need to use monitor_address when using IPv6

Already documented in the Red Hat Ceph Storage 2 Installation Guide
for Red Hat Enterprise Linux, but not here

Signed-off-by: Florian Klink <flokli@flokli.de>
(cherry picked from commit 10b91661ceef7992354032030c7c2673a90d40f4)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoansible: add a note in ansible.cfg
Sébastien Han [Tue, 16 May 2017 12:42:39 +0000 (14:42 +0200)]
ansible: add a note in ansible.cfg

Comments inside this file must be set BEFORE the option. NOT after the
option, otherwise the comment will be interpreted as a value to that
option.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit ece9c14a3390321664cbb59ec9ea3f7984e71dba)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoansible: fix control path line
Sébastien Han [Tue, 16 May 2017 12:39:03 +0000 (14:39 +0200)]
ansible: fix control path line

If the comment is put after the line then it is interpreted so we need
to move it before and have a dedicated line.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 9f2c21972debca9e0dc5bcc19bc5fce0f5c4c471)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agogroup_vars: resync all.yml.sample with ceph-docker-common 1539/head
Sébastien Han [Mon, 15 May 2017 13:51:49 +0000 (15:51 +0200)]
group_vars: resync all.yml.sample with ceph-docker-common

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit a80f07704cfe44bf1b271e76eb2101161c6814ec)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agogenerate_group_vars_sample: ability to merge roles
Sébastien Han [Mon, 15 May 2017 13:49:45 +0000 (15:49 +0200)]
generate_group_vars_sample: ability to merge roles

Problem: the meta declaration just includes the role, it does nothing
with the group_vars. For ansible to use files defined in group_vars/ the
name of the file must match a host group. Like mons, osds, etc. There is
no group docker-common so the variables defined there are never used, as
proved by https://bugzilla.redhat.com/show_bug.cgi?id=1447179 and the
ansible documentation.

Solution: bring the ability to merge roles files. So now by default,
ceph-docker-common and ceph-common will go into all.yml.sample

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1447179
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit a8c75c3bc9bd7211483f54cd98a99c95f69e7958)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agogenerate_group_vars_sample: do not use expr
Sébastien Han [Mon, 15 May 2017 08:56:33 +0000 (10:56 +0200)]
generate_group_vars_sample: do not use expr

As mentionned in https://github.com/koalaman/shellcheck/wiki/SC2003
expr is antiquated.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 53be0980be65170bb4f2acb3c87b0c1eff8c7acb)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agogenerate_group_vars_sample.sh: fix script indent
Sébastien Han [Mon, 15 May 2017 08:38:36 +0000 (10:38 +0200)]
generate_group_vars_sample.sh: fix script indent

Using indent of 2 on the entire script.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 7fddcad8eae4632ff8e6007acd5d6b4f44416453)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agorgw: resync group_vars
Sébastien Han [Mon, 15 May 2017 08:36:17 +0000 (10:36 +0200)]
rgw: resync group_vars

At some point, during a commit changing `roles/ceph-rgw/defaults/main.yml`
we forgot to run `generate_group_vars_sample.sh`.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 21067453438ae5f87a25dbd00a9279ed9488e4fa)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoignore error when key is not exist 1538/head
yanyx [Fri, 5 May 2017 08:44:58 +0000 (16:44 +0800)]
ignore error when key is not exist

(cherry picked from commit 027f9aaf09fd63a887a8d725b542930219f43707)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoansible: shorten default control_path 1537/head
Sébastien Han [Thu, 11 May 2017 06:57:53 +0000 (08:57 +0200)]
ansible: shorten default control_path

Default ansible control_path option is too long, so we shorten it by
changing the ansible.cfg file.

For more info see: https://github.com/ansible/ansible/issues/11536
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1447569
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 0e931d2bce1030fcec9121a8dba70009cff83403)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1530 from ceph/wip-rgw-testing-stable-2.2
Andrew Schoen [Wed, 17 May 2017 12:15:03 +0000 (07:15 -0500)]
Merge pull request #1530 from ceph/wip-rgw-testing-stable-2.2

rgw testing stable 2.2

8 years agoMerge pull request #1523 from ceph/backport-pg-message
Andrew Schoen [Wed, 17 May 2017 01:56:11 +0000 (20:56 -0500)]
Merge pull request #1523 from ceph/backport-pg-message

ceph-common: improve error message on restart osd daemon script

8 years agotest: check if default bucket object quota is applied 1530/head
Ali Maredia [Mon, 15 May 2017 18:01:57 +0000 (14:01 -0400)]
test: check if default bucket object quota is applied

Resolves: rhbz#1391500

Signed-off-by: Ali Maredia <amaredia@redhat.com>
(cherry picked from commit db19984010fd75ece0ead7c49ab36ce3c707be15)

8 years agorgw: test functionality of conf vars and pool creation for tuning
Ali Maredia [Fri, 28 Apr 2017 19:47:21 +0000 (15:47 -0400)]
rgw: test functionality of conf vars and pool creation for tuning

Signed-off-by: Ali Maredia <amaredia@redhat.com>
(cherry picked from commit 734a07f0b9feb1aba43b5ead7621ffe63401d6b3)

8 years agoceph-common: improve error message on restart osd daemon script 1523/head
Alfredo Deza [Fri, 12 May 2017 15:01:03 +0000 (11:01 -0400)]
ceph-common: improve error message on restart osd daemon script

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit b04d18988e7f4c3da332af8941550ba0af18365a)

8 years agoMerge pull request #1509 from ceph/wip-stable-rgw-conf-var-move
Andrew Schoen [Mon, 15 May 2017 15:42:18 +0000 (10:42 -0500)]
Merge pull request #1509 from ceph/wip-stable-rgw-conf-var-move

rgw: move default bucket quota conf vars to global

8 years agoansible: shorten default control_path 1521/head
Sébastien Han [Thu, 11 May 2017 06:57:53 +0000 (08:57 +0200)]
ansible: shorten default control_path

Default ansible control_path option is too long, so we shorten it by
changing the ansible.cfg file.

For more info see: https://github.com/ansible/ansible/issues/11536
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1447569
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 0e931d2bce1030fcec9121a8dba70009cff83403)
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoansible: add logging path
Sébastien Han [Tue, 25 Apr 2017 08:10:09 +0000 (10:10 +0200)]
ansible: add logging path

Ability to log ansible plays in a log file. Default location is
/var/log/ansible.log
Be sure the user running Ansible has permissions on the logfile.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1445065
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 6a69fa9495ffaf16d9aa5b862751ceb2c87bdc8f)
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agorgw: move default bucket quota conf vars to global 1509/head
Ali Maredia [Wed, 10 May 2017 17:00:41 +0000 (13:00 -0400)]
rgw: move default bucket quota conf vars to global

"rgw override bucket index max shards" and
"rgw bucket default quota max objects" were in the
client section of the ceph.conf and not being
applied, this commit moves them to global

Resolves: bz#1391500

Signed-off-by: Ali Maredia <amaredia@redhat.com>
(cherry picked from commit 2aeb3a4957e17f6abace7c58cb795a4c0f50c9fd)

8 years agoMerge pull request #1506 from ceph/backport-1505
Sébastien Han [Wed, 10 May 2017 16:27:51 +0000 (18:27 +0200)]
Merge pull request #1506 from ceph/backport-1505

backport: "remove the install-ansible.sh script #1505"

8 years agoremove the install-ansible.sh script 1506/head
Andrew Schoen [Wed, 10 May 2017 16:16:47 +0000 (11:16 -0500)]
remove the install-ansible.sh script

I'm unsure why this is needed, users should be able to install ansible
on their own in the method they prefer.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 1dc0fab21ca3126bc06aa54af4daae87feedeeee)

8 years agoMerge pull request #1491 from ceph/backport-1490 v2.2.4
Andrew Schoen [Wed, 3 May 2017 01:24:06 +0000 (20:24 -0500)]
Merge pull request #1491 from ceph/backport-1490

backport: "tests: allow for insecure docker registries when testing rhcs #1490"

8 years agotests: allow for insecure docker registries when testing rhcs 1491/head
Andrew Schoen [Tue, 2 May 2017 20:49:50 +0000 (15:49 -0500)]
tests: allow for insecure docker registries when testing rhcs

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 2fada9bd6b0b0099f191be875edeee23a2fe3daa)

Conflicts:
tests/functional/rhcs_setup.yml

8 years agoMerge pull request #1489 from ceph/backport-1487
Andrew Schoen [Wed, 3 May 2017 01:16:01 +0000 (20:16 -0500)]
Merge pull request #1489 from ceph/backport-1487

Backport: "tests: actually test jewel when we say we are #1487"

8 years agotests: switch to using key/value extra-vars instead of json 1489/head
Andrew Schoen [Tue, 2 May 2017 16:15:23 +0000 (11:15 -0500)]
tests: switch to using key/value extra-vars instead of json

I continue to have issues with extra-vars as json. The latest issue
being that the ceph_docker_image_tag config option included in the json
was being ignored. I can't find the root cause, by using the key/value
format seems to work.

I've also removed several options here to simply the interface. We can
add those back if they become necessary.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit e384b2498755e5537595158ca498e03013e33673)

8 years agotests: actually test a jewel container for the jewel-* docker tests
Andrew Schoen [Mon, 1 May 2017 19:08:55 +0000 (14:08 -0500)]
tests: actually test a jewel container for the jewel-* docker tests

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 1fcc3283d8891055ae394d03f3ded1f6a4c8ec64)

8 years agoMerge pull request #1488 from ceph/backport-1427
Andrew Schoen [Mon, 1 May 2017 20:29:06 +0000 (15:29 -0500)]
Merge pull request #1488 from ceph/backport-1427

tests: enable the rhcs-7-extras-nightly repo on test nodes

8 years agotests: enable the rhcs-7-extras-nightly repo on test nodes 1488/head
Andrew Schoen [Mon, 10 Apr 2017 18:46:03 +0000 (13:46 -0500)]
tests: enable the rhcs-7-extras-nightly repo on test nodes

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 35aab1274a5ec6ad696040965c87a87310bb019e)

8 years agoMerge pull request #1486 from ceph/backport-1485
Andrew Schoen [Mon, 1 May 2017 20:17:37 +0000 (15:17 -0500)]
Merge pull request #1486 from ceph/backport-1485

Backport: "tests: test all docker osds are up and in #1485"

8 years agotests: test that all docker OSDs are up and in 1486/head
Andrew Schoen [Mon, 1 May 2017 15:45:44 +0000 (10:45 -0500)]
tests: test that all docker OSDs are up and in

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 10d39e98dde5042d98d234887ead17ff7d278e55)

8 years agotests: adds a way to mark docker only tests
Andrew Schoen [Mon, 1 May 2017 15:45:03 +0000 (10:45 -0500)]
tests: adds a way to mark docker only tests

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 06b36fddf9689659b97c480b8b6644775fac907b)

8 years agoMerge pull request #1478 from ceph/backport_1477 v2.2.3
Andrew Schoen [Thu, 27 Apr 2017 15:32:26 +0000 (10:32 -0500)]
Merge pull request #1478 from ceph/backport_1477

Backport: Common: Fix condition on osd restart handler

8 years agoCommon: Fix condition on osd restart handler 1478/head
Guillaume Abrioux [Thu, 27 Apr 2017 14:24:21 +0000 (16:24 +0200)]
Common: Fix condition on osd restart handler

Fix the condition on the osd restart handler.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1474 from ceph/wip-2.2-rgw-tuning v2.2.2
Andrew Schoen [Tue, 25 Apr 2017 22:12:52 +0000 (17:12 -0500)]
Merge pull request #1474 from ceph/wip-2.2-rgw-tuning

rgw: set tuning parameters

8 years agorgw: set tuning parameters 1474/head
Ali Maredia [Wed, 19 Apr 2017 16:30:40 +0000 (12:30 -0400)]
rgw: set tuning parameters

Change civetweb_num_thread default to 100

Add capability to override number of pgs for
rgw pools.

Add ceph.conf vars to enable default bucket
object quota at users choosing into the ceph.conf.j2
template

Resolves: rhbz#1437173
Resolves: rhbz#1391500

Signed-off-by: Ali Maredia <amaredia@redhat.com>
8 years agoMerge pull request #1473 from ceph/backport-1464
Andrew Schoen [Tue, 25 Apr 2017 19:24:12 +0000 (14:24 -0500)]
Merge pull request #1473 from ceph/backport-1464

backport: "purge-cluster: remove unneeded tasks #1464"

8 years agopurge-cluster: check for any running ceph process after purge 1473/head
Andrew Schoen [Tue, 25 Apr 2017 12:35:13 +0000 (07:35 -0500)]
purge-cluster: check for any running ceph process after purge

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 5a3f95dfc1bc9bba7ad62999969997ce0a27da13)

8 years agopurge-cluster: we don't support sysv or upstart anymore
Andrew Schoen [Fri, 21 Apr 2017 22:14:38 +0000 (15:14 -0700)]
purge-cluster: we don't support sysv or upstart anymore

Now that ceph-ansible only supports > jewel we don't need
to bother with sysv or upstart

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 26bdd59f5d445db7991eecd0d13f7c8615bc4812)

8 years agopurge-cluster: do not need to check for running ceph processes
Andrew Schoen [Fri, 21 Apr 2017 22:12:46 +0000 (15:12 -0700)]
purge-cluster: do not need to check for running ceph processes

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 7ca2bddcce76dd505b169457fa8727b62b861756)

8 years agopurge-cluster: no need to remove ceph.target
Andrew Schoen [Fri, 21 Apr 2017 22:11:03 +0000 (15:11 -0700)]
purge-cluster: no need to remove ceph.target

The package uninstalls will stop ceph.target

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit aac79df3b376afcb70b4e8888a72ad016079576b)

8 years agoMerge pull request #1470 from ceph/backport-1466
Andrew Schoen [Tue, 25 Apr 2017 18:03:30 +0000 (13:03 -0500)]
Merge pull request #1470 from ceph/backport-1466

backport-1466: mon: upgrade calamari when running rolling_update playbook

8 years agomon: upgrade calamari when running rolling_update playbook 1470/head
Sébastien Han [Mon, 24 Apr 2017 09:04:06 +0000 (11:04 +0200)]
mon: upgrade calamari when running rolling_update playbook

Prior to this change, ansible was only checking for the existence of the
package, now if upgrade_ceph_packages is true this means we are
performing an upgrade.

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

8 years agoMerge pull request #1467 from ceph/backport_restart_daemons
Andrew Schoen [Tue, 25 Apr 2017 12:27:15 +0000 (07:27 -0500)]
Merge pull request #1467 from ceph/backport_restart_daemons

Common: Restore check_socket

8 years agoCommon: Restore check_socket 1467/head
Guillaume Abrioux [Tue, 18 Apr 2017 10:40:43 +0000 (12:40 +0200)]
Common: Restore check_socket

Restore the check_socket that was removed by `5bec62b`.
This commit also improves the logging in `restart_*_daemon.sh` scripts

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1450 from ceph/backport-1439 v2.2.1
Andrew Schoen [Mon, 17 Apr 2017 14:38:55 +0000 (09:38 -0500)]
Merge pull request #1450 from ceph/backport-1439

Backport: 'tests: fix ceph_rhcs setup #1439'

8 years agoMerge pull request #1451 from ceph/doc-static-dirs
Andrew Schoen [Thu, 13 Apr 2017 20:25:47 +0000 (15:25 -0500)]
Merge pull request #1451 from ceph/doc-static-dirs

Doc static dirs

8 years agodocs: force an empty _templates dir so sphinx is happy 1451/head
Alfredo Deza [Tue, 11 Apr 2017 13:08:45 +0000 (09:08 -0400)]
docs: force an empty _templates dir so sphinx is happy

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 66a9817e56d69b046425dc04a03869fb9a9d8369)
(cherry picked from commit df315fef897705c77bf12780d31ddf17376388fb)

8 years agodocs: force an empty _static dir so sphinx is happy
Alfredo Deza [Tue, 11 Apr 2017 13:08:08 +0000 (09:08 -0400)]
docs: force an empty _static dir so sphinx is happy

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit aacbbf0efe802e9282793dfc8bf7b175596c5aad)
(cherry picked from commit d26ed99dcc1b930a3001ca1bc71f034b9da4f091)

8 years agotests: print contents of group_vars/all after modification 1449/head 1450/head
Andrew Schoen [Wed, 12 Apr 2017 14:23:21 +0000 (09:23 -0500)]
tests: print contents of group_vars/all after modification

This is just nice to see in the test output so we know exactly what
configuration is going to be used.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 0e6d89b9db1b4677db42bf04c88547ebc00e1194)

8 years agoceph-common: is ceph_rchs is True do not include install_on_redhat.yml
Andrew Schoen [Wed, 12 Apr 2017 12:55:03 +0000 (07:55 -0500)]
ceph-common: is ceph_rchs is True do not include install_on_redhat.yml

That task includes logic for upstream installs that we do not want to
run when deploying RHCS.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 37d38b122bde02efc1bde0d61ceeee3999ebb7ff)

8 years agotests: set needed config in group_vars/all for rhcs testing
Andrew Schoen [Wed, 12 Apr 2017 12:53:49 +0000 (07:53 -0500)]
tests: set needed config in group_vars/all for rhcs testing

Instead of relying on environment variables and --extra-vars simply
modify the group_vars/all that ships with the specific testing scenario
to enable ceph_rchs testing.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 386afbec83b72dcc3a552682d4376d1bf6a99417)

Conflicts:
tests/functional/rhcs_setup.yml

8 years agotests: remove CEPH_STABLE environment variable
Andrew Schoen [Wed, 12 Apr 2017 12:50:41 +0000 (07:50 -0500)]
tests: remove CEPH_STABLE environment variable

I'm removing this because when we use an 'rhcs' scenario then we attempt
to set CEPH_STABLE=false as an environment variable. The issue with that
is because the value is coming from an environment variable it is always
treated as a string and ansible treats that as a boolean True. I plan to
set the ceph_stable value with our rhcs_setup.yml playbook instead of
relying on ---extra-vars and environment variables.

Related ansible issue: https://github.com/ansible/ansible/issues/17193

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 63983fa0b728571518ecdeca249ef37506a00a64)

8 years agoMerge pull request #1425 from ceph/bump-kraken v2.2.0
Sébastien Han [Mon, 10 Apr 2017 17:03:39 +0000 (19:03 +0200)]
Merge pull request #1425 from ceph/bump-kraken

common: bump ceph version to kraken

8 years agocommon: bump ceph version to kraken 1425/head
Sébastien Han [Mon, 10 Apr 2017 14:20:49 +0000 (16:20 +0200)]
common: bump ceph version to kraken

Kraken has been out for a couple of weeks now and the CI can test both
Kraken and Jewel.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1377 from ceph/ceph-mgr
Sébastien Han [Mon, 10 Apr 2017 15:50:24 +0000 (17:50 +0200)]
Merge pull request #1377 from ceph/ceph-mgr

mgr: add new role for ceph-mgr

8 years agotest: add mgr bootstrap support 1377/head
Sébastien Han [Thu, 6 Apr 2017 15:26:52 +0000 (17:26 +0200)]
test: add mgr bootstrap support

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agodocker: fix monitors name
Sébastien Han [Tue, 28 Mar 2017 12:15:27 +0000 (14:15 +0200)]
docker: fix monitors name

Prior to this change we were deploying a monitor using tis fqdn name but
we were checking its state and performing actions on it using its
shortname.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agomgr: add new role for ceph-mgr
Sébastien Han [Thu, 16 Mar 2017 09:17:08 +0000 (10:17 +0100)]
mgr: add new role for ceph-mgr

The Ceph Manager daemon (ceph-mgr) runs alongside monitor daemons, to
provide additional monitoring and interfaces to external monitoring and
management systems.

Only works as of the Kraken release.

Co-Authored-By: Guillaume Abrioux <gabrioux@redhat.com>
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1421 from ceph/tox-docs
Alfredo Deza [Mon, 10 Apr 2017 11:56:40 +0000 (07:56 -0400)]
Merge pull request #1421 from ceph/tox-docs

tox-driven docs

8 years agoMerge pull request #1422 from k0ste/newfeature
Sébastien Han [Mon, 10 Apr 2017 09:07:39 +0000 (11:07 +0200)]
Merge pull request #1422 from k0ste/newfeature

ceph-common: persist "disable_transparent_hugepage"

8 years agoceph-common: disable_transparent_hugepage now persist 1422/head
Konstantin Shalygin [Sat, 8 Apr 2017 06:06:18 +0000 (13:06 +0700)]
ceph-common: disable_transparent_hugepage now persist

8 years agodocs: add missing sections/refs in scenarios.rst 1421/head
Alfredo Deza [Fri, 7 Apr 2017 16:18:15 +0000 (12:18 -0400)]
docs: add missing sections/refs in scenarios.rst

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agodocs: include testing conventions and testinfra in layout.rst
Alfredo Deza [Fri, 7 Apr 2017 16:17:53 +0000 (12:17 -0400)]
docs: include testing conventions and testinfra in layout.rst

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agodocs: fix typo in testing/index.rst
Alfredo Deza [Fri, 7 Apr 2017 16:17:31 +0000 (12:17 -0400)]
docs: fix typo in testing/index.rst

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agodocs: include the tests and tox files in the glossary
Alfredo Deza [Fri, 7 Apr 2017 16:17:13 +0000 (12:17 -0400)]
docs: include the tests and tox files in the glossary

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agodocs: create a tests doc file
Alfredo Deza [Fri, 7 Apr 2017 16:07:42 +0000 (12:07 -0400)]
docs: create a tests doc file

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agodocs: create a separate tox doc file
Alfredo Deza [Fri, 7 Apr 2017 16:07:26 +0000 (12:07 -0400)]
docs: create a separate tox doc file

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agodocs: use glossary for the :doc: directive
Alfredo Deza [Fri, 7 Apr 2017 16:06:36 +0000 (12:06 -0400)]
docs: use glossary for the :doc: directive

Signed-off-by: Alfredo Deza <adeza@redhat.com>