openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "[Upgrade] Reuse OVS workaround in docker neutron ovs agent"

Browse Source
This commit is contained in:
Zuul 2018-02-09 18:51:23 +00:00 committed by Gerrit Code Review
commit 89a790fd4b
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docker/services/neutron-ovs-agent.yaml
View File

@ -151,6 +151,9 @@ 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:
list_concat:
- get_attr: [NeutronOvsAgentBase, role_data, ovs_upgrade_tasks]
-
- name: Check if neutron_ovs_agent is deployed - name: Check if neutron_ovs_agent is deployed
command: systemctl is-enabled --quiet neutron-openvswitch-agent command: systemctl is-enabled --quiet neutron-openvswitch-agent
tags: common tags: common
@ -158,10 +161,14 @@ outputs:
register: neutron_ovs_agent_enabled register: neutron_ovs_agent_enabled
- name: "PreUpgrade step0,validation: Check service neutron-openvswitch-agent is running" - name: "PreUpgrade step0,validation: Check service neutron-openvswitch-agent is running"
command: systemctl is-active --quiet neutron-openvswitch-agent command: systemctl is-active --quiet neutron-openvswitch-agent
when: (neutron_ovs_agent_enabled.rc == 0) and (step|int == 0) when:
- step|int == 0
- neutron_ovs_agent_enabled.rc == 0
tags: validation tags: validation
- name: Stop and disable neutron_ovs_agent service - name: Stop and disable neutron_ovs_agent service
when: (neutron_ovs_agent_enabled.rc == 0) and (step|int == 2) when:
- step|int == 2
- neutron_ovs_agent_enabled.rc == 0
service: name=neutron-openvswitch-agent state=stopped enabled=no service: name=neutron-openvswitch-agent state=stopped enabled=no
- name: Set fact for removal of openstack-neutron-openvswitch package - name: Set fact for removal of openstack-neutron-openvswitch package
when: step|int == 2 when: step|int == 2
@ -170,4 +177,6 @@ outputs:
- name: Remove openstack-neutron-openvswitch package if operator requests it - name: Remove openstack-neutron-openvswitch package if operator requests it
yum: name=openstack-neutron-openvswitch state=removed yum: name=openstack-neutron-openvswitch state=removed
ignore_errors: True ignore_errors: True
when: (remove_neutron_openvswitch_package|bool) and (step|int == 2) when:
- step|int == 2
- remove_neutron_openvswitch_package|bool

1
puppet/services/neutron-ovs-agent.yaml
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: