From bbc3a47da3493fffac88300f5d1868271e2a8b2d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 7 Sep 2022 01:12:12 +0900 Subject: [PATCH] Ubuntu: Enable watcher service The watcher packages are already available in Ubuntu. This enables the service in Ubuntu integration jobs to test Watcher deployment in Ubuntu as well as CentOS. Conflicts: fixtures/scenario004.pp Resolved conflict caused by 25ad653e67f2c1e1c40868cb9b4ae13fe070c717 . Change-Id: Iece72956f34e930ca4cd46bcbdb209199671607a (cherry picked from commit 4b26004426934e1cd8ddb3a6ce1c2c6c43362be7) --- fixtures/scenario004.pp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp index 341991761..2be1664e3 100644 --- a/fixtures/scenario004.pp +++ b/fixtures/scenario004.pp @@ -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 = true $bgp_dragent_enabled = true @@ -69,9 +66,7 @@ class { 'openstack_integration::ceph': deploy_rgw => true, swift_dropin => true, } -if $watcher_enabled { - include openstack_integration::watcher -} +include openstack_integration::watcher include openstack_integration::octavia include openstack_integration::provision @@ -79,7 +74,7 @@ include openstack_integration::provision # Don't test swift, radosgw won't pass the current tests # Glance, nova, neutron are true by default. class { 'openstack_integration::tempest': - watcher => $watcher_enabled, + watcher => true, bgpvpn => $bgpvpn_enabled, l2gw => $l2gw_enabled, l2gw_switch => 'cell08-5930-01::FortyGigE1/0/1|100',