[Upgrade] Reuse OVS workaround in docker neutron ovs agent

In puppet neutron ovs agent we apply workaround which we forgot
to reuse in the docker service definition.

Resolves: rhbz#1536142
Closes-Bug: #1744126

Change-Id: If3a63cad754a875f56b604033c1aff498243140c
This commit is contained in:
Lukas Bezdicka 2018-02-07 23:08:40 +01:00
parent 4bef5bd4e4
commit a1c479f93c
2 changed files with 30 additions and 20 deletions

View File

@ -151,23 +151,32 @@ outputs:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]} host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]}
upgrade_tasks: upgrade_tasks:
- name: Check if neutron_ovs_agent is deployed list_concat:
command: systemctl is-enabled --quiet neutron-openvswitch-agent - get_attr: [NeutronOvsAgentBase, role_data, ovs_upgrade_tasks]
tags: common -
ignore_errors: True - name: Check if neutron_ovs_agent is deployed
register: neutron_ovs_agent_enabled command: systemctl is-enabled --quiet neutron-openvswitch-agent
- name: "PreUpgrade step0,validation: Check service neutron-openvswitch-agent is running" tags: common
command: systemctl is-active --quiet neutron-openvswitch-agent ignore_errors: True
when: (neutron_ovs_agent_enabled.rc == 0) and (step|int == 0) register: neutron_ovs_agent_enabled
tags: validation - name: "PreUpgrade step0,validation: Check service neutron-openvswitch-agent is running"
- name: Stop and disable neutron_ovs_agent service command: systemctl is-active --quiet neutron-openvswitch-agent
when: (neutron_ovs_agent_enabled.rc == 0) and (step|int == 2) when:
service: name=neutron-openvswitch-agent state=stopped enabled=no - step|int == 0
- name: Set fact for removal of openstack-neutron-openvswitch package - neutron_ovs_agent_enabled.rc == 0
when: step|int == 2 tags: validation
set_fact: - name: Stop and disable neutron_ovs_agent service
remove_neutron_openvswitch_package: {get_param: UpgradeRemoveUnusedPackages} when:
- name: Remove openstack-neutron-openvswitch package if operator requests it - step|int == 2
yum: name=openstack-neutron-openvswitch state=removed - neutron_ovs_agent_enabled.rc == 0
ignore_errors: True service: name=neutron-openvswitch-agent state=stopped enabled=no
when: (remove_neutron_openvswitch_package|bool) and (step|int == 2) - name: Set fact for removal of openstack-neutron-openvswitch package
when: step|int == 2
set_fact:
remove_neutron_openvswitch_package: {get_param: UpgradeRemoveUnusedPackages}
- name: Remove openstack-neutron-openvswitch package if operator requests it
yum: name=openstack-neutron-openvswitch state=removed
ignore_errors: True
when:
- step|int == 2
- remove_neutron_openvswitch_package|bool

View File

@ -127,6 +127,7 @@ outputs:
description: Role data for the Neutron OVS agent service. description: Role data for the Neutron OVS agent service.
value: value:
service_name: neutron_ovs_agent service_name: neutron_ovs_agent
ovs_upgrade_tasks: {get_attr: [Ovs, role_data, upgrade_tasks]}
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronOvs} monitoring_subscription: {get_param: MonitoringSubscriptionNeutronOvs}
logging_source: {get_param: NeutronOpenVswitchAgentLoggingSource} logging_source: {get_param: NeutronOpenVswitchAgentLoggingSource}
logging_groups: logging_groups: