summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Kupidura <bkupidura@mirantis.com>2016-06-17 13:30:23 +0000
committerBartosz Kupidura <bkupidura@mirantis.com>2016-06-17 13:42:59 +0000
commit37dde0693d3a6171a76b0fc6e174cc16daf49de8 (patch)
treed680d48f93875b27c4410687799dc07388d04d25
parent26d6721495f58e1c105bab00ee7e5d293e011f66 (diff)
Disabling security groups is not needed
Instead you can use port-security-enabled=False during port creation for service Change-Id: If880800379517bf1e7979d62b41a334e0f3520a9
Notes
Notes (review): Code-Review+2: Maciej Relewicz <mrelewicz@mirantis.com> Workflow+1: Maciej Relewicz <mrelewicz@mirantis.com> Code-Review+1: Jerzy Mikolajczak <jmikolajczak@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 21 Jun 2016 09:29:42 +0000 Reviewed-on: https://review.openstack.org/331143 Project: openstack/fuel-plugin-networking-sfc Branch: refs/heads/master
-rw-r--r--deployment_scripts/puppet/manifests/networking-sfc-compute.pp15
-rw-r--r--deployment_scripts/puppet/manifests/networking-sfc-controller.pp16
2 files changed, 11 insertions, 20 deletions
diff --git a/deployment_scripts/puppet/manifests/networking-sfc-compute.pp b/deployment_scripts/puppet/manifests/networking-sfc-compute.pp
index 116d3d7..ef0d99d 100644
--- a/deployment_scripts/puppet/manifests/networking-sfc-compute.pp
+++ b/deployment_scripts/puppet/manifests/networking-sfc-compute.pp
@@ -39,18 +39,13 @@ if $use_neutron {
39 39
40 package {'python-networking-sfc': 40 package {'python-networking-sfc':
41 ensure => installed, 41 ensure => installed,
42 } -> 42 }
43
44 neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins } ->
45 43
46 neutron_plugin_ml2 { 'securitygroup/enable_security_group': value => 'False'} -> 44 Package['python-networking-sfc'] -> Neutron_config <| |>
47 neutron_plugin_ml2 { 'securitygroup/enable_ipset': value => 'False'} -> 45 Neutron_config <| |> -> Exec <| title == 'Modify neutron-openvswitch-agent.conf' |>
48 neutron_plugin_ml2 { 'securitygroup/firewall_driver': value => 'neutron.agent.firewall.NoopFirewallDriver'} ->
49 46
50 file_line { 'Add OSV section to neutron.conf': 47 neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins }
51 path => '/etc/neutron/neutron.conf', 48 neutron_config { 'sfc/drivers': value => 'ovs' }
52 line => "\n[sfc]\ndrivers = ovs\n",
53 } ->
54 49
55 exec { 'Modify neutron-openvswitch-agent.conf': 50 exec { 'Modify neutron-openvswitch-agent.conf':
56 command => "sed -i 's|/usr/bin|/usr/local/bin|g' /etc/init/neutron-openvswitch-agent.conf", 51 command => "sed -i 's|/usr/bin|/usr/local/bin|g' /etc/init/neutron-openvswitch-agent.conf",
diff --git a/deployment_scripts/puppet/manifests/networking-sfc-controller.pp b/deployment_scripts/puppet/manifests/networking-sfc-controller.pp
index 07af7cb..a35457d 100644
--- a/deployment_scripts/puppet/manifests/networking-sfc-controller.pp
+++ b/deployment_scripts/puppet/manifests/networking-sfc-controller.pp
@@ -68,19 +68,15 @@ if $use_neutron {
68 class { '::neutron::db::sync': 68 class { '::neutron::db::sync':
69 extra_params => $extra_params, 69 extra_params => $extra_params,
70 } 70 }
71 notify{"Schema upgrade for SFC": } ~> Exec['neutron-db-sync'] 71 notify{"Schema upgrade for SFC": } ~> Exec['neutron-db-sync']
72 Package['python-networking-sfc'] -> Class['::neutron::db::sync']
72 } 73 }
73 74
74 neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins } -> 75 Package['python-networking-sfc'] -> Neutron_config <| |>
76 Neutron_config <| |> -> Exec <| title == 'Modify neutron-openvswitch-agent.conf' |>
75 77
76 neutron_plugin_ml2 { 'securitygroup/enable_security_group': value => 'False'} -> 78 neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins }
77 neutron_plugin_ml2 { 'securitygroup/enable_ipset': value => 'False'} -> 79 neutron_config { 'sfc/drivers': value => 'ovs' }
78 neutron_plugin_ml2 { 'securitygroup/firewall_driver': value => 'neutron.agent.firewall.NoopFirewallDriver'} ->
79
80 file_line { 'Add OSV section to neutron.conf':
81 path => '/etc/neutron/neutron.conf',
82 line => "\n[sfc]\ndrivers = ovs\n",
83 } ->
84 80
85 exec { 'Modify neutron-openvswitch-agent.conf': 81 exec { 'Modify neutron-openvswitch-agent.conf':
86 command => "sed -i 's|/usr/bin|/usr/local/bin|g' /etc/init/neutron-openvswitch-agent.conf", 82 command => "sed -i 's|/usr/bin|/usr/local/bin|g' /etc/init/neutron-openvswitch-agent.conf",