Merge "use versioned keystone endpoint in OPENSTACK_KEYSTONE_URL"

This commit is contained in:
Zuul 2018-06-29 19:39:04 +00:00 committed by Gerrit Code Review
commit ddabb32f13

View File

@ -121,7 +121,7 @@ outputs:
"%{hiera('$NETWORK')}" "%{hiera('$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, HorizonNetwork]} $NETWORK: {get_param: [ServiceNetMap, HorizonNetwork]}
horizon::keystone_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]} horizon::keystone_url: {get_param: [EndpointMap, KeystoneV3Public, uri]}
horizon::password_validator: {get_param: [HorizonPasswordValidator]} horizon::password_validator: {get_param: [HorizonPasswordValidator]}
horizon::password_validator_help: {get_param: [HorizonPasswordValidatorHelp]} horizon::password_validator_help: {get_param: [HorizonPasswordValidatorHelp]}
horizon::secret_key: horizon::secret_key: