openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Ubuntu: Enable watcher service"

Browse Source
This commit is contained in:
Zuul 2022-09-07 19:14:52 +00:00 committed by Gerrit Code Review
commit 224ffdd7e8
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fixtures/scenario004.pp
View File

@ -22,8 +22,6 @@ if $::os['name'] == 'Ubuntu' {
if $::operatingsystem == 'Ubuntu' {
$ipv6 = false
# Watcher packages are not available in Ubuntu repository.
$watcher_enabled = false
# TODO(tobias-urdin): No service plugin 'BGPVPN'
$bgpvpn_enabled = false
# TODO(tobias-urdin): Plugin 'networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin' not found.
@ -32,7 +30,6 @@ if $::operatingsystem == 'Ubuntu' {
$bgp_dragent_enabled = false
} else {
$ipv6 = true
$watcher_enabled = true
$bgpvpn_enabled = true
$l2gw_enabled = false
$bgp_dragent_enabled = true
@ -72,9 +69,7 @@ class { 'openstack_integration::ceph':
class { 'openstack_integration::horizon':
octavia_enabled => true
}
if $watcher_enabled {
include openstack_integration::watcher
}
include openstack_integration::watcher
include openstack_integration::octavia
include openstack_integration::provision
@ -83,7 +78,7 @@ include openstack_integration::provision
# Glance, nova, neutron are true by default.
class { 'openstack_integration::tempest':
horizon => true,
watcher => $watcher_enabled,
watcher => true,
bgpvpn => $bgpvpn_enabled,
l2gw => $l2gw_enabled,
l2gw_switch => 'cell08-5930-01::FortyGigE1/0/1|100',