From bb2397d26d04fddb47a865d77f3748698875a254 Mon Sep 17 00:00:00 2001 From: "Dave Walker (Daviey)" Date: Tue, 5 Jul 2016 09:58:29 +0100 Subject: Add Watcher default settings This adds: - AIO and multinode inventory samples - Password (blank) fields for default password.yml - Default to not enabled, in globals.yml This is the last changeset in the series to add basic Watcher functionality to Kolla. Change-Id: I9daec0eadc8dad3d37e03e7d69783af003af0916 Closes-bug: #1598929 Partially-implements: blueprint watcher Signed-off-by: Dave Walker (Daviey) --- etc/kolla/globals.yml | 1 + etc/kolla/passwords.yml | 3 +++ 2 files changed, 4 insertions(+) (limited to 'etc') diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 1b6f006cd..694758d22 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -125,6 +125,7 @@ neutron_external_interface: "eth1" #enable_neutron_qos: "no" #enable_swift: "no" #enable_tempest: "no" +#enable_watcher: "no" # Control usage of ceph per service. This allows to configure external ceph # when ceph is not deployed by Kolla. diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index 1650a548c..b026cb89a 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -61,6 +61,9 @@ mistral_keystone_password: ceilometer_database_password: ceilometer_keystone_password: +watcher_database_password: +watcher_keystone_password: + horizon_secret_key: telemetry_secret_key: -- cgit v1.2.3