diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-02 09:40:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-02 09:40:36 +0000 |
| commit | 5aa0c861a49d2f1c2b8252e3b8295c44de972231 (patch) | |
| tree | e8534d6859ae22e9807deee9a661266702d96f09 /puppet/services/keystone.yaml | |
| parent | 5854a632c4794b344f6bb695dd256086f6282d55 (diff) | |
| parent | b4cd2ed1ee0f5eb86d0cba75ed40d4679210e616 (diff) | |
Merge "Use network-based fqdn entry from hiera instead of the custom fact"
Diffstat (limited to 'puppet/services/keystone.yaml')
| -rw-r--r-- | puppet/services/keystone.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index f021e18b..e48d7037 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -195,13 +195,13 @@ outputs: keystone::wsgi::apache::servername: str_replace: template: - '%{::fqdn_$NETWORK}' + "%{hiera('fqdn_$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]} keystone::wsgi::apache::servername_admin: str_replace: template: - '%{::fqdn_$NETWORK}' + "%{hiera('fqdn_$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]} keystone::wsgi::apache::workers: {get_param: KeystoneWorkers} @@ -219,13 +219,13 @@ outputs: keystone::admin_bind_host: str_replace: template: - '%{::fqdn_$NETWORK}' + "%{hiera('fqdn_$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]} keystone::public_bind_host: str_replace: template: - '%{::fqdn_$NETWORK}' + "%{hiera('fqdn_$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]} # NOTE: bind IP is found in Heat replacing the network name with the |