Merge "Ubuntu: Enable watcher service"
This commit is contained in:
commit
224ffdd7e8
@ -22,8 +22,6 @@ if $::os['name'] == 'Ubuntu' {
|
|||||||
|
|
||||||
if $::operatingsystem == 'Ubuntu' {
|
if $::operatingsystem == 'Ubuntu' {
|
||||||
$ipv6 = false
|
$ipv6 = false
|
||||||
# Watcher packages are not available in Ubuntu repository.
|
|
||||||
$watcher_enabled = false
|
|
||||||
# TODO(tobias-urdin): No service plugin 'BGPVPN'
|
# TODO(tobias-urdin): No service plugin 'BGPVPN'
|
||||||
$bgpvpn_enabled = false
|
$bgpvpn_enabled = false
|
||||||
# TODO(tobias-urdin): Plugin 'networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin' not found.
|
# TODO(tobias-urdin): Plugin 'networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin' not found.
|
||||||
@ -32,7 +30,6 @@ if $::operatingsystem == 'Ubuntu' {
|
|||||||
$bgp_dragent_enabled = false
|
$bgp_dragent_enabled = false
|
||||||
} else {
|
} else {
|
||||||
$ipv6 = true
|
$ipv6 = true
|
||||||
$watcher_enabled = true
|
|
||||||
$bgpvpn_enabled = true
|
$bgpvpn_enabled = true
|
||||||
$l2gw_enabled = false
|
$l2gw_enabled = false
|
||||||
$bgp_dragent_enabled = true
|
$bgp_dragent_enabled = true
|
||||||
@ -72,9 +69,7 @@ class { 'openstack_integration::ceph':
|
|||||||
class { 'openstack_integration::horizon':
|
class { 'openstack_integration::horizon':
|
||||||
octavia_enabled => true
|
octavia_enabled => true
|
||||||
}
|
}
|
||||||
if $watcher_enabled {
|
include openstack_integration::watcher
|
||||||
include openstack_integration::watcher
|
|
||||||
}
|
|
||||||
include openstack_integration::octavia
|
include openstack_integration::octavia
|
||||||
|
|
||||||
include openstack_integration::provision
|
include openstack_integration::provision
|
||||||
@ -83,7 +78,7 @@ include 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 => $watcher_enabled,
|
watcher => true,
|
||||||
bgpvpn => $bgpvpn_enabled,
|
bgpvpn => $bgpvpn_enabled,
|
||||||
l2gw => $l2gw_enabled,
|
l2gw => $l2gw_enabled,
|
||||||
l2gw_switch => 'cell08-5930-01::FortyGigE1/0/1|100',
|
l2gw_switch => 'cell08-5930-01::FortyGigE1/0/1|100',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user