6wind-va-plugin: small fixes to ipset disable option

Let's disable security group ipset even when advanced options are
disabled and just on "primary-controller" nodes.

Signed-off-by: Francesco Santoro <francesco.santoro@6wind.com>

Change-Id: I1e28fcb96aa187088d4fe3adeb93a32b8bd3df5b
This commit is contained in:
Francesco Santoro 2016-04-05 12:54:14 +02:00
parent d714747cf7
commit 6932c1e54b
2 changed files with 3 additions and 5 deletions

View File

@ -5,8 +5,7 @@ class virtual_accelerator::neutron_conf inherits virtual_accelerator {
$advanced_params = $virtual_accelerator::advanced_params
if $advanced_params == true {
$disable_ipset = $virtual_accelerator::disable_ipset
$disable_ipset = $virtual_accelerator::disable_ipset
if $disable_ipset == true {
@ -24,8 +23,7 @@ class virtual_accelerator::neutron_conf inherits virtual_accelerator {
exec { 'restart_ovs_agent':
command => 'service neutron-plugin-openvswitch-agent restart',
}
}
}
}

View File

@ -59,7 +59,7 @@
- id: 6wind-virtual-accelerator-neutron-conf
type: puppet
role: ['controller', 'primary-controller', '6wind-virtual-accelerator']
role: ['primary-controller', '6wind-virtual-accelerator']
required_for: [post_deployment_end]
requires: [post_deployment_start]
parameters: