Browse Source

Merge "Disabling security groups is not needed"

Jenkins 2 years ago
parent
commit
3fe1e54189

+ 5
- 10
deployment_scripts/puppet/manifests/networking-sfc-compute.pp View File

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

+ 6
- 10
deployment_scripts/puppet/manifests/networking-sfc-controller.pp View File

@@ -68,19 +68,15 @@ if $use_neutron {
68 68
     class { '::neutron::db::sync':
69 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'} ->
77
-  neutron_plugin_ml2 { 'securitygroup/enable_ipset': value => 'False'} ->
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
-  } ->
78
+  neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins }
79
+  neutron_config { 'sfc/drivers': value => 'ovs' }
84 80
 
85 81
   exec { 'Modify neutron-openvswitch-agent.conf':
86 82
     command => "sed -i 's|/usr/bin|/usr/local/bin|g' /etc/init/neutron-openvswitch-agent.conf",

Loading…
Cancel
Save