Merge "Revert "Disable watcher from scenario004 until bug is fixed""
This commit is contained in:
commit
15d5545908
@ -78,9 +78,7 @@ class { 'openstack_integration::ceph':
|
||||
class { 'openstack_integration::horizon':
|
||||
octavia_enabled => true
|
||||
}
|
||||
# TODO(tkajinam): Disabled due to
|
||||
# https://bugs.launchpad.net/watcher/+bug/2056181
|
||||
# include openstack_integration::watcher
|
||||
include openstack_integration::watcher
|
||||
class { 'openstack_integration::manila':
|
||||
backend => 'cephfsnative'
|
||||
}
|
||||
@ -91,9 +89,7 @@ include openstack_integration::provision
|
||||
# Glance, nova, neutron are true by default.
|
||||
class { 'openstack_integration::tempest':
|
||||
horizon => true,
|
||||
# TODO(tkajinam): Disabled due to
|
||||
# https://bugs.launchpad.net/watcher/+bug/2056181
|
||||
# watcher => true,
|
||||
watcher => true,
|
||||
vpnaas => $vpnaas_enabled,
|
||||
taas => $taas_enabled,
|
||||
bgpvpn => $bgpvpn_enabled,
|
||||
|
Loading…
x
Reference in New Issue
Block a user