Merge "aodh-base.yaml uses a hard coded keystone region name"

[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 3229495..9480ce8 100644 (file)
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@@ -26,9 +26,19 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  EnableInternalTLS:
+    type: boolean
+    default: false
+
+conditions:
+
+  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   AodhApiPuppetBase:
       type: ../../puppet/services/aodh-api.yaml
       properties:
@@ -62,7 +72,7 @@ outputs:
           command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         step_3:
-          aodh-init-log:
+          aodh_init_log:
             start_order: 0
             image: *aodh_image
             user: root
@@ -76,28 +86,46 @@ outputs:
             privileged: false
             detach: false
             volumes:
-              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - logs:/var/log
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
+                    - logs:/var/log
             command: /usr/bin/aodh-dbsync
         step_4:
-          aodh-api:
+          aodh_api:
             image: *aodh_image
             net: host
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/aodh-api.json:/var/lib/kolla/config_files/config.json: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
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/aodh-api.json:/var/lib/kolla/config_files/config.json: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
+                    - logs:/var/log
+                    -
+                      if:
+                        - internal_tls_enabled
+                        - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
+                        - ''
+                    -
+                      if:
+                        - internal_tls_enabled
+                        - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
+                        - ''
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:
         - name: Stop and disable aodh service (running under httpd)
           tags: step2
           service: name=httpd state=stopped enabled=no
+      metadata_settings:
+        get_attr: [AodhApiPuppetBase, role_data, metadata_settings]