diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-07-25 05:11:45 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-07-25 05:11:45 +0000 |
commit | c282288e977a8f0e970416430a710d242b9bc48d (patch) | |
tree | 8fe4ebe2f8d2386cd2ac7c4058f4d7fe1223be34 /puppet/services | |
parent | 5b3df63f64ce0298aa34b40f73ace24a87f51427 (diff) | |
parent | 793ec547f782007abf8afdf6cecf0c2ad3aac7df (diff) |
Merge "Add metadata_settings in Heat APIs"
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 |