From fdc6aebd6259dc564bd7a77a6492c05213963f89 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 2 Aug 2017 11:15:05 +0200 Subject: [PATCH] infrastructure-playbooks: update with ceph-defaults roles MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- infrastructure-playbooks/osd-configure.yml | 4 +++- infrastructure-playbooks/rgw-standalone.yml | 4 +++- infrastructure-playbooks/shrink-mon.yml | 2 +- infrastructure-playbooks/shrink-osd.yml | 2 +- infrastructure-playbooks/take-over-existing-cluster.yml | 5 +++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/infrastructure-playbooks/osd-configure.yml b/infrastructure-playbooks/osd-configure.yml index a193dca10..b35e12142 100644 --- a/infrastructure-playbooks/osd-configure.yml +++ b/infrastructure-playbooks/osd-configure.yml @@ -10,9 +10,11 @@ - hosts: mons become: True roles: + - ceph-defaults - ceph-fetch-keys - hosts: osds become: True roles: - - ceph-osd + - ceph-defaults + - ceph-osd diff --git a/infrastructure-playbooks/rgw-standalone.yml b/infrastructure-playbooks/rgw-standalone.yml index d4cba6d18..409d3282a 100644 --- a/infrastructure-playbooks/rgw-standalone.yml +++ b/infrastructure-playbooks/rgw-standalone.yml @@ -6,9 +6,11 @@ - hosts: mons become: True roles: + - ceph-defaults - ceph-fetch-keys - hosts: rgws become: True roles: - - ceph-rgw + - ceph-defaults + - ceph-rgw diff --git a/infrastructure-playbooks/shrink-mon.yml b/infrastructure-playbooks/shrink-mon.yml index e99a11a1e..0471f245c 100644 --- a/infrastructure-playbooks/shrink-mon.yml +++ b/infrastructure-playbooks/shrink-mon.yml @@ -27,7 +27,7 @@ private: no tasks: - - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-defaults/defaults/main.yml - include_vars: group_vars/all.yml - name: exit playbook, if only one monitor is present in cluster diff --git a/infrastructure-playbooks/shrink-osd.yml b/infrastructure-playbooks/shrink-osd.yml index 3fc54ce78..7ffe1baf1 100644 --- a/infrastructure-playbooks/shrink-osd.yml +++ b/infrastructure-playbooks/shrink-osd.yml @@ -27,7 +27,7 @@ private: no tasks: - - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-defaults/defaults/main.yml - include_vars: group_vars/all.yml - name: exit playbook, if user did not mean to shrink cluster diff --git a/infrastructure-playbooks/take-over-existing-cluster.yml b/infrastructure-playbooks/take-over-existing-cluster.yml index fe4f3a36f..b4db02703 100644 --- a/infrastructure-playbooks/take-over-existing-cluster.yml +++ b/infrastructure-playbooks/take-over-existing-cluster.yml @@ -14,16 +14,17 @@ - hosts: mons become: True vars_files: - - roles/ceph-common/defaults/main.yml + - roles/ceph-defaults/defaults/main.yml - group_vars/all.yml roles: + - ceph-defaults - ceph-fetch-keys - hosts: all become: true tasks: - - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-defaults/defaults/main.yml - include_vars: group_vars/all.yml - name: get the name of the existing ceph cluster -- 2.39.5