diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-05 18:36:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-05 18:36:11 +0000 |
| commit | 306bc101d1e0e9db8c3606fe9535b79ef862187a (patch) | |
| tree | 7a075b3d42b193f6e28d0d4662b85f5193a04734 /etc | |
| parent | 3071d32a3fb76e72901112a9b3e7fc59233f54bf (diff) | |
| parent | bb2397d26d04fddb47a865d77f3748698875a254 (diff) | |
| download | kolla-306bc101d1e0e9db8c3606fe9535b79ef862187a.tar.gz kolla-306bc101d1e0e9db8c3606fe9535b79ef862187a.zip | |
Merge "Add Watcher default settings"
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/kolla/globals.yml | 1 | ||||
| -rw-r--r-- | etc/kolla/passwords.yml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index b109b0d6f..290b72986 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" ################### 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: |