Merge "Add IronicPxe to the default controller" into stable/pike

[apex-tripleo-heat-templates.git] / docker / services / neutron-ovs-agent.yaml

diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml
index 4cce23d..e6faf34 100644 (file)
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@@ -36,6 +36,10 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  UpgradeRemoveUnusedPackages:
+    default: false
+    description: Remove package if the service is being disabled during upgrade
+    type: boolean
 
 resources:
 
@@ -58,6 +62,8 @@ outputs:
     value:
       service_name: {get_attr: [NeutronOvsAgentBase, role_data, service_name]}
       config_settings: {get_attr: [NeutronOvsAgentBase, role_data, config_settings]}
+      logging_source: {get_attr: [NeutronOvsAgentBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NeutronOvsAgentBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [NeutronOvsAgentBase, role_data, step_config]
       puppet_config:
@@ -78,6 +84,37 @@ outputs:
               owner: neutron:neutron
               recurse: true
       docker_config:
+        step_3:
+          neutron_ovs_bridge:
+            detach: false
+            image: {get_param: DockerNeutronConfigImage}
+            net: host
+            pid: host
+            user: root
+            privileged: true
+            command:
+              - puppet
+              - apply
+              - --modulepath
+              - /etc/puppet/modules:/usr/share/openstack-puppet/modules
+              - --tags
+              - file,file_line,concat,augeas,neutron::plugins::ovs::bridge
+              - -v
+              - -e
+              - include neutron::agents::ml2::ovs
+            volumes:
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                  - /lib/modules:/lib/modules:ro
+                  - /run:/run
+                  - /etc/puppet:/etc/puppet:ro
+                  - /usr/share/openstack-puppet/modules/:/usr/share/openstack-puppet/modules/:ro
+                  - /var/run/openvswitch/db.sock:/var/run/openvswitch/db.sock
+            environment:
+              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
         step_4:
           neutron_ovs_agent:
             image: {get_param: DockerOpenvswitchImage}
@@ -105,3 +142,8 @@ outputs:
         - name: Stop and disable neutron_ovs_agent service
           tags: step2
           service: name=neutron-openvswitch-agent state=stopped enabled=no
+        - name: Remove openstack-neutron-openvswitch package if operator requests it
+          yum: name=openstack-neutron-openvswitch state=removed
+          tags: step2
+          ignore_errors: True
+          when: {get_param: UpgradeRemoveUnusedPackages}