Add configuration variable for os-config-refresh folder

As a result of a change in upstream TripleO where the location of
os-config-refresh files changed from /opt/stack/os-config-refresh
to /usr/libexec/os-refresh-config, we have changed this to be
an option that can be set by the user.

Change-Id: I1e2d756753ae1f4362db4da9463c6346caeaa725

playbooks/cleanup_rabbitmq_start.yml

@@ -18,12 +18,12 @@
   ignore_errors: yes
   register: rabbit_cluster_test
 - name: Collect names of post-configure.d rabbitmq files
-  shell: ls /opt/stack/os-config-refresh/post-configure.d/|grep '\-rabbitmq$'
+  shell: ls "{{os_refresh_config_folder}}/post-configure.d/"|grep '\-rabbitmq$'
   register: test_rabbitmq_script_list
   when: single_controller is not defined and rabbit_cluster_test.rc == 0
 - name: If node rabbitmq cluster config was present, re-enable os-refresh-config post-configure.d.
   sudo: yes
-  file: mode=0755 path="/opt/stack/os-config-refresh/post-configure.d/{{item}}"
+  file: mode=0755 path="{{os_refresh_config_folder}}/post-configure.d/{{item}}"
   when: single_controller is not defined and rabbit_cluster_test.rc == 0
   with_items: test_rabbitmq_script_list.stdout_lines
 - name: "Removing temporary rabbitmq-server override"

playbooks/rabbitmq_occ_disable.yml

@@ -17,10 +17,10 @@
   ignore_errors: yes
   register: rabbit_cluster_test
 - name: Collect names of post-configure.d rabbitmq files
-  shell: ls /opt/stack/os-config-refresh/post-configure.d/|grep '\-rabbitmq$'
+  shell: ls "{{os_refresh_config_folder}}/post-configure.d/"|grep '\-rabbitmq$'
   register: test_rabbitmq_script_list
   when: rabbit_cluster_test.rc == 0
 - name: If node rabbitmq cluster config was present, prevent os-refresh-config post-configure.d job from executing.
-  file: mode=0644 path="/opt/stack/os-config-refresh/post-configure.d/{{item}}"
+  file: mode=0644 path="{{os_refresh_config_folder}}/post-configure.d/{{item}}"
   when: rabbit_cluster_test.rc == 0
   with_items: test_rabbitmq_script_list.stdout_lines

playbooks/rebuild.yml

@@ -31,3 +31,11 @@
     wait_for: 900
   delegate_to: localhost
   when: force_rebuild is defined
+  register: test_rebuild_forced
+- name: "Record that instance was rebuilt under normal circumstances"
+  set_fact: instance_rebuilt=true
+  when: test_rebuild_forced.changed == true
+- name: "If we did not rebuild, and the image IDs already match, trigger the ephemeral disk to remount."
+  sudo: yes
+  command: "{{os_refresh_config_folder}}/pre-configure.d/00-fix-ephemeral-mount"
+  when: instance_image_id == rebuild_image_id and force_rebuild is not defined or instance_rebuilt == false

playbooks/start_rabbitmq.yml

@@ -17,11 +17,11 @@
   ignore_errors: yes
   register: rabbit_cluster_test
 - name: Collect names of post-configure.d rabbitmq files
-  shell: ls /opt/stack/os-config-refresh/post-configure.d/|grep '\-rabbitmq$'
+  shell: ls "{{os_refresh_config_folder}}/post-configure.d/"|grep '\-rabbitmq$'
   register: test_rabbitmq_script_list
   when: rabbit_cluster_test.rc == 0
 - name: If node rabbitmq cluster config was present, prevent os-refresh-config post-configure.d job from executing.
-  file: mode=0644 path="/opt/stack/os-config-refresh/post-configure.d/{{item}}"
+  file: mode=0644 path="{{os_refresh_config_folder}}/post-configure.d/{{item}}"
   when: rabbit_cluster_test.rc == 0
   with_items: test_rabbitmq_script_list.stdout_lines
   sudo: yes

playbooks/step_generate_hosts_file.yml

@@ -21,4 +21,4 @@
 # to have the same end effect.
 - name: Trigger hosts file generation
   sudo: yes
-  command: /opt/stack/os-config-refresh/configure.d/51-hosts
+  command: "{{os_refresh_config_folder}}/configure.d/51-hosts"

plugins/inventory/group_vars/all

@@ -17,6 +17,7 @@ key_name: ansible_key
 #helion: True
 #force_rebuild: True
 wait_for_hostkey: True
+os_refresh_config_folder: /usr/libexec/os-refresh-config/
 # This overcloud controller list is for upstream openstack
 #single_controller: True
 # This option adjusts logic to enable single controllers to be upgraded