Merge "Use httpd in Zaqar docker service"

[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 6dcf91d..bea08e9 100644 (file)
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@@ -44,31 +44,17 @@ outputs:
       config_settings: {get_attr: [NeutronOvsAgentBase, role_data, config_settings]}
       step_config: &step_config
         get_attr: [NeutronOvsAgentBase, role_data, step_config]
-      docker_image: &neutron_ovs_agent_image
-        list_join:
-        - '/'
-        - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]
       puppet_config:
         config_volume: neutron
         puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
         step_config: *step_config
-        config_image: *neutron_ovs_agent_image
+        config_image: &neutron_ovs_agent_image
+          list_join:
+          - '/'
+          - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]
       kolla_config:
         /var/lib/kolla/config_files/neutron-openvswitch-agent.json:
            command: /usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.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/plugins/ml2/openvswitch_agent.ini
-             owner: neutron
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/neutron/plugins/ml2/openvswitch_agent.ini
-           - dest: /etc/neutron/plugins/ml2/ml2_conf.ini
-             owner: neutron
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/neutron/plugins/ml2/ml2_conf.ini
       docker_config:
         step_4:
           neutronovsagent:
@@ -79,7 +65,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/neutron-openvswitch-agent.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/neutron:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
               - /etc/localtime:/etc/localtime:ro
               - /lib/modules:/lib/modules:ro
               - /run:/run