diff options
| author |   Thomas Herve <therve@redhat.com> | 2017-07-24 13:30:08 +0200 |
|---|---|---|
| committer | Thomas Herve <therve@redhat.com> | 2017-07-24 13:30:08 +0200 |
| commit | 793ec547f782007abf8afdf6cecf0c2ad3aac7df (patch) | |
| tree | c48c41d1c328a38c02b78d4f6a6b793c2274d67e /puppet/services | |
| parent | 84e6bff8a62539b381c5706fab7b8ea90f00f0dd (diff) | |
Add metadata_settings in Heat APIs
We don't expose metadata_settings in Heat services, so SSL shouldn't
work.
Change-Id: I411085d9b249e54a2462de5efe4abf8f0865c0c2
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/heat-api-cfn.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/heat-api-cloudwatch.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/heat-api.yaml | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/puppet/services/heat-api-cfn.yaml b/puppet/services/heat-api-cfn.yaml index 2c13cb30..070bd7c7 100644 --- a/puppet/services/heat-api-cfn.yaml +++ b/puppet/services/heat-api-cfn.yaml @@ -130,6 +130,8 @@ outputs: heat::keystone::auth_cfn::admin_url: {get_param: [EndpointMap, HeatCfnAdmin, uri]} heat::keystone::auth_cfn::password: {get_param: HeatPassword} heat::keystone::auth_cfn::region: {get_param: KeystoneRegion} + metadata_settings: + get_attr: [ApacheServiceBase, role_data, metadata_settings] upgrade_tasks: - name: Check if heat_api_cfn is deployed command: systemctl is-enabled openstack-heat-api-cfn diff --git a/puppet/services/heat-api-cloudwatch.yaml b/puppet/services/heat-api-cloudwatch.yaml index b23dc895..689251a3 100644 --- a/puppet/services/heat-api-cloudwatch.yaml +++ b/puppet/services/heat-api-cloudwatch.yaml @@ -114,6 +114,8 @@ outputs: - heat::wsgi::apache_api_cloudwatch::workers: {get_param: HeatWorkers} step_config: | include ::tripleo::profile::base::heat::api_cloudwatch + metadata_settings: + get_attr: [ApacheServiceBase, role_data, metadata_settings] upgrade_tasks: - name: Check if heat_api_cloudwatch is deployed command: systemctl is-enabled openstack-heat-api-cloudwatch diff --git a/puppet/services/heat-api.yaml b/puppet/services/heat-api.yaml index 3349271c..51f52a71 100644 --- a/puppet/services/heat-api.yaml +++ b/puppet/services/heat-api.yaml @@ -137,6 +137,8 @@ outputs: heat::keystone::auth::admin_url: {get_param: [EndpointMap, HeatAdmin, uri]} heat::keystone::auth::password: {get_param: HeatPassword} heat::keystone::auth::region: {get_param: KeystoneRegion} + metadata_settings: + get_attr: [ApacheServiceBase, role_data, metadata_settings] upgrade_tasks: - name: Check is heat_api is deployed command: systemctl is-enabled openstack-heat-api |