Move watcher to scenario001

Watcher requires telemetry services from a functional point of view, so
I think it's good to deploy and test them together.

Change-Id: I90b12c9a9674eda7c7b94111c7951e598224a68b
This commit is contained in:
Alfredo Moralejo 2024-10-29 18:08:08 +01:00
parent 368bee7f11
commit 477e87ee9d
3 changed files with 4 additions and 3 deletions

View File

@ -72,7 +72,7 @@ scenario](#all-in-one).
| ceph mds | | | | X | | | | ceph mds | | | | X | | |
| ceph rgw | | | | X | | | | ceph rgw | | | | X | | |
| vitrage | X | | | | | | | vitrage | X | | | | | |
| watcher | | | | X | | | | watcher | X | | | | | |
| vpnaas | | | | X | X | | | vpnaas | | | | X | X | |
| taas | | | | X | | | | taas | | | | X | | |
| bgpvpn-api | | | | X | | | | bgpvpn-api | | | | X | | |

View File

@ -91,6 +91,8 @@ class { 'openstack_integration::gnocchi':
backend => 'ceph', backend => 'ceph',
} }
include openstack_integration::watcher
class { 'openstack_integration::tempest': class { 'openstack_integration::tempest':
cinder => true, cinder => true,
cinder_backup => true, cinder_backup => true,
@ -99,5 +101,6 @@ class { 'openstack_integration::tempest':
aodh => true, aodh => true,
heat => true, heat => true,
vitrage => true, vitrage => true,
watcher => true,
image_format => 'raw', image_format => 'raw',
} }

View File

@ -83,7 +83,6 @@ class { 'openstack_integration::ceph':
class { 'openstack_integration::horizon': class { 'openstack_integration::horizon':
octavia_enabled => true octavia_enabled => true
} }
include openstack_integration::watcher
class { 'openstack_integration::manila': class { 'openstack_integration::manila':
backend => 'cephfsnative' backend => 'cephfsnative'
} }
@ -98,7 +97,6 @@ class { 'openstack_integration::provision':
# Glance, nova, neutron are true by default. # Glance, nova, neutron are true by default.
class { 'openstack_integration::tempest': class { 'openstack_integration::tempest':
horizon => true, horizon => true,
watcher => true,
vpnaas => $vpnaas_enabled, vpnaas => $vpnaas_enabled,
taas => $taas_enabled, taas => $taas_enabled,
bgpvpn => $bgpvpn_enabled, bgpvpn => $bgpvpn_enabled,