X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fgnocchi-api.yaml;h=3fbdac4e62834951ed6db3adc988312128edc387;hb=c7471e7503a61ed6895ac6ce92ca48afd225343b;hp=a64d15075a82e842a69d93a425f8c0b6ae1068db;hpb=5b4d32cebc121a86377415768800ad49d18bbb30;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml
index a64d1507..3fbdac4e 100644
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack containerized gnocchi service
@@ -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
+
   GnocchiApiPuppetBase:
       type: ../../puppet/services/gnocchi-api.yaml
       properties:
@@ -58,32 +68,11 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiApiImage} ]
       kolla_config:
-          /var/lib/kolla/config_files/gnocchi-api.json:
-           command: /usr/sbin/httpd -DFOREGROUND
-           config_files:
-           - dest: /etc/gnocchi/gnocchi.conf
-             owner: gnocchi
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/gnocchi/gnocchi.conf
-           - dest: /etc/httpd/conf.d/10-gnocchi_wsgi.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/10-gnocchi_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/gnocchi/app
-             owner: gnocchi
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/var/www/cgi-bin/gnocchi/app
+        /var/lib/kolla/config_files/gnocchi-api.json:
+          command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         step_3:
-          gnocchi-init-log:
+          gnocchi_init_log:
             start_order: 0
             image: *gnocchi_image
             user: root
@@ -97,22 +86,41 @@ outputs:
             detach: false
             privileged: false
             volumes:
-              - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - logs:/var/log
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
+                  - logs:/var/log
             command: ["/usr/bin/gnocchi-upgrade", "--skip-storage"]
         step_4:
-          gnocchi-api:
+          gnocchi_api:
             image: *gnocchi_image
             net: host
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/gnocchi-api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/gnocchi/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/gnocchi/etc/httpd/conf.modules.d:/etc/httpd/conf.modules.d:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/gnocchi-api.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
+                  - /var/lib/config-data/gnocchi/etc/httpd/:/etc/httpd/:ro
+                  - /var/lib/config-data/gnocchi/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
+      upgrade_tasks:
+        - name: Stop and disable httpd service
+          tags: step2
+          service: name=httpd state=stopped enabled=no
+      metadata_settings:
+        get_attr: [GnocchiApiPuppetBase, role_data, metadata_settings]