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 | |
| parent | 75c20d5b5dabed936f86096829377b01f1c3d4b2 (diff) | |
| parent | 2fc2770529fb9d65cf6be6862155102868f87cb1 (diff) | |
Merge "Make apache-based services use network-dependent servername"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/aodh-api.yaml | 6 | ||||
| -rw-r--r-- | puppet/services/ceilometer-api.yaml | 6 | ||||
| -rw-r--r-- | puppet/services/gnocchi-api.yaml | 6 | ||||
| -rw-r--r-- | puppet/services/keystone.yaml | 13 |
4 files changed, 30 insertions, 1 deletions
diff --git a/puppet/services/aodh-api.yaml b/puppet/services/aodh-api.yaml index c84614ba..15e93863 100644 --- a/puppet/services/aodh-api.yaml +++ b/puppet/services/aodh-api.yaml @@ -53,6 +53,12 @@ outputs: - get_attr: [AodhBase, role_data, config_settings] - get_attr: [ApacheServiceBase, role_data, config_settings] - aodh::wsgi::apache::ssl: false + aodh::wsgi::apache::servername: + str_replace: + template: + '"%{::fqdn_$NETWORK}"' + params: + $NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]} aodh::api::service_name: 'httpd' tripleo.aodh_api.firewall_rules: '128 aodh-api': 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 diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml index e8f25bb1..07d3b01e 100644 --- a/puppet/services/gnocchi-api.yaml +++ b/puppet/services/gnocchi-api.yaml @@ -89,6 +89,12 @@ outputs: gnocchi::keystone::authtoken::password: {get_param: GnocchiPassword} gnocchi::keystone::authtoken::project_name: 'service' gnocchi::wsgi::apache::ssl: false + gnocchi::wsgi::apache::servername: + str_replace: + template: + '"%{::fqdn_$NETWORK}"' + params: + $NETWORK: {get_param: [ServiceNetMap, GnocchiApiNetwork]} tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend} # NOTE: bind IP is found in Heat replacing the network name with the # local node IP for the given network; replacement examples diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index b488fb44..e358930b 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -172,7 +172,18 @@ outputs: value: 'keystone.contrib.ec2.backends.sql.Ec2' keystone::service_name: 'httpd' keystone::wsgi::apache::ssl: false - + keystone::wsgi::apache::servername: + str_replace: + template: + '"%{::fqdn_$NETWORK}"' + params: + $NETWORK: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]} + keystone::wsgi::apache::servername_admin: + str_replace: + template: + '"%{::fqdn_$NETWORK}"' + params: + $NETWORK: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]} keystone::wsgi::apache::workers: {get_param: KeystoneWorkers} # override via extraconfig: keystone::wsgi::apache::threads: 1 |