diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-12-01 13:01:14 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-12-01 13:01:14 +0000 |
commit | ea3ace78398015578de77be5a782dfa6176decb7 (patch) | |
tree | 9806ff6109463e8c5bcfcefe26052cf5a6fd85da /puppet/services/keystone.yaml | |
parent | 096259f7140ec8476fcbb7605c90155079b0c6bc (diff) | |
parent | 787685101179f13f6074901070cf307bd9bb0731 (diff) |
Merge "Hiera optimization: use a new hiera hook"
Diffstat (limited to 'puppet/services/keystone.yaml')
-rw-r--r-- | puppet/services/keystone.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index fe023a6a..c2a282d4 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -89,7 +89,7 @@ parameters: KeystoneWorkers: type: string description: Set the number of workers for keystone::wsgi::apache - default: '"%{::os_workers}"' + default: '%{::os_workers}' MonitoringSubscriptionKeystone: default: 'overcloud-keystone' type: string @@ -195,13 +195,13 @@ outputs: keystone::wsgi::apache::servername: str_replace: template: - '"%{::fqdn_$NETWORK}"' + '%{::fqdn_$NETWORK}' params: $NETWORK: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]} keystone::wsgi::apache::servername_admin: str_replace: template: - '"%{::fqdn_$NETWORK}"' + '%{::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}"' + '%{::fqdn_$NETWORK}' params: $NETWORK: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]} keystone::public_bind_host: str_replace: template: - '"%{::fqdn_$NETWORK}"' + '%{::fqdn_$NETWORK}' params: $NETWORK: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]} # NOTE: bind IP is found in Heat replacing the network name with the |