Merge "Use conditionals for neutron and glance worker defaults"

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

diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml
index d9a7828..90fe65f 100644 (file)
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@@ -34,6 +34,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NeutronL3Base:
     type: ../../puppet/services/neutron-l3.yaml
     properties:
@@ -49,11 +52,6 @@ outputs:
       config_settings: {get_attr: [NeutronL3Base, role_data, config_settings]}
       step_config: &step_config
         get_attr: [NeutronL3Base, role_data, step_config]
-      docker_image: &neutron_l3_agent_image
-        list_join:
-        - '/'
-        - [ {get_param: DockerNamespace}, {get_param: DockerNeutronL3AgentImage} ]
-
       puppet_config:
         puppet_tags: neutron_config,neutron_l3_agent_config
         config_volume: neutron
@@ -64,29 +62,27 @@ outputs:
             - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/neutron-l3-agent.json:
-           command: /usr/bin/neutron-l3-agent --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/l3_agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini
-           config_files:
-           - dest: /etc/neutron/neutron.conf
-             owner: neutron
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/neutron/neutron.conf
-           - dest: /etc/neutron/l3_agent.ini
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/neutron/l3_agent.ini
+          command: /usr/bin/neutron-l3-agent --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/l3_agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini
       docker_config:
         step_4:
           neutronl3agent:
-            image: *neutron_l3_agent_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerNeutronL3AgentImage} ]
             net: host
             pid: host
             privileged: true
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/neutron-l3-agent.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/neutron:/var/lib/kolla/config_files/src:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /lib/modules:/lib/modules:ro
-              - /run:/run
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/neutron-l3-agent.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
+                    - /lib/modules:/lib/modules:ro
+                    - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS