From ff20c08afee49ef9b2f51a10e2953d8b944d966a Mon Sep 17 00:00:00 2001
From: Yurii Prokulevych <yprokule@redhat.com>
Date: Tue, 2 Oct 2018 17:10:37 +0200
Subject: [PATCH] [QUEENS-only] Use ceph-ansible during P->Q upgrade.

Change puppet-ceph-external environment file to ceph-ansible-external
during Q->R upgrade.
This is for case when environment was deployed on P release,
 where puppet-ceph is default.

Change-Id: I5fd77af70e5e7fa346157591b1d619e290a8f3d5
---
 tasks/common/auxilary-facts.yaml | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/tasks/common/auxilary-facts.yaml b/tasks/common/auxilary-facts.yaml
index 9bb3fd62..5de96074 100644
--- a/tasks/common/auxilary-facts.yaml
+++ b/tasks/common/auxilary-facts.yaml
@@ -16,6 +16,25 @@
   set_fact:
     deployment_with_ha_upstream: "{{ is_upstream.rc == 0 and pacemaker_present.rc == 0 }}"
 
+- name: assert CephOSD is enabled
+  shell: |
+    source {{ undercloud_rc }}
+    openstack stack output show -f yaml {{ overcloud_stack_name }} EnabledServices | awk '/\s+- ceph_osd/'
+  register: ceph_osd_service
+
+- name: set ceph_osd_enabled fact
+  set_fact:
+    ceph_osd_enabled: "{{ (ceph_osd_service.stdout|length > 0) | ternary(true, false) }}"
+
+- name: change puppet-ceph-external to ceph-ansible-external
+  replace:
+    dest: "{{ overcloud_deploy_script }}"
+    regexp: "(.*){{ tht_directory }}/environments/{{ item.old }}(.*)"
+    replace: '\1{{ tht_directory }}/environments/ceph-ansible/{{ item.new }}\2'
+  with_items:
+    - {'old': 'puppet-ceph-external.yaml', 'new': 'ceph-ansible-external.yaml'}
+  when: not ceph_osd_enabled|bool
+
 - name: get env files used during deploy
   shell: |
     awk '/-e\s|--environment-file\s/ {gsub(/[[:space:]]/, "", $2); print $2}' {{ overcloud_deploy_script }}
@@ -37,16 +56,6 @@
     roles_data: "{{ (roles_data_file.stdout|length > 0) | ternary(roles_data, default_roles_data)}}"
     custom_roles_used: "{{ (roles_data_file.stdout|length > 0) | ternary(true, false)}}"
 
-- name: assert CephOSD is enabled
-  shell: |
-    source {{ undercloud_rc }}
-    openstack stack output show -f yaml {{ overcloud_stack_name }} EnabledServices | awk '/\s+- ceph_osd/'
-  register: ceph_osd_service
-
-- name: set ceph_osd_enabled fact
-  set_fact:
-    ceph_osd_enabled: "{{ (ceph_osd_service.stdout|length > 0) | ternary(true, false) }}"
-
 - name: check if bm nodes are present
   shell: |
     source {{ undercloud_rc }} ;