Merge "Update cinder-netapp-config environment"

[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 e14868e..b692f73 100644 (file)
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@@ -12,10 +12,9 @@ parameters:
     description: image
     default: 'centos-binary-neutron-l3-agent:latest'
     type: string
-  # we configure all neutron services in the same neutron
   DockerNeutronConfigImage:
-    description: image
-    default: 'centos-binary-neutron-openvswitch-agent:latest'
+    description: The container image to use for the neutron config_volume
+    default: 'centos-binary-neutron-server:latest'
     type: string
   ServiceNetMap:
     default: {}
@@ -71,15 +70,15 @@ 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
+        /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-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-l3-agent
           permissions:
             - path: /var/log/neutron
               owner: neutron:neutron
               recurse: true
       docker_config:
         step_4:
-          neutronl3agent:
+          neutron_l3_agent:
             image:
               list_join:
                 - '/'
@@ -92,7 +91,7 @@ outputs:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
-                  - /var/lib/kolla/config_files/neutron-l3-agent.json:/var/lib/kolla/config_files/config.json:ro
+                  - /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
@@ -104,3 +103,8 @@ outputs:
           file:
             path: /var/log/containers/neutron
             state: directory
+      upgrade_tasks:
+        - name: Stop and disable neutron_l3 service
+          tags: step2
+          service: name=neutron-l3-agent state=stopped enabled=no
+