]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/log
ceph-ansible.git
8 years agoMerge pull request #2223 from ceph/2221-bis-bkp stable-2.2
Guillaume Abrioux [Wed, 29 Nov 2017 14:03:43 +0000 (15:03 +0100)]
Merge pull request #2223 from ceph/2221-bis-bkp

[skip ci] backport of 2221-bis

8 years agopurge: fix bug on 'wait_for' task 2223/head
Guillaume Abrioux [Wed, 29 Nov 2017 10:10:56 +0000 (11:10 +0100)]
purge: fix bug on 'wait_for' task

this task hangs because `{{ inventory_hostname }}` doesn't resolv to an
actual ip address.
Using `hostvars[inventory_hostname]['ansible_default_ipv4']['address']`
should fix this because it will reach the node with its actual IP
address.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit aaaf980140832de694ef0ffe3282dabbf0b90081)
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #2178 from ceph/fix_dmcrypt
Guillaume Abrioux [Wed, 15 Nov 2017 21:25:03 +0000 (22:25 +0100)]
Merge pull request #2178 from ceph/fix_dmcrypt

[skip ci] osd: fix dmcrypt on stable-2.2

8 years agoosd: fix dmcrypt on stable-2.2 2178/head
Guillaume Abrioux [Wed, 15 Nov 2017 15:08:30 +0000 (16:08 +0100)]
osd: fix dmcrypt on stable-2.2

the osd disk activate can't find device in /dev/mapper/* because of a
refactor that is missing in stable-2.2 branch

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #2176 from ceph/prq_update_ci-2.2-bkp
Guillaume Abrioux [Wed, 15 Nov 2017 12:53:42 +0000 (13:53 +0100)]
Merge pull request #2176 from ceph/prq_update_ci-2.2-bkp

Prq update ci 2.2 bkp

8 years agotests: split 773df9c 2176/head
Guillaume Abrioux [Wed, 8 Nov 2017 11:01:54 +0000 (12:01 +0100)]
tests: split 773df9c

We need to keep the 'old' scenarios for stable-2.2

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agorgw: followup on b278d7c
Guillaume Abrioux [Mon, 6 Nov 2017 08:51:59 +0000 (09:51 +0100)]
rgw: followup on b278d7c

b278d7c has introduced an error for containerized deployment with `stable-2.2`
It removed the copy_configs.yml file but not the include in `main.yml`.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agotests: followup on testing against ansible2.4
Guillaume Abrioux [Mon, 30 Oct 2017 13:45:59 +0000 (14:45 +0100)]
tests: followup on testing against ansible2.4

ceph-ansible is now being testing against ansible2.2 and ansible2.4. We
need to update tox.ini so we use the right version of testinfra
regarding which ansible version we are using.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 97b1cb02584e3947633aed91f3029fe8317792bc)

8 years agoTest ansible 2.4.1
Sébastien Han [Mon, 23 Oct 2017 10:03:01 +0000 (12:03 +0200)]
Test ansible 2.4.1

We now test with Ansible 2.4. We had to change testinfra's version since
only recent versions work with 2.4. See:
https://github.com/philpep/testinfra/issues/249

Closes: https://github.com/ceph/ceph-ansible/issues/2087
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit c4ad2477188c2d226a4ea2e0fa6693967d5b103c)

8 years agoMerge pull request #2059 from ceph/gmeno-stable-2.2
Andrew Schoen [Tue, 17 Oct 2017 18:56:10 +0000 (13:56 -0500)]
Merge pull request #2059 from ceph/gmeno-stable-2.2

pin test-infra requirement at 1.5.5

8 years agopin test-infra requirement at 1.5.5 2059/head
Gregory Meno [Mon, 16 Oct 2017 18:45:03 +0000 (11:45 -0700)]
pin test-infra requirement at 1.5.5

This allows us to deal with API change of "host" fixture
see https://github.com/philpep/testinfra/blob/master/CHANGELOG.rst#160
Now we can run tox against stable-2.2 release of ceph-ansible

Signed-off-by: Gregory Meno <gmeno@redhat.com>
8 years agoMerge pull request #1932 from fghaas/1902 v2.2.12
Sébastien Han [Thu, 12 Oct 2017 07:19:13 +0000 (09:19 +0200)]
Merge pull request #1932 from fghaas/1902

Backport documentation to stable-2.2

8 years agoMerge pull request #2034 from fghaas/2033
Sébastien Han [Thu, 12 Oct 2017 07:18:10 +0000 (09:18 +0200)]
Merge pull request #2034 from fghaas/2033

stable-2.2: fix missing backport

8 years agoinfra: Fix ceph.conf creation when taking over existing cluster 2034/head
David Galloway [Tue, 20 Jun 2017 16:34:46 +0000 (12:34 -0400)]
infra: Fix ceph.conf creation when taking over existing cluster

Fixes bug introduced in https://github.com/ceph/ceph-ansible/pull/1330

The "stat ceph.conf" task was basically using the stat module on a
string instead of the ceph.conf filename.  This caused the "generate
ceph configuration file" task to fail.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1463382
Signed-off-by: David Galloway <dgallowa@redhat.com>
8 years agoMerge pull request #1935 from fghaas/1907
Ali Maredia [Tue, 26 Sep 2017 15:28:50 +0000 (11:28 -0400)]
Merge pull request #1935 from fghaas/1907

stable-2.2: Eliminate RGW NFS

8 years agostable-2.2: Drop remaining ceph_nfs_rgw_* variables 1935/head
Florian Haas [Thu, 21 Sep 2017 18:34:14 +0000 (20:34 +0200)]
stable-2.2: Drop remaining ceph_nfs_rgw_* variables

With all references to the nfs-ganesha RGW FSAL removed from this
branch, the remaining ceph_nfs_rgw_* are no longer used
anywhere. Remove them in order to avoid potential user confusion.

8 years agostable-2.2: drop nfs_obj_gw
Florian Haas [Thu, 21 Sep 2017 16:21:49 +0000 (18:21 +0200)]
stable-2.2: drop nfs_obj_gw

As Ali Maredia explains (in
https://github.com/ceph/ceph-ansible/issues/1907#issuecomment-331200448),
since the Ceph RGW/NFS gateway (with the nfs-ganesha RGW FSAL) is not
supported for any stable Ceph release prior to Luminous, the
nfs_obj_gw variable does not serve any real purpose in this
branch. Thus, remove it along with all references that use it.

8 years agostable-2.2: Drop RGW FSAL from ganesha.conf
Florian Haas [Thu, 21 Sep 2017 16:20:07 +0000 (18:20 +0200)]
stable-2.2: Drop RGW FSAL from ganesha.conf

As Ken Dryer explains (in
https://github.com/ceph/ceph-ansible/issues/1907#issuecomment-330364084),
nfs-ganesha 2.5 requires newer features than what Ceph Jewel
supports. Since this branch isn't expected to support Luminous, it
follows that clusters deployed from this branch won't ever support an
RGW that can be used with the nfs-ganesha RGW FSAL.

Consequently, remove support for the RGW FSAL from the ganesha.conf
template in this branch.

8 years agoMerge pull request #1936 from fghaas/1905
Ali Maredia [Thu, 21 Sep 2017 19:01:43 +0000 (15:01 -0400)]
Merge pull request #1936 from fghaas/1905

stable-2.2: add ceph_nfs_ceph_user to nfss.yml.sample

8 years agostable-2.2: add ceph_nfs_ceph_user to nfss.yml.sample 1936/head
Florian Haas [Thu, 21 Sep 2017 16:27:11 +0000 (18:27 +0200)]
stable-2.2: add ceph_nfs_ceph_user to nfss.yml.sample

Add the ceph_nfs_ceph_user variable to nfss.yml.sample too (not just
all.yml.sample).

This was properly included in ada2f147f5c6537cf51171c995009b0b3288c027
in master, but was missing from
72e32ae0bf1f060aaabd88ddb9c8dd000c0c5d97 in stable-2.2.

8 years agostable-2.2: docs: drop "OSD Configuration" 1932/head
Florian Haas [Thu, 21 Sep 2017 10:56:34 +0000 (12:56 +0200)]
stable-2.2: docs: drop "OSD Configuration"

The documentation available in master under this heading does not
apply to stable-2.2. To avoid user confusion, drop it altogether.

8 years agostable-2.2: docs: Mention OSD scenario booleans
Florian Haas [Thu, 21 Sep 2017 10:46:23 +0000 (12:46 +0200)]
stable-2.2: docs: Mention OSD scenario booleans

In stable-2.2, no osd_scenario variable exists; instead, users must
set the boolean variables for the 6 different scenarios. Update
index.rst to that effect.

8 years agodocs: add docs for dev contributions
Andrew Schoen [Thu, 17 Aug 2017 16:25:56 +0000 (11:25 -0500)]
docs: add docs for dev contributions

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agodocs: add docs for ceph_conf_overrides usage
Andrew Schoen [Thu, 17 Aug 2017 16:13:55 +0000 (11:13 -0500)]
docs: add docs for ceph_conf_overrides usage

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agodocs: add links to example videos
Andrew Schoen [Thu, 17 Aug 2017 16:09:37 +0000 (11:09 -0500)]
docs: add links to example videos

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agodocs: docs for installation and basic config
Andrew Schoen [Thu, 17 Aug 2017 15:23:59 +0000 (10:23 -0500)]
docs: docs for installation and basic config

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1912 from fghaas/1905
Ali Maredia [Tue, 19 Sep 2017 16:11:15 +0000 (12:11 -0400)]
Merge pull request #1912 from fghaas/1905

stable-2.2: Enable working nfs-ganesha deployment on Ubuntu

8 years agostable-2.2: Introduce ceph_nfs_ceph_user 1912/head
Florian Haas [Fri, 15 Sep 2017 15:38:19 +0000 (17:38 +0200)]
stable-2.2: Introduce ceph_nfs_ceph_user

In analogy to ceph_nfs_rgw_user, we should be able to define a user
with which the nfs-ganesha Ceph FSAL connects to the cluster.

Introduce a ceph_nfs_ceph_user, setting its default to "admin" (which
preserves the prior behavior of always connecting as client.admin).

Backport of #1911.

8 years agostable-2.2: Fix nfs-ganesha configuration template
Florian Haas [Fri, 15 Sep 2017 15:37:51 +0000 (17:37 +0200)]
stable-2.2: Fix nfs-ganesha configuration template

The ganesha.conf template included several parameters that were wrong.

- Change NFS_Protocols to Protocols
- Change Transport_Protocols to Transports

In addition, change capitalization of other configuration options in
order to be in line with what
https://github.com/nfs-ganesha/nfs-ganesha/blob/master/src/config_samples/config.txt says.

Fixed #1909.

8 years agostable-2.2: Fix nfs-ganesha package installation
Florian Haas [Fri, 15 Sep 2017 13:34:59 +0000 (15:34 +0200)]
stable-2.2: Fix nfs-ganesha package installation

The gluster/nfs-ganesha PPA does not contain any nfs-ganesha builds
with the Ceph FSAL enabled, so adding that PPA is fairly useless.

Set the correct PPA (gluster/nfs-ganesha-2.5), and also correct the
PPA name for libntirpc.

Finally, install the correct package (nfs-ganesha-ceph not
nfs-ganesha-fsal).

Fixes #1905.

8 years agoMerge pull request #1591 from ceph/backport-1589 v2.2.11
Andrew Schoen [Tue, 6 Jun 2017 19:06:05 +0000 (14:06 -0500)]
Merge pull request #1591 from ceph/backport-1589

Backport: "remove ceph-iscsi-gw play from site.yml.sample #1589"

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)