Merge "Revert "auth_uri and auth_version fix for services""

This commit is contained in:
Jenkins
2016-02-25 18:36:46 +00:00
committed by Gerrit Code Review
11 changed files with 5 additions and 65 deletions

View File

@@ -787,8 +787,9 @@ def create_manifest(config, messages):
else:
config['CONFIG_KEYSTONE_HOST_URL'] = config['CONFIG_CONTROLLER_HOST']
config['CONFIG_KEYSTONE_PUBLIC_URL'] = "http://%s:5000" % (
config['CONFIG_KEYSTONE_PUBLIC_URL'] = "http://%s:5000/%s" % (
config['CONFIG_KEYSTONE_HOST_URL'],
config['CONFIG_KEYSTONE_API_VERSION']
)
config['CONFIG_KEYSTONE_ADMIN_URL'] = "http://%s:35357" % (
config['CONFIG_KEYSTONE_HOST_URL']