aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-23 04:20:10 +0000
committerGerrit Code Review <review@openstack.org>2015-12-23 04:20:11 +0000
commitbd1fdf3b4ca7f15ccb4fb4ada57ee35a107ad3be (patch)
treec124a444f60212de0c1f9017786d737f6393b485
parent2b658394769104a5b9e5cd03891afcff29f38a04 (diff)
parent74e9126fdb6d4866ac3884d3d21aeea0c2111b9a (diff)
downloadkolla-bd1fdf3b4ca7f15ccb4fb4ada57ee35a107ad3be.tar.gz
kolla-bd1fdf3b4ca7f15ccb4fb4ada57ee35a107ad3be.zip
Merge "Remove unneeded variables passed into keystone"
-rw-r--r--ansible/roles/keystone/tasks/bootstrap.yml7
1 files changed, 0 insertions, 7 deletions
diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml
index 937939cce..16502957b 100644
--- a/ansible/roles/keystone/tasks/bootstrap.yml
+++ b/ansible/roles/keystone/tasks/bootstrap.yml
@@ -55,13 +55,6 @@
env:
KOLLA_BOOTSTRAP:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
- KEYSTONE_ADMIN_PASSWORD: "{{ keystone_admin_password }}"
- REGION_NAME: "{{ openstack_region_name }}"
- 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_TOKEN: "{{ keystone_admin_token }}"
- OS_URL: "http://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_admin_port }}/v2.0"
run_once: True
delegate_to: "{{ groups['keystone'][0] }}"
when: database_created