Merge "Change ManageEventPipeline to true" 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..81bb1c2 100644 (file)
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@@ -78,6 +78,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}