aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-31 11:12:29 +0000
committerGerrit Code Review <review@openstack.org>2015-08-31 11:12:29 +0000
commit23e289ecc9b0ddf066c184b3ffe295ff24691c72 (patch)
tree6aabd2e99ada1c2ca3d931c69811c070c3e72a87 /ansible
parentbe230d47ebfa58ad430d6bad0c21b637776af88b (diff)
parent7f172034065a5b1b4e0b53f6c2c8108c5823a28b (diff)
downloadkolla-23e289ecc9b0ddf066c184b3ffe295ff24691c72.tar.gz
kolla-23e289ecc9b0ddf066c184b3ffe295ff24691c72.zip
Merge "Keystone container should use the openstackclient"
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/keystone/tasks/bootstrap.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml
index d1b9fcfa1..f23bcd09a 100644
--- a/ansible/roles/keystone/tasks/bootstrap.yml
+++ b/ansible/roles/keystone/tasks/bootstrap.yml
@@ -52,8 +52,8 @@
PUBLIC_URL: "http://{{ kolla_external_address }}:{{ keystone_public_port }}/v2.0"
INTERNAL_URL: "http://{{ kolla_internal_address }}:{{ keystone_public_port }}/v2.0"
ADMIN_URL: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}/v2.0"
- OS_SERVICE_TOKEN: "{{ keystone_admin_token }}"
- OS_SERVICE_ENDPOINT: "http://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_admin_port }}/v2.0"
+ OS_TOKEN: "{{ keystone_admin_token }}"
+ OS_URL: "http://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_admin_port }}/v2.0"
run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed