aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-07 12:34:35 +0000
committerGerrit Code Review <review@openstack.org>2015-07-07 12:34:35 +0000
commitde98d9ddb343dfec072141970777809f7be1fbea (patch)
treeabe97c34a834bcfa677a25dfd09a6a50f63593d4 /etc
parentb65892310a8becb55fe59a74f25ea7dff48a23fc (diff)
parentc80a8c282bfa51c61a76e7b9b5f1228527503dea (diff)
downloadkolla-de98d9ddb343dfec072141970777809f7be1fbea.tar.gz
kolla-de98d9ddb343dfec072141970777809f7be1fbea.zip
Merge "Have bootstrap script create the initial endpoint"
Diffstat (limited to 'etc')
-rw-r--r--etc/kolla/globals.yml5
-rw-r--r--etc/kolla/passwords.yml1
2 files changed, 5 insertions, 1 deletions
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 4a0b8dddc..09ae1f042 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -65,10 +65,13 @@ neutron_interface: "{{ network_interface }}"
# Openstack options
####################
openstack_release: "latest"
-
openstack_logging_verbose: "True"
openstack_logging_debug: "False"
+openstack_region_name: "RegionOne"
+keystone_public_port: "5000"
+keystone_admin_port: "35357"
+
####################
# RabbitMQ options
diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml
index 8d2c9c934..204d68c9c 100644
--- a/etc/kolla/passwords.yml
+++ b/etc/kolla/passwords.yml
@@ -19,6 +19,7 @@ docker_registry_password:
# Openstack options
####################
keystone_admin_token: "password"
+keystone_admin_password: "password"
keystone_database_password: "password"