x
/
fuel-plugin-networking-sfc
Code Issues Proposed changes

Merge "Disabling security groups is not needed"

This commit is contained in:
Jenkins 2016-06-21 09:29:42 +00:00 committed by Gerrit Code Review
parent 37ce3698f0 37dde0693d
commit 3fe1e54189
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
deployment_scripts/puppet/manifests/networking-sfc-compute.pp
View File

@ -39,18 +39,13 @@ if $use_neutron {
package {'python-networking-sfc':
ensure => installed,
} ->
}
neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins } ->
Package['python-networking-sfc'] -> Neutron_config <| |>
Neutron_config <| |> -> Exec <| title == 'Modify neutron-openvswitch-agent.conf' |>
neutron_plugin_ml2 { 'securitygroup/enable_security_group': value => 'False'} ->
neutron_plugin_ml2 { 'securitygroup/enable_ipset': value => 'False'} ->
neutron_plugin_ml2 { 'securitygroup/firewall_driver': value => 'neutron.agent.firewall.NoopFirewallDriver'} ->
file_line { 'Add OSV section to neutron.conf':
path => '/etc/neutron/neutron.conf',
line => "\n[sfc]\ndrivers = ovs\n",
} ->
neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins }
neutron_config { 'sfc/drivers': value => 'ovs' }
exec { 'Modify neutron-openvswitch-agent.conf':
command => "sed -i 's|/usr/bin|/usr/local/bin|g' /etc/init/neutron-openvswitch-agent.conf",

16
deployment_scripts/puppet/manifests/networking-sfc-controller.pp
View File

@ -68,19 +68,15 @@ if $use_neutron {
class { '::neutron::db::sync':
extra_params => $extra_params,
}
notify{"Schema upgrade for SFC": } ~> Exec['neutron-db-sync']
notify{"Schema upgrade for SFC": } ~> Exec['neutron-db-sync']
Package['python-networking-sfc'] -> Class['::neutron::db::sync']
}
neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins } ->
Package['python-networking-sfc'] -> Neutron_config <| |>
Neutron_config <| |> -> Exec <| title == 'Modify neutron-openvswitch-agent.conf' |>
neutron_plugin_ml2 { 'securitygroup/enable_security_group': value => 'False'} ->
neutron_plugin_ml2 { 'securitygroup/enable_ipset': value => 'False'} ->
neutron_plugin_ml2 { 'securitygroup/firewall_driver': value => 'neutron.agent.firewall.NoopFirewallDriver'} ->
file_line { 'Add OSV section to neutron.conf':
path => '/etc/neutron/neutron.conf',
line => "\n[sfc]\ndrivers = ovs\n",
} ->
neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins }
neutron_config { 'sfc/drivers': value => 'ovs' }
exec { 'Modify neutron-openvswitch-agent.conf':
command => "sed -i 's|/usr/bin|/usr/local/bin|g' /etc/init/neutron-openvswitch-agent.conf",