summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-13 05:14:32 +0000
committerGerrit Code Review <review@openstack.org>2016-09-13 05:14:32 +0000
commit6b3456bf36ad26fc5df76008196a410acb325b21 (patch)
treec1555a09c8e303dce71b3aff9538495a38c87b32 /etc
parentdfd2cdbf0af74645e11a9363c612a20b0c828c4d (diff)
parente0537385d05ec122696c38c63fd75fb6e7d16213 (diff)
downloadkolla-6b3456bf36ad26fc5df76008196a410acb325b21.tar.gz
kolla-6b3456bf36ad26fc5df76008196a410acb325b21.zip
Merge "Add Barbican ansible role"
Diffstat (limited to 'etc')
-rw-r--r--etc/kolla/globals.yml1
-rw-r--r--etc/kolla/passwords.yml3
2 files changed, 4 insertions, 0 deletions
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 843cf699b..cd9177766 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -112,6 +112,7 @@ kolla_internal_vip_address: "10.10.10.254"
#nova_console: "novnc"
# OpenStack services can be enabled or disabled with these options
+#enable_barbican: "no"
#enable_ceilometer: "no"
#enable_central_logging: "no"
#enable_ceph: "no"
diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml
index 09ae97226..e570a9d90 100644
--- a/etc/kolla/passwords.yml
+++ b/etc/kolla/passwords.yml
@@ -24,6 +24,9 @@ docker_registry_password:
aodh_database_password:
aodh_keystone_password:
+barbican_database_password:
+barbican_keystone_password:
+
keystone_admin_password:
keystone_database_password: