diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2017-11-22 13:28:12 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-11-27 10:39:51 -0500 |
commit | 1d73ebe570177695a8aa0a846e63747a26068aea (patch) | |
tree | dcfb7f907c42836db354317626f7a92819f1a5e0 /meta-openstack | |
parent | bc428e057f7d42e50c509eb80f6cf1da2be86b0a (diff) | |
download | meta-cloud-services-1d73ebe570177695a8aa0a846e63747a26068aea.tar.gz |
python-keystone: update endpoints in config to match reality
When attempting to validate python-openstackclient it was found that
the old endpoints from previous releases of keystone where still being
used. Update the endpoints to reflect how the current version of
keyston is configured.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-keystone_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index d7f6400..c3437cd 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb | |||
@@ -114,11 +114,11 @@ do_install_append() { | |||
114 | # Edit the configuration to allow it to work out of the box | 114 | # Edit the configuration to allow it to work out of the box |
115 | KEYSTONE_CONF_FILE=${KEYSTONE_CONF_DIR}/keystone.conf | 115 | KEYSTONE_CONF_FILE=${KEYSTONE_CONF_DIR}/keystone.conf |
116 | sed "/# admin_endpoint = .*/a \ | 116 | sed "/# admin_endpoint = .*/a \ |
117 | public_endpoint = http://%CONTROLLER_IP%:8081/keystone/main/ " \ | 117 | public_endpoint = http://%CONTROLLER_IP%:5000/ " \ |
118 | -i ${KEYSTONE_CONF_FILE} | 118 | -i ${KEYSTONE_CONF_FILE} |
119 | 119 | ||
120 | sed "/# admin_endpoint = .*/a \ | 120 | sed "/# admin_endpoint = .*/a \ |
121 | admin_endpoint = http://%CONTROLLER_IP%:8081/keystone/admin/ " \ | 121 | admin_endpoint = http://%CONTROLLER_IP%:35357/ " \ |
122 | -i ${KEYSTONE_CONF_FILE} | 122 | -i ${KEYSTONE_CONF_FILE} |
123 | 123 | ||
124 | sed -e "s:%SERVICE_TOKEN%:${SERVICE_TOKEN}:g" -i ${KEYSTONE_CONF_FILE} | 124 | sed -e "s:%SERVICE_TOKEN%:${SERVICE_TOKEN}:g" -i ${KEYSTONE_CONF_FILE} |