aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-18 04:05:52 +0000
committerGerrit Code Review <review@openstack.org>2016-06-18 04:05:52 +0000
commite48f68c82a4628829b47cffb35e706ce7147cec4 (patch)
treec1e0647ae3b120c3c23735e6720c456f6efff8b4 /etc
parent80c4fbf1eed1f0f97bdcdd04666b056ce34e9c5a (diff)
parent4108c6c6ec0c0d31d9314a5d3129e4d4eff44190 (diff)
downloadkolla-e48f68c82a4628829b47cffb35e706ce7147cec4.tar.gz
kolla-e48f68c82a4628829b47cffb35e706ce7147cec4.zip
Merge "Implement ceilometer ansible role"
Diffstat (limited to 'etc')
-rw-r--r--etc/kolla/globals.yml1
-rw-r--r--etc/kolla/passwords.yml5
2 files changed, 6 insertions, 0 deletions
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 4d9619d85..dc87cf56a 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -106,6 +106,7 @@ neutron_external_interface: "eth1"
#nova_console: "novnc"
# OpenStack services can be enabled or disabled with these options
+#enable_ceilometer: "no"
#enable_central_logging: "no"
#enable_ceph: "no"
#enable_ceph_rgw: "no"
diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml
index fdb6c1ba8..1650a548c 100644
--- a/etc/kolla/passwords.yml
+++ b/etc/kolla/passwords.yml
@@ -58,8 +58,13 @@ magnum_keystone_password:
mistral_database_password:
mistral_keystone_password:
+ceilometer_database_password:
+ceilometer_keystone_password:
+
horizon_secret_key:
+telemetry_secret_key:
+
manila_database_password:
manila_keystone_password: