Added the option to copy changes between stock env.d and repo env.d[M->N]

The location of the env.d files for the Newton release has been changed
to the inventory folder and needs to be updated in the existing upgrade
playbook.

This issue is fixed in the current patch. Also the playbook only copies
changes between the stock env.d and files in /etc/openstack_deploy/env.d
located in the root repo.

Change-Id: I9b368617565931306bd075a0f5626466ad924493
Closes-Bug: #1620691
This commit is contained in:
Shashank Tavildar 2016-09-06 15:09:16 +00:00 committed by Jesse Pretorius (odyssey4me)
parent 1d8b4c5183
commit 5a878af6b9

View File

@ -25,14 +25,24 @@
dest: "/etc/openstack_deploy.NEWTON/"
force: no
- name: Retrieve differences
shell: rsync -avun "{{ repo_root_dir }}/playbooks/inventory/env.d/" "/etc/openstack_deploy/env.d/" | grep "yml$"
ignore_errors: yes
register: diff_result
- name: Copy new env.d files into place
copy:
src: "{{ repo_root_dir }}/etc/openstack_deploy/env.d/{{ item }}.yml"
dest: "/etc/openstack_deploy/env.d/{{ item }}.yml"
src: "{{ repo_root_dir }}/playbooks/inventory/env.d/{{ item }}"
dest: "/etc/openstack_deploy/env.d/{{ item }}"
force: no
with_items:
- ironic
- "{{ diff_result.stdout_lines }}"
when: diff_result.stdout != ""
- name: Check result for emptiness
debug: msg="All new env.d files are placed in the stock repo. No new changes"
when: diff_result.stdout == ""
- name: Update OpenStack variable names
command: "{{ upgrade_scripts }}/migrate_openstack_vars.py {{ item }} {{ (item | basename)[:-4] }}"
args: