X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpanko-api.yaml;h=4b74ad45bfd5b8f47636208f1948f07d1ca90428;hb=489761e848ad4be0eb67bc405968ef2870b81f05;hp=700edc7f3442352ed80421ebae4dd8ff344ab344;hpb=370d392dc58a124ffe09800476d1099bf6268cb3;p=apex-tripleo-heat-templates.git diff --git a/puppet/services/panko-api.yaml b/puppet/services/panko-api.yaml index 700edc7f..4b74ad45 100644 --- a/puppet/services/panko-api.yaml +++ b/puppet/services/panko-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2016-04-08 +heat_template_version: ocata description: > OpenStack Panko API service configured with Puppet @@ -55,7 +55,7 @@ outputs: panko::wsgi::apache::servername: str_replace: template: - '%{::fqdn_$NETWORK}' + "%{hiera('fqdn_$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, PankoApiNetwork]} panko::api::service_name: 'httpd' @@ -68,7 +68,7 @@ outputs: panko::api::host: str_replace: template: - '%{::fqdn_$NETWORK}' + "%{hiera('fqdn_$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, PankoApiNetwork]} # NOTE: bind IP is found in Heat replacing the network name with the @@ -82,3 +82,5 @@ outputs: get_attr: [PankoBase, role_data, service_config_settings] step_config: | include tripleo::profile::base::panko::api + metadata_settings: + get_attr: [ApacheServiceBase, role_data, metadata_settings]