Merge "Add l2gw neutron service plugin support"

[apex-tripleo-heat-templates.git] / docker / services / nova-placement.yaml

diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index e49839b..0c595dc 100644 (file)
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -58,35 +58,8 @@ outputs:
           - '/'
           - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/nova_placement.json:
-           command: /usr/sbin/httpd -DFOREGROUND
-           config_files:
-           - dest: /etc/nova/nova.conf
-             owner: nova
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/nova/nova.conf
-           - dest: /etc/httpd/conf.d/10-placement_wsgi.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/10-placement_wsgi.conf
-           # puppet generates a stubbed out version of the stock one so we
-           # copy it in to overwrite the existing one
-           - dest: /etc/httpd/conf.d/00-nova-placement-api.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/00-nova-placement-api.conf
-           - dest: /etc/httpd/conf/httpd.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/httpd.conf
-           - dest: /etc/httpd/conf/ports.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/ports.conf
-           - dest: /var/www/cgi-bin/nova/nova-placement-api
-             owner: nova
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/var/www/cgi-bin/nova/nova-placement-api
+        /var/lib/kolla/config_files/nova_placement.json:
+          command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         # start this early so it is up before computes start reporting
         step_3:
@@ -98,8 +71,9 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/nova_placement/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/nova_placement/etc/httpd/conf.modules.d:/etc/httpd/conf.modules.d:ro
+              - /var/lib/config-data/nova_placement/etc/nova/:/etc/nova/:ro
+              - /var/lib/config-data/nova_placement/etc/httpd/:/etc/httpd/:ro
+              - /var/lib/config-data/nova_placement/var/www/:/var/www/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment: