Refresh server-config on neutron_plugin_ml2 change

After commit ea69a7adb5 ml2 configuration
was moved to server-config from plugins/ml2

Change-Id: Ib5fe830a362c0a762869c2b68a659a6e944a1d4f
Closes-Bug: #1537033
(cherry picked from commit ed519cf3fe)

deployment/puppet/osnailyfacter/modular/openstack-network/plugins/ml2.pp

@@ -142,9 +142,6 @@ if $use_neutron {
 
   # override neutron options
   $override_configuration = hiera_hash('configuration', {})
-  override_resources { 'neutron_plugin_ml2':
-    data => $override_configuration['neutron_plugin_ml2']
-  }
   override_resources { 'neutron_agent_ovs':
     data => $override_configuration['neutron_agent_ovs']
   }

deployment/puppet/osnailyfacter/modular/openstack-network/server-config.pp

@@ -196,5 +196,8 @@ if $use_neutron {
   override_resources { 'neutron_config':
     data => $override_configuration['neutron_config']
   }
+  override_resources { 'neutron_plugin_ml2':
+    data => $override_configuration['neutron_plugin_ml2']
+  }
 
 }

deployment/puppet/osnailyfacter/modular/openstack-network/tasks.yaml

@@ -53,7 +53,7 @@
   groups: [primary-controller,controller]
   required_for: [openstack-network-end]
   requires: [openstack-network-common-config]
-  refresh_on: [neutron_config, neutron_api_config]
+  refresh_on: [neutron_plugin_ml2, neutron_config, neutron_api_config]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/server-config.pp
     puppet_modules: /etc/puppet/modules
@@ -65,7 +65,7 @@
   groups: [primary-controller]
   required_for: [openstack-network-end]
   requires: [openstack-network-common-config, openstack-network-server-config]
-  refresh_on: [neutron_plugin_ml2, neutron_agent_ovs, neutron_config, neutron_api_config]
+  refresh_on: [neutron_agent_ovs]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/plugins/ml2.pp
     puppet_modules: /etc/puppet/modules
@@ -78,7 +78,7 @@
   groups: [controller,compute]
   required_for: [openstack-network-end]
   requires: [openstack-network-common-config, openstack-network-server-config]
-  refresh_on: [neutron_plugin_ml2, neutron_agent_ovs, neutron_config, neutron_api_config]
+  refresh_on: [neutron_agent_ovs]
   cross-depends:
     - name: primary-openstack-network-plugins-l2
   parameters:

tests/noop/astute.yaml/override/openstack-network-plugins-ml2.yaml

@@ -1,8 +1,5 @@
 ---
 configuration:
-  neutron_plugin_ml2:
-    test/polling_interval:
-      value: 10
   neutron_agent_ovs:
     agent/polling_interval:
       value: 15

tests/noop/astute.yaml/override/openstack-network-server-config.yaml

@@ -6,3 +6,6 @@ configuration:
   neutron_api_config:
     test/test:
       value: 20
+  neutron_plugin_ml2:
+    test/polling_interval:
+      value: 10

tests/noop/spec/hosts/openstack-network/plugins/ml2_spec.rb

@@ -23,10 +23,6 @@ describe manifest do
         Noop.hiera_structure 'configuration'
       end
 
-      let(:neutron_plugin_ml2_override_resources) do
-        configuration_override.fetch('neutron_plugin_ml2', {})
-      end
-
       let(:neutron_agent_ovs_override_resources) do
         configuration_override.fetch('neutron_agent_ovs', {})
       end
@@ -103,20 +99,12 @@ describe manifest do
           'enable_tunneling' => (segmentation_type != 'vlan')
         )}
 
-        it 'neutron plugin ml2 should be modified by override_resources' do
-          is_expected.to contain_override_resources('neutron_plugin_ml2').with(:data => neutron_plugin_ml2_override_resources)
-        end
-
         it 'neutron agent ovs should be modified by override_resources' do
           is_expected.to contain_override_resources('neutron_agent_ovs').with(:data => neutron_agent_ovs_override_resources)
         end
 
         it 'should use "override_resources" to update the catalog' do
           ral_catalog = Noop.create_ral_catalog self
-          neutron_plugin_ml2_override_resources.each do |title, params|
-            params['value'] = 'True' if params['value'].is_a? TrueClass
-            expect(ral_catalog).to contain_neutron_plugin_ml2(title).with(params)
-          end
           neutron_agent_ovs_override_resources.each do |title, params|
             params['value'] = 'True' if params['value'].is_a? TrueClass
             expect(ral_catalog).to contain_neutron_agent_ovs(title).with(params)

tests/noop/spec/hosts/openstack-network/server-config_spec.rb

@@ -31,6 +31,10 @@ describe manifest do
         configuration_override.fetch('neutron_api_config', {})
       end
 
+      let(:neutron_plugin_ml2_override_resources) do
+        configuration_override.fetch('neutron_plugin_ml2', {})
+      end
+
       context 'with Neutron-server' do
         neutron_config   = Noop.hiera_hash('neutron_config')
         management_vip   = Noop.hiera('management_vip')
@@ -254,6 +258,10 @@ describe manifest do
           is_expected.to contain_override_resources('neutron_api_config').with(:data => neutron_api_config_override_resources)
         end
 
+        it 'neutron plugin ml2 should be modified by override_resources' do
+          is_expected.to contain_override_resources('neutron_plugin_ml2').with(:data => neutron_plugin_ml2_override_resources)
+        end
+
         it 'should use "override_resources" to update the catalog' do
           ral_catalog = Noop.create_ral_catalog self
           neutron_config_override_resources.each do |title, params|
@@ -264,6 +272,10 @@ describe manifest do
             params['value'] = 'True' if params['value'].is_a? TrueClass
             expect(ral_catalog).to contain_neutron_api_config(title).with(params)
           end
+          neutron_plugin_ml2_override_resources.each do |title, params|
+            params['value'] = 'True' if params['value'].is_a? TrueClass
+            expect(ral_catalog).to contain_neutron_plugin_ml2(title).with(params)
+          end
         end
 
       end