From b0989c700f9a4651b2cae978653d255ef0e0b4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 25 Oct 2016 10:28:53 +0200 Subject: [PATCH] rolling_update: fix wrong indent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixing: https://bugzilla.redhat.com/show_bug.cgi?id=1388295 Also add some notes in the README on how to run infrastructure playbooks. Signed-off-by: Sébastien Han --- .gitignore | 13 ++++ infrastructure-playbooks/README.md | 2 + infrastructure-playbooks/purge-cluster.yml | 70 +++++++++---------- .../purge-docker-cluster.yml | 70 +++++++++---------- infrastructure-playbooks/rolling_update.yml | 44 ++++++------ ...inerized-to-containerized-ceph-daemons.yml | 52 +++++++------- 6 files changed, 133 insertions(+), 118 deletions(-) diff --git a/.gitignore b/.gitignore index 0ec10cc1c..2a02b511c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,16 @@ site.yml site-docker.yml *.pyc *.sw? +purge-cluster.yml +shrink-mon.yml +cluster-maintenance.yml +purge-docker-cluster.yml +shrink-osd.yml +cluster-os-migration.yml +purge-multisite.yml +switch-from-non-containerized-to-containerized-ceph-daemons.yml +localrepo-site.yml.sample +rgw-standalone.yml +take-over-existing-cluster.yml +osd-configure.yml +rolling_update.yml diff --git a/infrastructure-playbooks/README.md b/infrastructure-playbooks/README.md index ba32864c0..4312efd07 100644 --- a/infrastructure-playbooks/README.md +++ b/infrastructure-playbooks/README.md @@ -3,3 +3,5 @@ Infrastructure playbooks This directory contains a variety of playbooks that can be used independently of the Ceph roles we have. They aim to perform infrastructure related tasks that would help use managing a Ceph cluster or performing certain operational tasks. + +To use them, **you must move them to ceph-ansible's root directory**, then run using `ansible-playbook `. diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index bfe310d16..ac1e89ee1 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -71,11 +71,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-mds/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-mds/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/mdss + - include_vars: group_vars/mdss failed_when: false - name: stop ceph.target with systemd @@ -122,11 +122,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-rgw/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-rgw/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/rgws + - include_vars: group_vars/rgws failed_when: false - name: stop ceph.target with systemd @@ -173,11 +173,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-rbd-mirror/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-rbd-mirror/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/rbd-mirrors + - include_vars: group_vars/rbd-mirrors failed_when: false - name: stop ceph.target with systemd @@ -218,11 +218,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-nfs/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-nfs/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/nfss + - include_vars: group_vars/nfss failed_when: false - name: stop ceph.target with systemd @@ -287,11 +287,11 @@ state: absent tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-osd/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-osd/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/osds + - include_vars: group_vars/osds failed_when: false - name: check for a device list @@ -439,14 +439,14 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-mon/defaults/main.yml - - include_vars: ../roles/ceph-restapi/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-mon/defaults/main.yml + - include_vars: roles/ceph-restapi/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/mons + - include_vars: group_vars/mons failed_when: false - - include_vars: ../group_vars/restapis + - include_vars: group_vars/restapis failed_when: false - name: stop ceph.target with systemd @@ -658,22 +658,22 @@ gather_facts: false tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/mdss + - include_vars: group_vars/mdss failed_when: false - - include_vars: ../group_vars/rgws + - include_vars: group_vars/rgws failed_when: false - - include_vars: ../group_vars/rbd-mirrors + - include_vars: group_vars/rbd-mirrors failed_when: false - - include_vars: ../group_vars/nfss + - include_vars: group_vars/nfss failed_when: false - - include_vars: ../group_vars/osds + - include_vars: group_vars/osds failed_when: false - - include_vars: ../group_vars/mons + - include_vars: group_vars/mons failed_when: false - - include_vars: ../group_vars/restapis + - include_vars: group_vars/restapis failed_when: false - name: purge fetch directory for localhost diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml index 1a9b94842..1a53c1a46 100644 --- a/infrastructure-playbooks/purge-docker-cluster.yml +++ b/infrastructure-playbooks/purge-docker-cluster.yml @@ -55,11 +55,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-mds/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-mds/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/mdss + - include_vars: group_vars/mdss failed_when: false - name: disable ceph mds service @@ -101,11 +101,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-rgw/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-rgw/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/rgws + - include_vars: group_vars/rgws failed_when: false - name: disable ceph rgw service @@ -147,11 +147,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-rbd-mirror/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-rbd-mirror/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/rbd-mirrors + - include_vars: group_vars/rbd-mirrors failed_when: false - name: disable ceph rbd-mirror service @@ -193,11 +193,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-nfs/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-nfs/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/nfss + - include_vars: group_vars/nfss failed_when: false - name: disable ceph nfs service @@ -248,11 +248,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-osd/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-osd/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/osds + - include_vars: group_vars/osds failed_when: false - name: disable ceph osd service @@ -343,14 +343,14 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-mon/defaults/main.yml - - include_vars: ../roles/ceph-restapi/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-mon/defaults/main.yml + - include_vars: roles/ceph-restapi/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/mons + - include_vars: group_vars/mons failed_when: false - - include_vars: ../group_vars/restapis + - include_vars: group_vars/restapis failed_when: false - name: disable ceph mon service @@ -599,22 +599,22 @@ gather_facts: false tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/mdss + - include_vars: group_vars/mdss failed_when: false - - include_vars: ../group_vars/rgws + - include_vars: group_vars/rgws failed_when: false - - include_vars: ../group_vars/rbd-mirrors + - include_vars: group_vars/rbd-mirrors failed_when: false - - include_vars: ../group_vars/nfss + - include_vars: group_vars/nfss failed_when: false - - include_vars: ../group_vars/osds + - include_vars: group_vars/osds failed_when: false - - include_vars: ../group_vars/mons + - include_vars: group_vars/mons failed_when: false - - include_vars: ../group_vars/restapis + - include_vars: group_vars/restapis failed_when: false - name: purge fetch directory for localhost diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index da530d38a..b36349fa4 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -77,14 +77,14 @@ - ceph-mon post_tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-mon/defaults/main.yml - - include_vars: ../roles/ceph-restapi/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-mon/defaults/main.yml + - include_vars: roles/ceph-restapi/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/mons + - include_vars: group_vars/mons failed_when: false - - include_vars: ../group_vars/restapis + - include_vars: group_vars/restapis failed_when: false - name: restart ceph mons with upstart @@ -136,11 +136,11 @@ become: True pre_tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-osd/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-osd/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/osds + - include_vars: group_vars/osds failed_when: false - name: set osd flags @@ -156,11 +156,11 @@ - ceph-osd post_tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-osd/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-osd/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/osds + - include_vars: group_vars/osds failed_when: false - name: get osd numbers @@ -222,11 +222,11 @@ - ceph-mds post_tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-mds/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-mds/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/mdss + - include_vars: group_vars/mdss failed_when: false - name: restart ceph mdss with upstart @@ -267,11 +267,11 @@ - ceph-rgw post_tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-rgw/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-rgw/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/rgws + - include_vars: group_vars/rgws failed_when: false - name: restart ceph rgws with systemd diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml index 930b5b69a..4bd4abff9 100644 --- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml +++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml @@ -102,14 +102,14 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-mon/defaults/main.yml - - include_vars: ../roles/ceph-restapi/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-mon/defaults/main.yml + - include_vars: roles/ceph-restapi/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/mons + - include_vars: group_vars/mons failed_when: false - - include_vars: ../group_vars/restapis + - include_vars: group_vars/restapis failed_when: false - name: select a running monitor @@ -192,11 +192,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-osd/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-osd/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/osds + - include_vars: group_vars/osds failed_when: false - name: collect osd ids @@ -297,11 +297,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-mds/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-mds/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/mdss + - include_vars: group_vars/mdss failed_when: false - name: stop ceph mds service @@ -357,11 +357,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-rgw/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-rgw/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/rgws + - include_vars: group_vars/rgws failed_when: false - name: stop ceph rgw service @@ -418,11 +418,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-rbd-mirror/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-rbd-mirror/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/rbd-mirrors + - include_vars: group_vars/rbd-mirrors failed_when: false - name: stop ceph rbd mirror service @@ -477,11 +477,11 @@ become: true tasks: - - include_vars: ../roles/ceph-common/defaults/main.yml - - include_vars: ../roles/ceph-nfs/defaults/main.yml - - include_vars: ../group_vars/all + - include_vars: roles/ceph-common/defaults/main.yml + - include_vars: roles/ceph-nfs/defaults/main.yml + - include_vars: group_vars/all failed_when: false - - include_vars: ../group_vars/nfss + - include_vars: group_vars/nfss failed_when: false - name: stop ceph nfs service