diff options
| author |   Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-11-28 13:07:12 +0200 |
|---|---|---|
| committer | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-12-01 11:18:23 +0200 |
| commit | b4cd2ed1ee0f5eb86d0cba75ed40d4679210e616 (patch) | |
| tree | bdcd22155d67505bb50d5bbfacb685b4fde4ecc6 /puppet/services/keystone.yaml | |
| parent | 7a2c2b0f938716f6fc584f1c53ac3fa2896d70f3 (diff) | |
Use network-based fqdn entry from hiera instead of the custom fact
This changes how we get the network-based FQDNs for the specific
services, from using the custom fact, to the new hiera entries.
Change-Id: Iae668a5d89fb7bee091db4a761aa6c91d369b276
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 c2a282d4..2b315489 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 |