neutron: stop include ::neutron & ::neutron::config

[apex-tripleo-heat-templates.git] / docker / compute-post.yaml

diff --git a/docker/compute-post.yaml b/docker/compute-post.yaml
index 09d0e9f..3c4a941 100644 (file)
--- a/docker/compute-post.yaml
+++ b/docker/compute-post.yaml
@@ -173,7 +173,7 @@ resources:
   NovaComputeContainersConfigOVS:
     type: OS::Heat::StructuredConfig
     properties:
-      group: docker-compose
+      group: docker-cmd
       config:
         ovsvswitchd:
           image:
@@ -200,6 +200,7 @@ resources:
           volumes:
            - /run:/run
            - /var/lib/etc-data/json-config/ovsdb-server.json:/var/lib/kolla/config_files/config.json
+           - /etc/openvswitchd:/etc/openvswitchd
           environment:
            - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
 
@@ -235,7 +236,7 @@ resources:
   LibvirtContainersConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: docker-compose
+      group: docker-cmd
       config:
         computedata:
           image:
@@ -280,7 +281,7 @@ resources:
   NovaComputeContainersConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: docker-compose
+      group: docker-cmd
       config:
         neutronovsagent:
           image: