Merge "Enables support for configuring Cinder with Pure Storage FlashArray storage...

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

diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml
index 32efc5d..e87bb57 100644 (file)
--- a/docker/services/panko-api.yaml
+++ b/docker/services/panko-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
+
   PankoApiPuppetBase:
     type: ../../puppet/services/panko-api.yaml
     properties:
@@ -58,29 +68,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerPankoApiImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/panko-api.json:
-           command: /usr/sbin/httpd -DFOREGROUND
-           config_files:
-           - dest: /etc/httpd/conf.d/10-panko_wsgi.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/10-panko_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: /etc/panko/panko.conf
-             owner: panko
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/panko/panko.conf
-           - dest: /var/www/cgi-bin/panko/app
-             owner: panko
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/var/www/cgi-bin/panko/app
+        /var/lib/kolla/config_files/panko-api.json:
+          command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         step_3:
           panko-init-log:
@@ -97,10 +86,13 @@ outputs:
             detach: false
             privileged: false
             volumes:
-              - /var/lib/config-data/panko/etc/panko:/etc/panko: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/panko/etc/panko:/etc/panko:ro
+                    - logs:/var/log
             command: /usr/bin/panko-dbsync
         step_4:
           panko_api:
@@ -110,10 +102,26 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/panko-api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/panko/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/panko/etc/httpd/conf.modules.d:/etc/httpd/conf.modules.d:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/panko-api.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/panko/etc/panko/:/etc/panko/:ro
+                    - /var/lib/config-data/panko/etc/httpd/:/etc/httpd/:ro
+                    - /var/lib/config-data/panko/var/www/:/var/www/:ro
+                    -
+                      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
+      metadata_settings:
+        get_attr: [PankoApiPuppetBase, role_data, metadata_settings]