Commit Graph

2453 Commits (04868bf882da39857a377ad832ea42f0ffe449b9)
 

Author SHA1 Message Date
Florian Haas 04868bf882 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.
2017-09-18 22:50:06 +02:00
Florian Haas f349b90bc8 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.
2017-09-18 22:50:05 +02:00
Andrew Schoen 816ac36be3 Merge pull request #1591 from ceph/backport-1589
Backport: "remove ceph-iscsi-gw play from site.yml.sample #1589"
2017-06-06 14:06:05 -05:00
Andrew Schoen 92285c3473 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 dd193df4b9)
2017-06-06 10:18:40 -05:00
Andrew Schoen c259ef5ed7 Merge pull request #1588 from ceph/backport-1587
backport: "ceph-mon: fix support for ipv6 on containerized mons #1587"
2017-06-05 17:24:40 -05:00
Andrew Schoen a5c30cc39b Merge pull request #1585 from ceph/backport-purge-docker
purge-docker-cluster.yml backports
2017-06-05 16:28:10 -05:00
Andrew Schoen 1f75b1a7f9 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 e8187f6a0f)
2017-06-05 13:44:03 -05:00
Andrew Schoen 4013316c01 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 22541a9c9a)

Conflicts:
	tox.ini
2017-06-05 09:34:26 -05:00
Andrew Schoen 5a35b599be 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 59992c54cc)
2017-06-05 09:33:13 -05:00
Andrew Schoen addc95ad22 Merge pull request #1575 from ceph/backport-1568
Backport: "purge-docker-cluster fix and test #1568"
2017-05-31 12:07:36 -05:00
Andrew Schoen 4c44b18771 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 f7677e4393)
2017-05-31 10:11:36 -05:00
Andrew Schoen 10e21c235d tests: adds a scenario for purging containerized clusters
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit ecdb6f4967)

Conflicts:
	tox.ini
2017-05-31 10:11:20 -05:00
Andrew Schoen 2009f84230 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 8e322d4825)
2017-05-31 10:10:14 -05:00
Andrew Schoen 3b622ae8fd Merge pull request #1567 from ceph/fix-mgr-bkp
backport: mon: fix with_items being evaluated before when
2017-05-24 10:50:22 -05:00
Sébastien Han 4bd9bea4b5 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 05331a2634)
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-05-24 16:31:33 +02:00
Sébastien Han b18bc15282 Merge pull request #1565 from ceph/install-condition-bkp
backport: Install condition bkp
2017-05-24 16:07:37 +02:00
Sébastien Han 4592374dfb Merge pull request #1566 from ceph/rol-docker-bkp
backport: rolling-update: set/unset flags on the right container
2017-05-24 16:07:08 +02:00
Sébastien Han cf547dc359 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 90389864d8)
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-05-24 15:24:53 +02:00
Sébastien Han 7238892b80 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 468dc06bcd)
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-05-24 14:05:19 +02:00
Sébastien Han 1fc3c8d68e 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 f7e9585a2c)
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-05-24 14:05:19 +02:00
Sébastien Han 73881bb1c9 Merge pull request #1553 from ceph/rhel-os-version-bkp
backport: common: explicitly set rhel os version support
2017-05-22 11:35:46 +02:00
Sébastien Han fb27d0a4f2 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 8ad503b248)
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-05-19 17:24:25 +02:00
Sébastien Han 4fdfaf559a Merge pull request #1549 from ceph/container-ipv6-bkp
backport: Container ipv6 bkp
2017-05-18 15:35:22 +02:00
Sébastien Han 1dd1b48d2f Merge pull request #1550 from ceph/luminous-bkp
backport: ceph-common: add luminous to ceph_release_num
2017-05-18 15:33:31 +02:00
Sébastien Han fcd7382074 Merge pull request #1540 from ceph/piwi3910-master-bkp
backport: added support for Sandisk FusionIO devices
2017-05-18 15:33:05 +02:00
Andrew Schoen 92e96fe7dd ceph-common: add luminous to ceph_release_num
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 471cdb0c39)
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-05-18 15:11:16 +02:00
Sébastien Han 3a757843b0 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 c7aae7f965)
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-05-18 14:48:47 +02:00
Sébastien Han 4ce7220339 Merge pull request #1542 from ceph/monitor_interface-bkp
backport: monitor_interface: document need to use monitor_address when using IPv6
2017-05-18 11:13:38 +02:00
Sébastien Han 73f5ec1471 Merge pull request #1538 from ceph/quick_fix-bkp
backport: ignore error when doesn't exist
2017-05-18 11:13:13 +02:00
Pascal Watteel d815e46350 added support for Sandisk FusionIO devices
Signed-off-by: Pascal Watteel <pascal.watteel@emc.com>
(cherry picked from commit e4ef8bb87f)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-18 11:12:08 +02:00
Sébastien Han 1fcd678ec0 Merge pull request #1541 from ceph/control-path-bkp
backport: Control path bkp
2017-05-18 11:05:34 +02:00
Sébastien Han ae6ed3514c Merge branch 'stable-2.2' into control-path-bkp 2017-05-18 11:05:12 +02:00
Sébastien Han e2a6983895 Merge pull request #1537 from ceph/ansible-ssh-control-path-bkp
backport: ansible: shorten default control_path
2017-05-18 11:04:08 +02:00
Andrew Schoen 08929d6cb9 Merge pull request #1539 from ceph/docker-registry-bkp
backport: Docker registry bkp
2017-05-17 15:51:18 -05:00
Sébastien Han aa08b6206a Merge pull request #1521 from ceph/bpk-1512
backport: ansible: shorten default control_path
2017-05-17 18:07:30 +02:00
Florian Klink 98915a9114 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 10b91661ce)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:47:57 +02:00
Sébastien Han 4128c463b6 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 ece9c14a33)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:43:43 +02:00
Sébastien Han 29b0c846f1 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 9f2c21972d)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:43:39 +02:00
Sébastien Han b25c029c31 group_vars: resync all.yml.sample with ceph-docker-common
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit a80f07704c)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:37:24 +02:00
Sébastien Han fde39cc8be 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 a8c75c3bc9)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:37:24 +02:00
Sébastien Han e5a61cf97e 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 53be0980be)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:37:24 +02:00
Sébastien Han 932496d8de 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 7fddcad8ea)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:37:24 +02:00
Sébastien Han 90cf33cb6f 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 2106745343)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:37:24 +02:00
yanyx ff2bdaacf3 ignore error when key is not exist
(cherry picked from commit 027f9aaf09)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:34:07 +02:00
Sébastien Han 828124450e 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 0e931d2bce)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:28:32 +02:00
Andrew Schoen 78545adab5 Merge pull request #1530 from ceph/wip-rgw-testing-stable-2.2
rgw testing stable 2.2
2017-05-17 07:15:03 -05:00
Andrew Schoen 8df280e28a Merge pull request #1523 from ceph/backport-pg-message
ceph-common: improve error message on restart osd daemon script
2017-05-16 20:56:11 -05:00
Ali Maredia 97f34d0ac9 test: check if default bucket object quota is applied
Resolves: rhbz#1391500

Signed-off-by: Ali Maredia <amaredia@redhat.com>
(cherry picked from commit db19984010)
2017-05-16 17:19:46 -04:00
Ali Maredia 2e29579012 rgw: test functionality of conf vars and pool creation for tuning
Signed-off-by: Ali Maredia <amaredia@redhat.com>
(cherry picked from commit 734a07f0b9)
2017-05-16 13:25:16 -04:00
Alfredo Deza 714186c55a ceph-common: improve error message on restart osd daemon script
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit b04d18988e)
2017-05-15 12:44:49 -04:00