openstack/openstack-ansible-ops
Code Issues Proposed changes

Add insecure flag for post upgrade CLI commands

Browse Source 
In situations where self signed certs are utilized for the API,
the addition of the insecure is necessary to make post-redeploy-cleanup
work.

Change-Id: Ie5d5b6248feba5c4479567d22e74c76065725fda
This commit is contained in:
Bjoern Teipel 2018-01-19 15:55:12 -06:00
parent bfa655cbee
commit 80db361d31
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
leap-upgrades/upgrade-utilities/post-redeploy-cleanup.yml
View File

@ -49,7 +49,7 @@
- name: Registering what to disable - name: Registering what to disable
shell: | shell: |
. {{ ansible_env.HOME }}/openrc . {{ ansible_env.HOME }}/openrc
{{ item.name }} {{ item.list_command}} | awk '{{ item.awk_filter }}{print {{ item.awk_print_column }} }' {{ item.name }} {{ openrc_insecure |default(false) |bool |ternary('--insecure','') }} {{ item.list_command}} | awk '{{ item.awk_filter }}{print {{ item.awk_print_column }} }'
register: to_disable register: to_disable
with_items: "{{ services }}" with_items: "{{ services }}"
args: args:
@ -65,7 +65,7 @@
- name: Disabling or deleting the services/agents - name: Disabling or deleting the services/agents
shell: | shell: |
. {{ ansible_env.HOME }}/openrc . {{ ansible_env.HOME }}/openrc
{{ item.0.item.name }} {{ item.0.item.delete_command }} {{ item.1 }} {{ item.0.item.name }} {{ openrc_insecure |default(false) |bool |ternary('--insecure','') }} {{ item.0.item.delete_command }} {{ item.1 }}
{{ item.0.item.post_command | default('')}} {{ item.0.item.post_command | default('')}}
with_subelements: with_subelements:
- to_disable.results - to_disable.results
@ -80,20 +80,20 @@
- name: Removing the cinder services with old container hostnames - name: Removing the cinder services with old container hostnames
shell: | shell: |
. /openstack/venvs/cinder-{{openstack_release}}/bin/activate . /openstack/venvs/cinder-{{openstack_release}}/bin/activate
cinder-manage service list \ cinder-manage {{ openrc_insecure |default(false) |bool |ternary('--insecure','') }} service list \
| awk '/.*_container.*XXX/{print $1" "$2}'\ | awk '/.*_container.*XXX/{print $1" "$2}'\
| while read line; do | while read line; do
cinder-manage service remove $line; cinder-manage {{ openrc_insecure |default(false) |bool |ternary('--insecure','') }} service remove $line;
done done
args: args:
executable: /bin/bash executable: /bin/bash
- name: Move the cinder volumes running in containers to new hostnames - name: Move the cinder volumes running in containers to new hostnames
shell: | shell: |
. /openstack/venvs/cinder-{{openstack_release}}/bin/activate . /openstack/venvs/cinder-{{openstack_release}}/bin/activate
cinder-manage service list \ cinder-manage {{ openrc_insecure |default(false) |bool |ternary('--insecure','') }} service list \
| awk '/volume.*_container.*XXX/{print $2 }'\ | awk '/volume.*_container.*XXX/{print $2 }'\
| while IFS=@ read cinderhost cinderbackend; do | while IFS=@ read cinderhost cinderbackend; do
cinder-manage volume update_host \ cinder-manage {{ openrc_insecure |default(false) |bool |ternary('--insecure','') }} volume update_host \
--currenthost $cinderhost@$cinderbackend \ --currenthost $cinderhost@$cinderbackend \
--newhost ${cinderhost//_/-}@$cinderbackend; --newhost ${cinderhost//_/-}@$cinderbackend;
done done
@ -110,13 +110,13 @@
# dhcp ports in the same network that are active. Print them for deletion. # dhcp ports in the same network that are active. Print them for deletion.
shell: | shell: |
. {{ ansible_env.HOME }}/openrc . {{ ansible_env.HOME }}/openrc
neutron port-list -c id -c device_owner -c binding:host_id -c status \ neutron {{ openrc_insecure |default(false) |bool |ternary('--insecure','') }} port-list -c id -c device_owner -c binding:host_id -c status \
-c network_id -f value | sort -k 5 -k 4 -r | \ -c network_id -f value | sort -k 5 -k 4 -r | \
awk '/dhcp.*BUILD/{net=$5}; /dhcp.*ACTIVE/{if(net==$5){print $1}}' | \ awk '/dhcp.*BUILD/{net=$5}; /dhcp.*ACTIVE/{if(net==$5){print $1}}' | \
while read portid; do while read portid; do
neutron port-update --admin-state-up False $portid neutron {{ openrc_insecure |default(false) |bool |ternary('--insecure','') }} port-update --admin-state-up False $portid
sleep 1 sleep 1
neutron port-delete $portid neutron {{ openrc_insecure |default(false) |bool |ternary('--insecure','') }} port-delete $portid
done done
args: args:
executable: /bin/bash executable: /bin/bash