From e76f862e99ea921b25ec66bc38fca36f026e954f Mon Sep 17 00:00:00 2001
From: SamYaple <sam@yaple.net>
Date: Fri, 26 Feb 2016 15:41:37 +0000
Subject: [PATCH] Add upgrade play for ceph

Ceph is pretty easy to work with. Upgrade mons, then osds, then rgws

We want to eventually make these serial values configurable, but for
now due to cephs delicate distributed network nature it is safest to
only run 1 change at a time.

Change-Id: Icc721ab3651379c28fee853ca95f9e3ddf102998
Partially-Implements: blueprint upgrade-kolla
Implements: blueprint upgrade-ceph
---
 ansible/roles/ceph/tasks/start_mons.yml |  1 -
 ansible/roles/ceph/tasks/start_osds.yml |  4 +---
 ansible/roles/ceph/tasks/start_rgws.yml |  1 -
 ansible/roles/ceph/tasks/upgrade.yml    | 15 +++++++++++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/ceph/tasks/start_mons.yml b/ansible/roles/ceph/tasks/start_mons.yml
index e555d8d5df..1bb2484a1c 100644
--- a/ansible/roles/ceph/tasks/start_mons.yml
+++ b/ansible/roles/ceph/tasks/start_mons.yml
@@ -12,4 +12,3 @@
       - "{{ node_config_directory }}/ceph-mon/:{{ container_config_directory }}/:ro"
       - "ceph_mon:/var/lib/ceph"
       - "ceph_mon_config:/etc/ceph"
-  when: inventory_hostname in groups['ceph-mon']
diff --git a/ansible/roles/ceph/tasks/start_osds.yml b/ansible/roles/ceph/tasks/start_osds.yml
index 1324fd80e7..1a59cbcd62 100644
--- a/ansible/roles/ceph/tasks/start_osds.yml
+++ b/ansible/roles/ceph/tasks/start_osds.yml
@@ -45,6 +45,4 @@
   with_together:
     - id.results
     - osds
-  when:
-    - inventory_hostname in groups['ceph-osd']
-    - osds
+  when: osds
diff --git a/ansible/roles/ceph/tasks/start_rgws.yml b/ansible/roles/ceph/tasks/start_rgws.yml
index 4de1e8afdc..f8f963225a 100644
--- a/ansible/roles/ceph/tasks/start_rgws.yml
+++ b/ansible/roles/ceph/tasks/start_rgws.yml
@@ -6,4 +6,3 @@
     image: "{{ ceph_rgw_image_full }}"
     name: "ceph_rgw"
     volumes: "{{ node_config_directory }}/ceph-rgw/:{{ container_config_directory }}/:ro"
-  when: inventory_hostname in groups['ceph-rgw']
diff --git a/ansible/roles/ceph/tasks/upgrade.yml b/ansible/roles/ceph/tasks/upgrade.yml
index ed97d539c0..db8bf0730f 100644
--- a/ansible/roles/ceph/tasks/upgrade.yml
+++ b/ansible/roles/ceph/tasks/upgrade.yml
@@ -1 +1,16 @@
 ---
+- include: config.yml
+
+- include: start_mons.yml
+  serial: "1"
+  when: inventory_hostname in groups['ceph-mon']
+
+- include: start_osds.yml
+  serial: "1"
+  when: inventory_hostname in groups['ceph-osd']
+
+- include: start_rgws.yml
+  serial: "30%"
+  when:
+    - inventory_hostname in groups['ceph-rgw']
+    - enable_ceph_rgw | bool