diff options
| -rw-r--r-- | overcloud.yaml | 2 | ||||
| -rw-r--r-- | puppet/compute.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/keystone.yaml | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index aeb1c1bb..4e00b971 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -149,8 +149,6 @@ parameters: ControllerCount: type: number default: 1 - constraints: - - range: {min: 1} controllerExtraConfig: default: {} description: | diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 8de9a19c..d4fdea3d 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -485,7 +485,7 @@ resources: upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute} ceilometer_metering_secret: {get_param: CeilometerMeteringSecret} ceilometer_password: {get_param: CeilometerPassword} - ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]} + ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]} neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]} neutron_password: {get_param: NeutronPassword} diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index e98be118..404ce6cd 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -87,7 +87,7 @@ parameters: KeystoneWorkers: type: string description: Set the number of workers for keystone::wsgi::apache - default: '$::processorcount' + default: '"%{::processorcount}"' outputs: role_data: description: Role data for the Keystone role. |