Merge "SSH known_hosts config"

[apex-tripleo-heat-templates.git] / docker / services / aodh-api.yaml

diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml
index ca410d6..3229495 100644 (file)
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@@ -58,29 +58,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerAodhApiImage} ]
       kolla_config:
-          /var/lib/kolla/config_files/aodh-api.json:
-           command: /usr/sbin/httpd -DFOREGROUND
-           config_files:
-           - dest: /etc/aodh/aodh.conf
-             owner: aodh
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/aodh/aodh.conf
-           - dest: /etc/httpd/conf.d/10-aodh_wsgi.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/10-aodh_wsgi.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/aodh/app
-             owner: aodh
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/var/www/cgi-bin/aodh/app
+        /var/lib/kolla/config_files/aodh-api.json:
+          command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         step_3:
           aodh-init-log:
@@ -97,7 +76,7 @@ outputs:
             privileged: false
             detach: false
             volumes:
-              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh:ro
+              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - logs:/var/log
@@ -110,8 +89,9 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/aodh-api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/aodh/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/aodh/etc/httpd/conf.modules.d:/etc/httpd/conf.modules.d:ro
+              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
+              - /var/lib/config-data/aodh/etc/httpd/:/etc/httpd/:ro
+              - /var/lib/config-data/aodh/var/www/:/var/www/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - logs:/var/log