diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-23 08:39:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-23 08:39:09 +0000 |
| commit | 56057325a95bb521e2ed8a322223c1f858ab25fe (patch) | |
| tree | c08ff4349746748129ff7a85c00dcbea606c19e6 /puppet/services/ceilometer-api.yaml | |
| parent | 75c20d5b5dabed936f86096829377b01f1c3d4b2 (diff) | |
| parent | 2fc2770529fb9d65cf6be6862155102868f87cb1 (diff) | |
Merge "Make apache-based services use network-dependent servername"
Diffstat (limited to 'puppet/services/ceilometer-api.yaml')
| -rw-r--r-- | puppet/services/ceilometer-api.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml index c6e36502..c8f679c2 100644 --- a/puppet/services/ceilometer-api.yaml +++ b/puppet/services/ceilometer-api.yaml @@ -71,5 +71,11 @@ outputs: ceilometer::api::host: {get_param: [ServiceNetMap, CeilometerApiNetwork]} ceilometer::wsgi::apache::bind_host: {get_param: [ServiceNetMap, CeilometerApiNetwork]} ceilometer::wsgi::apache::ssl: false + ceilometer::wsgi::apache::servername: + str_replace: + template: + '"%{::fqdn_$NETWORK}"' + params: + $NETWORK: {get_param: [ServiceNetMap, CeilometerApiNetwork]} step_config: | include ::tripleo::profile::base::ceilometer::api |