diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp index f8093ba8e..5025e04f9 100644 --- a/manifests/agents/dhcp.pp +++ b/manifests/agents/dhcp.pp @@ -136,6 +136,7 @@ class neutron::agents::dhcp ( package { 'neutron-dhcp-agent': ensure => $package_ensure, name => $::neutron::params::dhcp_agent_package, + tag => 'openstack', } } else { # Some platforms (RedHat) do not provide a neutron DHCP agent package. diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp index 4670dd759..564f27ced 100644 --- a/manifests/agents/l3.pp +++ b/manifests/agents/l3.pp @@ -180,6 +180,7 @@ class neutron::agents::l3 ( ensure => $package_ensure, name => $::neutron::params::l3_agent_package, require => Package['neutron'], + tag => 'openstack', } } else { # Some platforms (RedHat) does not provide a neutron L3 agent package. diff --git a/manifests/agents/lbaas.pp b/manifests/agents/lbaas.pp index 5b47539fd..a6ae3ac8a 100644 --- a/manifests/agents/lbaas.pp +++ b/manifests/agents/lbaas.pp @@ -83,8 +83,8 @@ class neutron::agents::lbaas ( package { 'neutron-lbaas-agent': ensure => $package_ensure, name => $::neutron::params::lbaas_agent_package, + tag => 'openstack', } - if $manage_service { if $enabled { $service_ensure = 'running' diff --git a/manifests/agents/linuxbridge.pp b/manifests/agents/linuxbridge.pp index 4069e298e..2e5e7950a 100644 --- a/manifests/agents/linuxbridge.pp +++ b/manifests/agents/linuxbridge.pp @@ -43,6 +43,7 @@ class neutron::agents::linuxbridge ( package { 'neutron-plugin-linuxbridge-agent': ensure => $package_ensure, name => $::neutron::params::linuxbridge_agent_package, + tag => 'openstack', } } else { # Some platforms (RedHat) do not provide a separate neutron plugin @@ -54,6 +55,7 @@ class neutron::agents::linuxbridge ( package { 'neutron-plugin-linuxbridge': ensure => $package_ensure, name => $::neutron::params::linuxbridge_server_package, + tag => 'openstack', } } } diff --git a/manifests/agents/metadata.pp b/manifests/agents/metadata.pp index 84bb2f3ee..96d602ad5 100644 --- a/manifests/agents/metadata.pp +++ b/manifests/agents/metadata.pp @@ -136,6 +136,7 @@ class neutron::agents::metadata ( ensure => $package_ensure, name => $::neutron::params::metadata_agent_package, require => Package['neutron'], + tag => 'openstack', } } diff --git a/manifests/agents/metering.pp b/manifests/agents/metering.pp index fc842e57e..0e5e6088c 100644 --- a/manifests/agents/metering.pp +++ b/manifests/agents/metering.pp @@ -85,6 +85,7 @@ class neutron::agents::metering ( package { 'neutron-metering-agent': ensure => $package_ensure, name => $::neutron::params::metering_agent_package, + tag => 'openstack', } } else { # Default dependency if the system does not provide a neutron metering agent package. diff --git a/manifests/agents/ml2/linuxbridge.pp b/manifests/agents/ml2/linuxbridge.pp index 5156b34cc..b0993b378 100644 --- a/manifests/agents/ml2/linuxbridge.pp +++ b/manifests/agents/ml2/linuxbridge.pp @@ -129,6 +129,7 @@ class neutron::agents::ml2::linuxbridge ( package { 'neutron-plugin-linuxbridge-agent': ensure => $package_ensure, name => $::neutron::params::linuxbridge_agent_package, + tag => 'openstack', } } else { # Some platforms (RedHat) do not provide a separate @@ -137,6 +138,7 @@ class neutron::agents::ml2::linuxbridge ( package { 'neutron-plugin-linuxbridge-agent': ensure => $package_ensure, name => $::neutron::params::linuxbridge_server_package, + tag => 'openstack', } } } diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp index 0817a71ed..064a75c53 100644 --- a/manifests/agents/ml2/ovs.pp +++ b/manifests/agents/ml2/ovs.pp @@ -203,6 +203,7 @@ class neutron::agents::ml2::ovs ( package { 'neutron-ovs-agent': ensure => $package_ensure, name => $::neutron::params::ovs_agent_package, + tag => 'openstack', } } else { # Some platforms (RedHat) do not provide a separate @@ -215,6 +216,7 @@ class neutron::agents::ml2::ovs ( package { 'neutron-ovs-agent': ensure => $package_ensure, name => $::neutron::params::ovs_server_package, + tag => 'openstack', } -> # https://bugzilla.redhat.com/show_bug.cgi?id=1087647 # Causes init script for agent to load the old ovs file diff --git a/manifests/agents/ml2/sriov.pp b/manifests/agents/ml2/sriov.pp index 86d1dbc9d..a8b22c581 100644 --- a/manifests/agents/ml2/sriov.pp +++ b/manifests/agents/ml2/sriov.pp @@ -70,6 +70,7 @@ class neutron::agents::ml2::sriov ( package { 'neutron-sriov-nic-agent': ensure => $package_ensure, name => $::neutron::params::sriov_nic_agent_package, + tag => 'openstack', } if $enabled { diff --git a/manifests/agents/n1kv_vem.pp b/manifests/agents/n1kv_vem.pp index d3a34ae99..35113a917 100644 --- a/manifests/agents/n1kv_vem.pp +++ b/manifests/agents/n1kv_vem.pp @@ -182,6 +182,7 @@ class neutron::agents::n1kv_vem ( ensure => $n1kv_version, provider => $::neutron::params::package_provider, source => $vemtgtimg, + tag => 'openstack', require => File[$vemtgtimg] } } else { @@ -198,7 +199,8 @@ class neutron::agents::n1kv_vem ( } } package {'nexus1000v': - ensure => $package_ensure + ensure => $package_ensure, + tag => 'openstack', } } diff --git a/manifests/agents/ovs.pp b/manifests/agents/ovs.pp index 68ed8e909..65246b9c0 100644 --- a/manifests/agents/ovs.pp +++ b/manifests/agents/ovs.pp @@ -117,6 +117,7 @@ class neutron::agents::ovs ( package { 'neutron-plugin-ovs-agent': ensure => $package_ensure, name => $::neutron::params::ovs_agent_package, + tag => 'openstack', } } else { # Some platforms (RedHat) do not provide a separate @@ -128,6 +129,7 @@ class neutron::agents::ovs ( ensure_resource('package', 'neutron-plugin-ovs', { ensure => $package_ensure, name => $::neutron::params::ovs_server_package, + tag => 'openstack', }) } diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp index 5ada181cb..93dc44dac 100644 --- a/manifests/agents/vpnaas.pp +++ b/manifests/agents/vpnaas.pp @@ -96,6 +96,7 @@ class neutron::agents::vpnaas ( package { 'neutron-vpnaas-agent': ensure => $package_ensure, name => $::neutron::params::vpnaas_agent_package, + tag => 'openstack', } } else { Package['neutron'] -> Neutron_vpnaas_agent_config<||> diff --git a/manifests/client.pp b/manifests/client.pp index 80a0546e3..98563012d 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -17,6 +17,7 @@ class neutron::client ( package { 'python-neutronclient': ensure => $package_ensure, name => $::neutron::params::client_package, + tag => 'openstack', } } diff --git a/manifests/init.pp b/manifests/init.pp index a17573b87..aa85bb299 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -323,6 +323,7 @@ class neutron ( package { 'neutron': ensure => $package_ensure, name => $::neutron::params::package_name, + tag => 'openstack', } neutron_config { diff --git a/manifests/plugins/cisco.pp b/manifests/plugins/cisco.pp index 7ebea6ba6..db540463c 100644 --- a/manifests/plugins/cisco.pp +++ b/manifests/plugins/cisco.pp @@ -122,6 +122,7 @@ class neutron::plugins::cisco( package { 'neutron-plugin-cisco': ensure => $package_ensure, name => $::neutron::params::cisco_server_package, + tag => 'openstack', } diff --git a/manifests/plugins/linuxbridge.pp b/manifests/plugins/linuxbridge.pp index 440b3e4c3..ce10a6ff8 100644 --- a/manifests/plugins/linuxbridge.pp +++ b/manifests/plugins/linuxbridge.pp @@ -51,6 +51,7 @@ class neutron::plugins::linuxbridge ( package { 'neutron-plugin-linuxbridge': ensure => $package_ensure, name => $::neutron::params::linuxbridge_server_package, + tag => 'openstack', } if $sql_connection { diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp index f4e857748..bf6ccb07d 100644 --- a/manifests/plugins/ml2.pp +++ b/manifests/plugins/ml2.pp @@ -148,6 +148,7 @@ class neutron::plugins::ml2 ( package { 'neutron-plugin-ml2': ensure => $package_ensure, name => $::neutron::params::ml2_server_package, + tag => 'openstack', } Package['neutron-plugin-ml2'] -> Neutron_plugin_ml2<||> Package['neutron-plugin-ml2'] -> File['/etc/neutron/plugin.ini'] diff --git a/manifests/plugins/ml2/cisco/nexus.pp b/manifests/plugins/ml2/cisco/nexus.pp index ab034ac6a..76b1adebf 100644 --- a/manifests/plugins/ml2/cisco/nexus.pp +++ b/manifests/plugins/ml2/cisco/nexus.pp @@ -33,6 +33,7 @@ class neutron::plugins::ml2::cisco::nexus ( # and install it manually package { 'python-ncclient': ensure => installed, + tag => 'openstack', } ~> Service['neutron-server'] Neutron_plugin_ml2<||> -> diff --git a/manifests/plugins/nvp.pp b/manifests/plugins/nvp.pp index 24ba8e5a1..f484a16d6 100644 --- a/manifests/plugins/nvp.pp +++ b/manifests/plugins/nvp.pp @@ -39,7 +39,8 @@ class neutron::plugins::nvp ( package { 'neutron-plugin-nvp': ensure => $package_ensure, - name => $::neutron::params::nvp_server_package + name => $::neutron::params::nvp_server_package, + tag => 'openstack', } validate_array($nvp_controllers) diff --git a/manifests/plugins/ovs.pp b/manifests/plugins/ovs.pp index 1b54175a2..62db1e824 100644 --- a/manifests/plugins/ovs.pp +++ b/manifests/plugins/ovs.pp @@ -30,6 +30,7 @@ class neutron::plugins::ovs ( package { 'neutron-plugin-ovs': ensure => $package_ensure, name => $::neutron::params::ovs_server_package, + tag => 'openstack', } } diff --git a/manifests/server.pp b/manifests/server.pp index e3605a0a0..238f6b986 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -344,6 +344,7 @@ class neutron::server ( package { 'neutron-server': ensure => $package_ensure, name => $::neutron::params::server_package, + tag => 'openstack', } } else { # Some platforms (RedHat) does not provide a neutron-server package. diff --git a/manifests/services/fwaas.pp b/manifests/services/fwaas.pp index f24e037a2..78551e2ec 100644 --- a/manifests/services/fwaas.pp +++ b/manifests/services/fwaas.pp @@ -48,19 +48,25 @@ class neutron::services::fwaas ( if ($::osfamily == 'Debian') { # Debian platforms if $vpnaas_agent_package { - ensure_resource( 'package', $::neutron::params::vpnaas_agent_package, - { 'ensure' => $neutron::package_ensure }) + ensure_resource( 'package', $::neutron::params::vpnaas_agent_package, { + 'ensure' => $neutron::package_ensure, + 'tag' => 'openstack' + }) Package[$::neutron::params::vpnaas_agent_package] -> Neutron_fwaas_service_config<||> } else { - ensure_resource( 'package', $::neutron::params::l3_agent_package, - { 'ensure' => $neutron::package_ensure }) + ensure_resource( 'package', $::neutron::params::l3_agent_package, { + 'ensure' => $neutron::package_ensure, + 'tag' => 'openstack' + }) Package[$::neutron::params::l3_agent_package] -> Neutron_fwaas_service_config<||> } } elsif($::osfamily == 'Redhat') { # RH platforms - ensure_resource( 'package', $::neutron::params::fwaas_package, - { 'ensure' => $neutron::package_ensure }) + ensure_resource( 'package', $::neutron::params::fwaas_package, { + 'ensure' => $neutron::package_ensure, + 'tag' => 'openstack' + }) Package[$::neutron::params::fwaas_package] -> Neutron_fwaas_service_config<||> } diff --git a/spec/classes/neutron_agents_dhcp_spec.rb b/spec/classes/neutron_agents_dhcp_spec.rb index ec2d007e4..ff6b9735e 100644 --- a/spec/classes/neutron_agents_dhcp_spec.rb +++ b/spec/classes/neutron_agents_dhcp_spec.rb @@ -53,7 +53,8 @@ describe 'neutron::agents::dhcp' do if platform_params.has_key?(:dhcp_agent_package) is_expected.to contain_package('neutron-dhcp-agent').with( :name => platform_params[:dhcp_agent_package], - :ensure => p[:package_ensure] + :ensure => p[:package_ensure], + :tag => 'openstack' ) is_expected.to contain_package('neutron').with_before(/Package\[neutron-dhcp-agent\]/) is_expected.to contain_package('neutron-dhcp-agent').with_before(/Neutron_dhcp_agent_config\[.+\]/) diff --git a/spec/classes/neutron_agents_l3_spec.rb b/spec/classes/neutron_agents_l3_spec.rb index 2af6d46c6..4e1813eb2 100644 --- a/spec/classes/neutron_agents_l3_spec.rb +++ b/spec/classes/neutron_agents_l3_spec.rb @@ -63,7 +63,8 @@ describe 'neutron::agents::l3' do is_expected.to contain_package('neutron-l3').with( :name => platform_params[:l3_agent_package], :ensure => p[:package_ensure], - :require => 'Package[neutron]' + :require => 'Package[neutron]', + :tag => 'openstack' ) is_expected.to contain_package('neutron-l3').with_before(/Neutron_l3_agent_config\[.+\]/) else diff --git a/spec/classes/neutron_agents_lbaas_spec.rb b/spec/classes/neutron_agents_lbaas_spec.rb index 7378703db..db1c64695 100644 --- a/spec/classes/neutron_agents_lbaas_spec.rb +++ b/spec/classes/neutron_agents_lbaas_spec.rb @@ -43,7 +43,8 @@ describe 'neutron::agents::lbaas' do it 'installs neutron lbaas agent package' do is_expected.to contain_package('neutron-lbaas-agent').with( :name => platform_params[:lbaas_agent_package], - :ensure => p[:package_ensure] + :ensure => p[:package_ensure], + :tag => 'openstack' ) is_expected.to contain_package('neutron').with_before(/Package\[neutron-lbaas-agent\]/) is_expected.to contain_package('neutron-lbaas-agent').with_before(/Neutron_lbaas_agent_config\[.+\]/) diff --git a/spec/classes/neutron_agents_linuxbridge_spec.rb b/spec/classes/neutron_agents_linuxbridge_spec.rb index 26316fa1a..d5c9bf531 100644 --- a/spec/classes/neutron_agents_linuxbridge_spec.rb +++ b/spec/classes/neutron_agents_linuxbridge_spec.rb @@ -62,7 +62,8 @@ describe 'neutron::agents::linuxbridge' do it 'installs neutron linuxbridge agent package' do is_expected.to contain_package('neutron-plugin-linuxbridge-agent').with( :ensure => params[:package_ensure], - :name => platform_params[:linuxbridge_agent_package] + :name => platform_params[:linuxbridge_agent_package], + :tag => 'openstack' ) end end @@ -82,7 +83,8 @@ describe 'neutron::agents::linuxbridge' do it 'installs neutron linuxbridge package' do is_expected.to contain_package('neutron-plugin-linuxbridge').with( :ensure => params[:package_ensure], - :name => platform_params[:linuxbridge_server_package] + :name => platform_params[:linuxbridge_server_package], + :tag => 'openstack' ) end end diff --git a/spec/classes/neutron_agents_metadata_spec.rb b/spec/classes/neutron_agents_metadata_spec.rb index ec28f14ac..8a4ac0b9c 100644 --- a/spec/classes/neutron_agents_metadata_spec.rb +++ b/spec/classes/neutron_agents_metadata_spec.rb @@ -93,7 +93,8 @@ describe 'neutron::agents::metadata' do it 'installs neutron metadata agent package' do is_expected.to contain_package('neutron-metadata').with( :ensure => params[:package_ensure], - :name => platform_params[:metadata_agent_package] + :name => platform_params[:metadata_agent_package], + :tag => 'openstack' ) end diff --git a/spec/classes/neutron_agents_metering_spec.rb b/spec/classes/neutron_agents_metering_spec.rb index d00d91610..60f4244b6 100644 --- a/spec/classes/neutron_agents_metering_spec.rb +++ b/spec/classes/neutron_agents_metering_spec.rb @@ -63,7 +63,8 @@ describe 'neutron::agents::metering' do if platform_params.has_key?(:metering_agent_package) is_expected.to contain_package('neutron-metering-agent').with( :name => platform_params[:metering_agent_package], - :ensure => p[:package_ensure] + :ensure => p[:package_ensure], + :tag => 'openstack' ) is_expected.to contain_package('neutron').with_before(/Package\[neutron-metering-agent\]/) is_expected.to contain_package('neutron-metering-agent').with_before(/Neutron_metering_agent_config\[.+\]/) diff --git a/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb b/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb index da38b74a6..9072114f2 100644 --- a/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb +++ b/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb @@ -44,7 +44,8 @@ describe 'neutron::agents::ml2::linuxbridge' do is_expected.to contain_package('neutron-plugin-linuxbridge-agent').with( :name => linuxbridge_agent_package, - :ensure => default_params[:package_ensure] + :ensure => default_params[:package_ensure], + :tag => 'openstack' ) is_expected.to contain_package('neutron-plugin-linuxbridge-agent').with_before(/Neutron_plugin_linuxbridge\[.+\]/) diff --git a/spec/classes/neutron_agents_ml2_ovs_spec.rb b/spec/classes/neutron_agents_ml2_ovs_spec.rb index a00df9f3a..ed2762e95 100644 --- a/spec/classes/neutron_agents_ml2_ovs_spec.rb +++ b/spec/classes/neutron_agents_ml2_ovs_spec.rb @@ -57,7 +57,8 @@ describe 'neutron::agents::ml2::ovs' do if platform_params.has_key?(:ovs_agent_package) is_expected.to contain_package('neutron-ovs-agent').with( :name => platform_params[:ovs_agent_package], - :ensure => p[:package_ensure] + :ensure => p[:package_ensure], + :tag => 'openstack' ) is_expected.to contain_package('neutron-ovs-agent').with_before(/Neutron_plugin_ml2\[.+\]/) else diff --git a/spec/classes/neutron_agents_ml2_sriov_spec.rb b/spec/classes/neutron_agents_ml2_sriov_spec.rb index 53cc60857..a192cbc53 100644 --- a/spec/classes/neutron_agents_ml2_sriov_spec.rb +++ b/spec/classes/neutron_agents_ml2_sriov_spec.rb @@ -35,7 +35,8 @@ describe 'neutron::agents::ml2::sriov' do it 'installs neutron sriov-nic agent package' do is_expected.to contain_package('neutron-sriov-nic-agent').with( :name => platform_params[:sriov_nic_agent_package], - :ensure => p[:package_ensure] + :ensure => p[:package_ensure], + :tag => 'openstack' ) is_expected.to contain_package('neutron-sriov-nic-agent').with_before(/Neutron_plugin_ml2\[.+\]/) end diff --git a/spec/classes/neutron_agents_ovs_spec.rb b/spec/classes/neutron_agents_ovs_spec.rb index 7acef99ff..b81fa236f 100644 --- a/spec/classes/neutron_agents_ovs_spec.rb +++ b/spec/classes/neutron_agents_ovs_spec.rb @@ -53,7 +53,8 @@ describe 'neutron::agents::ovs' do if platform_params.has_key?(:ovs_agent_package) is_expected.to contain_package('neutron-plugin-ovs-agent').with( :name => platform_params[:ovs_agent_package], - :ensure => p[:package_ensure] + :ensure => p[:package_ensure], + :tag => 'openstack' ) is_expected.to contain_package('neutron-plugin-ovs-agent').with_before(/Neutron_plugin_ovs\[.+\]/) else @@ -88,7 +89,8 @@ describe 'neutron::agents::ovs' do if platform_params.has_key?(:ovs_agent_package) is_expected.to contain_package('neutron-plugin-ovs-agent').with( :name => platform_params[:ovs_agent_package], - :ensure => p[:package_ensure] + :ensure => p[:package_ensure], + :tag => 'openstack' ) end end diff --git a/spec/classes/neutron_agents_vpnaas_spec.rb b/spec/classes/neutron_agents_vpnaas_spec.rb index 40db3d9a0..7ca2ecb27 100644 --- a/spec/classes/neutron_agents_vpnaas_spec.rb +++ b/spec/classes/neutron_agents_vpnaas_spec.rb @@ -72,7 +72,8 @@ describe 'neutron::agents::vpnaas' do if platform_params.has_key?(:vpnaas_agent_package) is_expected.to contain_package('neutron-vpnaas-agent').with( :name => platform_params[:vpnaas_agent_package], - :ensure => p[:package_ensure] + :ensure => p[:package_ensure], + :tag => 'openstack' ) is_expected.to contain_package('neutron').with_before(/Package\[neutron-vpnaas-agent\]/) is_expected.to contain_package('neutron-vpnaas-agent').with_before(/Neutron_vpnaas_agent_config\[.+\]/) diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb index e09fd9e48..4135b631a 100644 --- a/spec/classes/neutron_init_spec.rb +++ b/spec/classes/neutron_init_spec.rb @@ -95,7 +95,8 @@ describe 'neutron' do it 'installs neutron package' do is_expected.to contain_package('neutron').with( :ensure => 'present', - :name => platform_params[:common_package_name] + :name => platform_params[:common_package_name], + :tag => 'openstack' ) end diff --git a/spec/classes/neutron_plugins_cisco_ml2_spec.rb b/spec/classes/neutron_plugins_cisco_ml2_spec.rb index c43a6b6d9..d3c220aec 100644 --- a/spec/classes/neutron_plugins_cisco_ml2_spec.rb +++ b/spec/classes/neutron_plugins_cisco_ml2_spec.rb @@ -51,7 +51,8 @@ describe 'neutron::plugins::ml2::cisco::nexus' do it 'installs ncclient package' do is_expected.to contain_package('python-ncclient').with( - :ensure => 'installed' + :ensure => 'installed', + :tag => 'openstack' ) end diff --git a/spec/classes/neutron_plugins_linuxbridge_spec.rb b/spec/classes/neutron_plugins_linuxbridge_spec.rb index 54eae25d9..e0285afe1 100644 --- a/spec/classes/neutron_plugins_linuxbridge_spec.rb +++ b/spec/classes/neutron_plugins_linuxbridge_spec.rb @@ -21,7 +21,8 @@ describe 'neutron::plugins::linuxbridge' do it 'installs neutron linuxbridge plugin package' do is_expected.to contain_package('neutron-plugin-linuxbridge').with( :ensure => params[:package_ensure], - :name => platform_params[:linuxbridge_plugin_package] + :name => platform_params[:linuxbridge_plugin_package], + :tag => 'openstack' ) end diff --git a/spec/classes/neutron_plugins_ml2_spec.rb b/spec/classes/neutron_plugins_ml2_spec.rb index dd43e411c..7dff07ae4 100644 --- a/spec/classes/neutron_plugins_ml2_spec.rb +++ b/spec/classes/neutron_plugins_ml2_spec.rb @@ -72,7 +72,8 @@ describe 'neutron::plugins::ml2' do if platform_params.has_key?(:ml2_server_package) is_expected.to contain_package('neutron-plugin-ml2').with( :name => platform_params[:ml2_server_package], - :ensure => p[:package_ensure] + :ensure => p[:package_ensure], + :tag => 'openstack' ) is_expected.to contain_package('neutron-plugin-ml2').with_before(/Neutron_plugin_ml2\[.+\]/) end @@ -171,7 +172,8 @@ describe 'neutron::plugins::ml2' do if platform_params.has_key?(:ml2_server_package) is_expected.to contain_package('neutron-plugin-ml2').with( :name => platform_params[:ml2_server_package], - :ensure => params[:package_ensure] + :ensure => params[:package_ensure], + :tag => 'openstack' ) end end diff --git a/spec/classes/neutron_plugins_nvp_spec.rb b/spec/classes/neutron_plugins_nvp_spec.rb index 3f50e3183..53545de8c 100644 --- a/spec/classes/neutron_plugins_nvp_spec.rb +++ b/spec/classes/neutron_plugins_nvp_spec.rb @@ -36,7 +36,8 @@ describe 'neutron::plugins::nvp' do it 'should have' do is_expected.to contain_package('neutron-plugin-nvp').with( :name => platform_params[:nvp_server_package], - :ensure => p[:package_ensure] + :ensure => p[:package_ensure], + :tag => 'openstack' ) end diff --git a/spec/classes/neutron_plugins_ovs_spec.rb b/spec/classes/neutron_plugins_ovs_spec.rb index 578189e6e..0cd45ce5e 100644 --- a/spec/classes/neutron_plugins_ovs_spec.rb +++ b/spec/classes/neutron_plugins_ovs_spec.rb @@ -39,7 +39,8 @@ describe 'neutron::plugins::ovs' do is_expected.to contain_neutron_plugin_ovs('OVS/tenant_network_type').with_value(params[:tenant_network_type]) is_expected.to contain_package('neutron-plugin-ovs').with( :name => platform_params[:ovs_server_package], - :ensure => params[:package_ensure] + :ensure => params[:package_ensure], + :tag => 'openstack' ) is_expected.not_to contain_class('vswitch::ovs') end diff --git a/spec/classes/neutron_server_spec.rb b/spec/classes/neutron_server_spec.rb index 8388465b2..878f244a2 100644 --- a/spec/classes/neutron_server_spec.rb +++ b/spec/classes/neutron_server_spec.rb @@ -72,7 +72,8 @@ describe 'neutron::server' do if platform_params.has_key?(:server_package) is_expected.to contain_package('neutron-server').with( :name => platform_params[:server_package], - :ensure => p[:package_ensure] + :ensure => p[:package_ensure], + :tag => 'openstack' ) is_expected.to contain_package('neutron-server').with_before(/Neutron_api_config\[.+\]/) is_expected.to contain_package('neutron-server').with_before(/Neutron_config\[.+\]/) diff --git a/spec/classes/neutron_services_fwaas_spec.rb b/spec/classes/neutron_services_fwaas_spec.rb index 60ad58338..223526fd3 100644 --- a/spec/classes/neutron_services_fwaas_spec.rb +++ b/spec/classes/neutron_services_fwaas_spec.rb @@ -59,7 +59,10 @@ describe 'neutron::services::fwaas' do it_configures 'neutron fwaas service plugin' it 'installs neutron l3 agent package' do - is_expected.to contain_package('neutron-l3-agent').with_ensure('present') + is_expected.to contain_package('neutron-l3-agent').with( + :ensure => 'present', + :tag => 'openstack' + ) end end @@ -80,7 +83,10 @@ describe 'neutron::services::fwaas' do it_configures 'neutron fwaas service plugin' it 'installs neutron vpnaas agent package' do - is_expected.to contain_package('neutron-vpn-agent').with_ensure('present') + is_expected.to contain_package('neutron-vpn-agent').with( + :ensure => 'present', + :tag => 'openstack' + ) end end