From 2fc2770529fb9d65cf6be6862155102868f87cb1 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Mon, 5 Sep 2016 14:39:04 +0300 Subject: Make apache-based services use network-dependent servername Currently the servername is incorrectly set for the services running over apache. It currently takes the default value which is just the regular FQDN, when the services actually might be running on different IPs that require alternative FQDNs. This fixes that by filling that value from a fact in hiera that's dependant on the service's network. Closes-Bug: #1625677 Change-Id: Ib7ea5fd2d18a376eaa2f5a3fa5687cb9b719a8e2 --- puppet/services/keystone.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'puppet/services/keystone.yaml') 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 -- cgit 1.2.3-korg