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) <email@daviey.com>
This commit is contained in:
Dave Walker (Daviey) 2016-07-05 09:58:29 +01:00 committed by Dave Walker
parent 0ff90a6f10
commit bb2397d26d
4 changed files with 30 additions and 1 deletions

View File

@ -87,10 +87,12 @@ control
[ceilometer:children] [ceilometer:children]
control control
# Tempest
[tempest:children] [tempest:children]
control control
[watcher:children]
control
# Additional control implemented here. These groups allow you to control which # Additional control implemented here. These groups allow you to control which
# services run on which hosts at a per-service level. # services run on which hosts at a per-service level.
# #
@ -252,3 +254,13 @@ compute
# Multipathd # Multipathd
[multipathd:children] [multipathd:children]
compute compute
# Watcher
[watcher-api:children]
watcher
[watcher-engine:children]
watcher
[watcher-applier:children]
watcher

View File

@ -103,6 +103,9 @@ control
[tempest:children] [tempest:children]
control control
[watcher:children]
control
# Additional control implemented here. These groups allow you to control which # Additional control implemented here. These groups allow you to control which
# services run on which hosts at a per-service level. # services run on which hosts at a per-service level.
# #
@ -264,3 +267,13 @@ compute
# Multipathd # Multipathd
[multipathd:children] [multipathd:children]
compute compute
# Watcher
[watcher-api:children]
watcher
[watcher-engine:children]
watcher
[watcher-applier:children]
watcher

View File

@ -125,6 +125,7 @@ neutron_external_interface: "eth1"
#enable_neutron_qos: "no" #enable_neutron_qos: "no"
#enable_swift: "no" #enable_swift: "no"
#enable_tempest: "no" #enable_tempest: "no"
#enable_watcher: "no"
# Control usage of ceph per service. This allows to configure external ceph # Control usage of ceph per service. This allows to configure external ceph
# when ceph is not deployed by Kolla. # when ceph is not deployed by Kolla.

View File

@ -61,6 +61,9 @@ mistral_keystone_password:
ceilometer_database_password: ceilometer_database_password:
ceilometer_keystone_password: ceilometer_keystone_password:
watcher_database_password:
watcher_keystone_password:
horizon_secret_key: horizon_secret_key:
telemetry_secret_key: telemetry_secret_key: