aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-13 17:16:36 +0000
committerGerrit Code Review <review@openstack.org>2015-07-13 17:16:37 +0000
commit7c29bdd1afb0e18de035a5a2718a8f842920dd92 (patch)
tree58ede5b879d5555b326e4577f97aa719cb57c5d0 /etc
parent7192d6a2ab7365ec6706ac7f46850a092dcf8b96 (diff)
parent05a6640a0fadd25603c5fe63483e1fab4f19d2ac (diff)
downloadkolla-7c29bdd1afb0e18de035a5a2718a8f842920dd92.tar.gz
kolla-7c29bdd1afb0e18de035a5a2718a8f842920dd92.zip
Merge "Add temporary Ansible keystone modules"
Diffstat (limited to 'etc')
-rw-r--r--etc/kolla/globals.yml14
1 files changed, 14 insertions, 0 deletions
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 3c0ae3b62..e90380990 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -72,6 +72,20 @@ openstack_region_name: "RegionOne"
keystone_public_port: "5000"
keystone_admin_port: "35357"
+openstack_auth:
+ auth_url: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}"
+ username: "admin"
+ password: "{{ keystone_admin_password }}"
+ project_name: "admin"
+
+# This shouldn't be needed for long. It is only temporary until we get the
+# ansible modules sorted out
+openstack_auth_v2:
+ auth_url: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}/v2.0"
+ username: "admin"
+ password: "{{ keystone_admin_password }}"
+ project_name: "admin"
+
####################
# RabbitMQ options