diff options
| author | Dave Walker (Daviey) <email@daviey.com> | 2016-07-05 09:58:29 +0100 |
|---|---|---|
| committer | Dave Walker <email@daviey.com> | 2016-08-05 09:17:28 +0000 |
| commit | bb2397d26d04fddb47a865d77f3748698875a254 (patch) | |
| tree | 6eaa19fc8ca8e97d1500ecfc0f5851ae10f08b27 | |
| parent | 0ff90a6f10494f9f33d665a3367dfaf0486b94df (diff) | |
| download | kolla-bb2397d26d04fddb47a865d77f3748698875a254.tar.gz kolla-bb2397d26d04fddb47a865d77f3748698875a254.zip | |
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>
| -rw-r--r-- | ansible/inventory/all-in-one | 14 | ||||
| -rw-r--r-- | ansible/inventory/multinode | 13 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 1 | ||||
| -rw-r--r-- | etc/kolla/passwords.yml | 3 |
4 files changed, 30 insertions, 1 deletions
diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one index 3a2e6ce97..507a30b06 100644 --- a/ansible/inventory/all-in-one +++ b/ansible/inventory/all-in-one @@ -87,10 +87,12 @@ control [ceilometer:children] control -# Tempest [tempest:children] control +[watcher:children] +control + # Additional control implemented here. These groups allow you to control which # services run on which hosts at a per-service level. # @@ -252,3 +254,13 @@ compute # Multipathd [multipathd:children] compute + +# Watcher +[watcher-api:children] +watcher + +[watcher-engine:children] +watcher + +[watcher-applier:children] +watcher diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode index 4d08cba77..d1f9bf065 100644 --- a/ansible/inventory/multinode +++ b/ansible/inventory/multinode @@ -103,6 +103,9 @@ control [tempest:children] control +[watcher:children] +control + # Additional control implemented here. These groups allow you to control which # services run on which hosts at a per-service level. # @@ -264,3 +267,13 @@ compute # Multipathd [multipathd:children] compute + +# Watcher +[watcher-api:children] +watcher + +[watcher-engine:children] +watcher + +[watcher-applier:children] +watcher 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: |