X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpanko-api.yaml;h=892ad1c185a71a70103af3ecebd46c605153ba6c;hb=HEAD;hp=a41e34f7a97890af7c9bc5941005a53291732845;hpb=7996b2e817b8f53f6e3dc579023e20ef61751c31;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/panko-api.yaml b/puppet/services/panko-api.yaml
index a41e34f7..892ad1c1 100644
--- a/puppet/services/panko-api.yaml
+++ b/puppet/services/panko-api.yaml
@@ -6,6 +6,10 @@ description: >
   be disabled in future releases.
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -45,6 +49,7 @@ resources:
   PankoBase:
     type: ./panko-base.yaml
     properties:
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
@@ -54,6 +59,7 @@ resources:
   ApacheServiceBase:
     type: ./apache.yaml
     properties:
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
@@ -84,8 +90,8 @@ outputs:
             tripleo.panko_api.firewall_rules:
               '140 panko-api':
                 dport:
-                  - 8779
-                  - 13779
+                  - 8977
+                  - 13977
             panko::api::host:
               str_replace:
                 template:
@@ -106,27 +112,24 @@ outputs:
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
       upgrade_tasks:
-        yaql:
-          expression: $.data.apache_upgrade + $.data.panko_api_upgrade
-          data:
-            apache_upgrade:
-              get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
-            panko_api_upgrade:
-              - name: Check if httpd is deployed
-                command: systemctl is-enabled httpd
-                tags: common
-                ignore_errors: True
-                register: httpd_enabled
-              - name: "PreUpgrade step0,validation: Check if httpd is running"
-                shell: >
-                  /usr/bin/systemctl show 'httpd' --property ActiveState |
-                  grep '\bactive\b'
-                when: httpd_enabled.rc == 0
-                tags: step0,validation
-              - name: Stop panko-api service (running under httpd)
-                tags: step1
-                service: name=httpd state=stopped
-                when: httpd_enabled.rc == 0
-              - name: Install openstack-panko-api package if it was not installed
-                tags: step3
-                yum: name=openstack-panko-api state=latest
+        list_concat:
+          - get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
+          -
+            - name: Check if httpd is deployed
+              command: systemctl is-enabled httpd
+              tags: common
+              ignore_errors: True
+              register: httpd_enabled
+            - name: "PreUpgrade step0,validation: Check if httpd is running"
+              shell: >
+                /usr/bin/systemctl show 'httpd' --property ActiveState |
+                grep '\bactive\b'
+              when: httpd_enabled.rc == 0
+              tags: step0,validation
+            - name: Stop panko-api service (running under httpd)
+              tags: step1
+              service: name=httpd state=stopped
+              when: httpd_enabled.rc == 0
+            - name: Install openstack-panko-api package if it was not installed
+              tags: step3
+              yum: name=openstack-panko-api state=latest