openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Edit some post update tasks logic" into stable/queens

This commit is contained in:
Zuul 2018-08-30 14:05:32 +00:00 committed by Gerrit Code Review
parent 7b6971607e f606c846dd
commit 7b0a8eb337
4 changed files with 56 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
docker/services/opendaylight-api.yaml
View File

@ -223,18 +223,6 @@ outputs:
mode: 0644
when: step|int == 1
post_upgrade_tasks: &odl_container_post_upgrade_tasks
- name: Disable Upgrade Flag via Rest
shell:
str_replace:
template: 'curl -k -v --silent --fail -u ODL_USERNAME:$ODL_PASSWORD -X \
PUT -d "{ "config": { "upgradeInProgress": false } }" \
-H "Content-Type: application/json" \
$ODL_URI/restconf/config/genius-mdsalutil:config'
params:
$ODL_USERNAME: {get_attr: [OpenDaylightBase, role_data, config_settings, 'opendaylight::username']}
$ODL_PASSWORD: {get_attr: [OpenDaylightBase, role_data, config_settings, 'opendaylight::password']}
$ODL_URI: {get_param: [EndpointMap, OpenDaylightInternal, uri]}
when: step|int == 0
- name: Disable Upgrade in Config File
copy:
dest: /var/lib/config-data/puppet-generated/opendaylight/opt/opendaylight/etc/opendaylight/datastore/initial/config/genius-mdsalutil-config.xml
@ -246,6 +234,24 @@ outputs:
group: 42462
mode: 0644
when: step|int == 0
# 2 commands in 1 task because the sequence of commands needs to be ensured
# and that no other task is executed in between.
- name: Delete Upgrade Flag and Unset it via Rest
shell:
str_replace:
template: >
curl -k -v --silent --fail -u $ODL_USERNAME:$ODL_PASSWORD
-H "Content-Type: application/json" -X DELETE
$ODL_URI/restconf/config/genius-mdsalutil:config;
curl -k -v --silent --fail -u $ODL_USERNAME:$ODL_PASSWORD
-H "Content-Type: application/json" -X POST
$ODL_URI/restconf/config/genius-mdsalutil:config
-d "{ "upgradeInProgress": false }"
params:
$ODL_USERNAME: {get_attr: [OpenDaylightBase, role_data, config_settings, 'opendaylight::username']}
$ODL_PASSWORD: {get_attr: [OpenDaylightBase, role_data, config_settings, 'opendaylight::password']}
$ODL_URI: {get_param: [EndpointMap, OpenDaylightInternal, uri]}
when: step|int == 0
update_tasks:
- name: Get ODL update level
block: &get_odl_update_level

4
network/endpoints/endpoint_data.yaml
View File

@ -363,7 +363,7 @@ DockerRegistry:
OpenDaylight:
Internal:
net_param: OpenDaylightApi
net_param: OpendaylightApi
Admin:
net_param: OpenDaylightApi
net_param: OpendaylightApi
port: 8081

32
network/endpoints/endpoint_map.yaml
View File

@ -6621,14 +6621,14 @@ outputs:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
- get_param: [ServiceNetMap, OpendaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, OpenDaylightApiNetwork]
get_param: [ServiceNetMap, OpendaylightApiNetwork]
template: NETWORK_uri
host_nobrackets:
str_replace:
@ -6638,11 +6638,11 @@ outputs:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
- get_param: [ServiceNetMap, OpendaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
- get_param: [ServiceNetMap, OpendaylightApiNetwork]
port:
get_param: [EndpointMap, OpenDaylightAdmin, port]
protocol:
@ -6659,14 +6659,14 @@ outputs:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
- get_param: [ServiceNetMap, OpendaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, OpenDaylightApiNetwork]
get_param: [ServiceNetMap, OpendaylightApiNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, OpenDaylightAdmin, port]
@ -6682,14 +6682,14 @@ outputs:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
- get_param: [ServiceNetMap, OpendaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, OpenDaylightApiNetwork]
get_param: [ServiceNetMap, OpendaylightApiNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, OpenDaylightAdmin, port]
@ -6702,14 +6702,14 @@ outputs:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
- get_param: [ServiceNetMap, OpendaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, OpenDaylightApiNetwork]
get_param: [ServiceNetMap, OpendaylightApiNetwork]
template: NETWORK_uri
host_nobrackets:
str_replace:
@ -6719,11 +6719,11 @@ outputs:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
- get_param: [ServiceNetMap, OpendaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
- get_param: [ServiceNetMap, OpendaylightApiNetwork]
port:
get_param: [EndpointMap, OpenDaylightInternal, port]
protocol:
@ -6740,14 +6740,14 @@ outputs:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
- get_param: [ServiceNetMap, OpendaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, OpenDaylightApiNetwork]
get_param: [ServiceNetMap, OpendaylightApiNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, OpenDaylightInternal, port]
@ -6763,14 +6763,14 @@ outputs:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, OpenDaylightApiNetwork]
- get_param: [ServiceNetMap, OpendaylightApiNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, OpenDaylightApiNetwork]
get_param: [ServiceNetMap, OpendaylightApiNetwork]
template: NETWORK_uri
port:
get_param: [EndpointMap, OpenDaylightInternal, port]

72
puppet/services/opendaylight-ovs.yaml
View File

@ -246,55 +246,28 @@ outputs:
list_concat:
- get_attr: [Ovs, role_data, upgrade_tasks]
-
- name: Check if openvswitch is deployed
command: systemctl is-enabled openvswitch
tags: common
ignore_errors: True
register: openvswitch_enabled
- name: "PreUpgrade step0,validation: Check service openvswitch is running"
command: systemctl is-active --quiet openvswitch
when:
- step|int == 0
- openvswitch_enabled.rc == 0
tags: validation
- name: Stop openvswitch service
when:
- step|int == 1
- openvswitch_enabled.rc == 0
service: name=openvswitch state=stopped
# Container upgrade steps.
- name: ODL container L2 update and upgrade tasks
block: &odl_container_upgrade_tasks
- name: Block connections to ODL. #This rule will be inserted at the top.
iptables: chain=OUTPUT action=insert protocol=tcp destination_port={{ item }} jump=DROP
when: step|int == 0
with_items:
- 6640
- 6653
- 6633
post_upgrade_tasks: &odl_container_post_upgrade_tasks
- name: Check service openvswitch is running
command: systemctl is-active --quiet openvswitch
tags: common
register: openvswitch_running
- name: Delete OVS groups and ports
shell: "sudo ovs-ofctl -O Openflow13 del-groups br-int; \
for tun_port in $(ovs-vsctl list-ports br-int | grep 'tun'); \
do; ovs-vsctl del-port br-int $(tun_port); done;"
when: (step|int == 0) and (openvswitch_running.rc == 0)
- name: Stop openvswitch service
when: (step|int == 1) and (openvswitch_running.rc == 0)
service: name=openvswitch state=stopped
- name: Unblock OVS port per compute node. #Delete previously added rule
iptables: chain=OUTPUT action=insert protocol=tcp destination_port={{ item }} jump=DROP state=absent
when: step|int == 2
with_items:
- 6640
- 6653
- 6633
- name: start openvswitch service
when: step|int == 3
service : name=openvswitch state=started
- name: Check if openvswitch is deployed
command: systemctl is-enabled openvswitch
tags: common
ignore_errors: True
register: openvswitch_enabled
- name: "PreUpgrade step0,validation: Check service openvswitch is running"
command: systemctl is-active --quiet openvswitch
when:
- step|int == 0
- openvswitch_enabled.rc == 0
tags: validation
# Container upgrade steps.
- name: Delete OVS groups and ports
shell: >
sudo ovs-ofctl -O Openflow13 del-groups br-int;
for tun_port in $(sudo ovs-vsctl list-ports br-int | grep tun);
do sudo ovs-vsctl del-port br-int $tun_port; done
when:
- step|int == 0
- openvswitch_enabled.rc == 0
update_tasks:
- name: Get ODL update level
block: &get_odl_update_level
@ -304,11 +277,6 @@ outputs:
- name: Run L2 update tasks that are similar to upgrade_tasks when update level is 2
block: *odl_container_upgrade_tasks
when: odl_update_level == 2
post_update_tasks:
- block: *get_odl_update_level
- block: *odl_container_post_upgrade_tasks
when: odl_update_level == 2
metadata_settings:
if:
- internal_tls_enabled