From afe371f89710a5e07377724ebf1fd85bfd7e5636 Mon Sep 17 00:00:00 2001 From: yatin Date: Thu, 27 Sep 2018 22:09:00 +0530 Subject: [PATCH] Update neutron packages name for Fedora For Fedora use python3 packages. Neutron python3 packages are now available at [1]. [1] https://trunk.rdoproject.org/fedora/current/ Change-Id: Ibfe0c78d346ad0b0e283bff595ce982ba176f668 --- manifests/agents/bigswitch.pp | 2 +- manifests/params.pp | 13 +++++++------ manifests/services/lbaas.pp | 15 ++++----------- spec/classes/neutron_agents_dhcp_spec.rb | 6 ++++-- spec/classes/neutron_agents_l3_spec.rb | 6 ++++-- spec/classes/neutron_agents_lbaas_spec.rb | 2 ++ spec/classes/neutron_agents_metadata_spec.rb | 6 ++++-- spec/classes/neutron_agents_metering_spec.rb | 6 ++++-- .../neutron_agents_ml2_linuxbridge_spec.rb | 6 ++++-- spec/classes/neutron_agents_ml2_sriov_spec.rb | 6 ++++-- spec/classes/neutron_agents_n1kv_vem_spec.rb | 1 + spec/classes/neutron_agents_ovn_metadata_spec.rb | 6 ++++-- spec/classes/neutron_agents_vpnaas_spec.rb | 5 ++++- spec/classes/neutron_init_spec.rb | 6 ++++-- spec/classes/neutron_plugins_cisco_spec.rb | 6 ++++-- spec/classes/neutron_plugins_midonet_spec.rb | 6 ++++-- ...eutron_plugins_ml2_bigswitch_restproxy_spec.rb | 3 ++- .../classes/neutron_plugins_ml2_bigswitch_spec.rb | 6 ++++-- .../neutron_plugins_ml2_cisco_nexus1000v_spec.rb | 1 + .../neutron_plugins_ml2_cisco_nexus_spec.rb | 3 ++- spec/classes/neutron_plugins_ml2_cisco_spec.rb | 3 ++- ...ron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb | 3 ++- .../neutron_plugins_ml2_cisco_ucsm_spec.rb | 1 + .../classes/neutron_plugins_ml2_cisco_vts_spec.rb | 4 +++- spec/classes/neutron_plugins_ml2_mellanox_spec.rb | 3 ++- spec/classes/neutron_plugins_ml2_midonet_spec.rb | 3 ++- .../neutron_plugins_ml2_mlnx_sdn_assist_spec.rb | 4 +++- .../neutron_plugins_ml2_opendaylight_spec.rb | 4 +++- spec/classes/neutron_plugins_ml2_spec.rb | 6 ++++-- spec/classes/neutron_plugins_nuage_spec.rb | 12 ++++++++---- spec/classes/neutron_plugins_nvp_spec.rb | 6 ++++-- spec/classes/neutron_plugins_opencontrail_spec.rb | 6 ++++-- spec/classes/neutron_plugins_plumgrid_spec.rb | 6 ++++-- spec/classes/neutron_server_spec.rb | 4 +++- spec/classes/neutron_services_fwaas_spec.rb | 12 ++++++++---- spec/classes/neutron_services_lbaas_spec.rb | 6 ++++-- spec/classes/neutron_services_vpnaas_spec.rb | 6 ++++-- 37 files changed, 129 insertions(+), 71 deletions(-) diff --git a/manifests/agents/bigswitch.pp b/manifests/agents/bigswitch.pp index ba9563eba..40faccac5 100644 --- a/manifests/agents/bigswitch.pp +++ b/manifests/agents/bigswitch.pp @@ -30,7 +30,7 @@ class neutron::agents::bigswitch ( fail("Unsupported osfamily ${::osfamily}") } - ensure_packages('python-networking-bigswitch', + ensure_packages("python${neutron::params::pyvers}-networking-bigswitch", { ensure => $package_ensure, tag => 'openstack', diff --git a/manifests/params.pp b/manifests/params.pp index d18c8c971..9ecae07a2 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -5,7 +5,8 @@ class neutron::params { include ::openstacklib::defaults - if ($::os_package_type == 'debian') { + if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or + ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { $pyvers = '3' } else { $pyvers = '' @@ -75,8 +76,8 @@ class neutron::params { $metering_agent_package = 'openstack-neutron-metering-agent' $vpnaas_agent_package = 'openstack-neutron-vpnaas' $l2gw_agent_package = 'openstack-neutron-l2gw-agent' - $l2gw_package = 'python2-networking-l2gw' - $ovn_metadata_agent_package = 'python-networking-ovn-metadata-agent' + $l2gw_package = "python${pyvers}-networking-l2gw" + $ovn_metadata_agent_package = "python${pyvers}-networking-ovn-metadata-agent" $dynamic_routing_package = false $bgp_dragent_package = 'openstack-neutron-bgp-dragent' if $::operatingsystemrelease =~ /^7.*/ or $::operatingsystem == 'Fedora' { @@ -93,7 +94,7 @@ class neutron::params { $networking_baremetal_package = 'python2-networking-baremetal' $networking_baremetal_agent_package = 'python2-ironic-neutron-agent' $networking_baremetal_agent_service = 'ironic-neutron-agent' - $networking_ansible_package = 'python2-networking-ansible' + $networking_ansible_package = "python${pyvers}-networking-ansible" } elsif($::osfamily == 'Debian') { $nobody_user_group = 'nogroup' $package_name = 'neutron-common' @@ -115,8 +116,8 @@ class neutron::params { $api_service_name = false $rpc_package_name = false $rpc_service_name = false - $dynamic_routing_package = 'python-neutron-dynamic-routing' - $lbaas_package = 'python-neutron-lbaas' + $dynamic_routing_package = "python${pyvers}-neutron-dynamic-routing" + $lbaas_package = "python${pyvers}-neutron-lbaas" } $bgp_dragent_package = 'neutron-bgp-dragent' $ovs_agent_package = 'neutron-openvswitch-agent' diff --git a/manifests/services/lbaas.pp b/manifests/services/lbaas.pp index 9cf5e9f41..d35ce02d4 100644 --- a/manifests/services/lbaas.pp +++ b/manifests/services/lbaas.pp @@ -58,17 +58,10 @@ class neutron::services::lbaas ( include ::neutron::params if $ensure_lbaas_driver_package { - if ($::os_package_type == 'debian') { - ensure_packages(['python3-neutron-lbaas'], { - ensure => $ensure_lbaas_driver_package, - tag => ['openstack', 'neutron-package'] - }) - } else { - ensure_packages(['python-neutron-lbaas'], { - ensure => $ensure_lbaas_driver_package, - tag => ['openstack', 'neutron-package'] - }) - } + ensure_packages(["python${neutron::params::pyvers}-neutron-lbaas"], { + ensure => $ensure_lbaas_driver_package, + tag => ['openstack', 'neutron-package'] + }) } neutron_config { diff --git a/spec/classes/neutron_agents_dhcp_spec.rb b/spec/classes/neutron_agents_dhcp_spec.rb index 721d6661f..ca9145927 100644 --- a/spec/classes/neutron_agents_dhcp_spec.rb +++ b/spec/classes/neutron_agents_dhcp_spec.rb @@ -220,7 +220,8 @@ describe 'neutron::agents::dhcp' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -241,7 +242,8 @@ describe 'neutron::agents::dhcp' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_agents_l3_spec.rb b/spec/classes/neutron_agents_l3_spec.rb index 9bf95c5b0..a688497e4 100644 --- a/spec/classes/neutron_agents_l3_spec.rb +++ b/spec/classes/neutron_agents_l3_spec.rb @@ -119,7 +119,8 @@ describe 'neutron::agents::l3' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -139,7 +140,8 @@ describe 'neutron::agents::l3' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_agents_lbaas_spec.rb b/spec/classes/neutron_agents_lbaas_spec.rb index f23510906..89b6c0273 100644 --- a/spec/classes/neutron_agents_lbaas_spec.rb +++ b/spec/classes/neutron_agents_lbaas_spec.rb @@ -133,6 +133,7 @@ describe 'neutron::agents::lbaas' do let :facts do @default_facts.merge(test_facts.merge( { :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, :concat_basedir => '/dne' } )) @@ -153,6 +154,7 @@ describe 'neutron::agents::lbaas' do @default_facts.merge(test_facts.merge( { :osfamily => 'RedHat', :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, :concat_basedir => '/dne' } )) diff --git a/spec/classes/neutron_agents_metadata_spec.rb b/spec/classes/neutron_agents_metadata_spec.rb index aca40e0a0..d5ded586a 100644 --- a/spec/classes/neutron_agents_metadata_spec.rb +++ b/spec/classes/neutron_agents_metadata_spec.rb @@ -88,7 +88,8 @@ describe 'neutron::agents::metadata' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge( - { :osfamily => 'Debian' } + { :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } } } )) end @@ -117,7 +118,8 @@ describe 'neutron::agents::metadata' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_agents_metering_spec.rb b/spec/classes/neutron_agents_metering_spec.rb index 5fb696a8e..95dfc22f3 100644 --- a/spec/classes/neutron_agents_metering_spec.rb +++ b/spec/classes/neutron_agents_metering_spec.rb @@ -112,7 +112,8 @@ describe 'neutron::agents::metering' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -132,7 +133,8 @@ describe 'neutron::agents::metering' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb b/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb index fe840300e..c01a54e08 100644 --- a/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb +++ b/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb @@ -166,7 +166,8 @@ describe 'neutron::agents::ml2::linuxbridge' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -182,7 +183,8 @@ describe 'neutron::agents::ml2::linuxbridge' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_agents_ml2_sriov_spec.rb b/spec/classes/neutron_agents_ml2_sriov_spec.rb index c3ff5958b..40af07a84 100644 --- a/spec/classes/neutron_agents_ml2_sriov_spec.rb +++ b/spec/classes/neutron_agents_ml2_sriov_spec.rb @@ -140,7 +140,8 @@ describe 'neutron::agents::ml2::sriov' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -156,7 +157,8 @@ describe 'neutron::agents::ml2::sriov' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_agents_n1kv_vem_spec.rb b/spec/classes/neutron_agents_n1kv_vem_spec.rb index 93aa67cb7..1bf249c7d 100644 --- a/spec/classes/neutron_agents_n1kv_vem_spec.rb +++ b/spec/classes/neutron_agents_n1kv_vem_spec.rb @@ -7,6 +7,7 @@ describe 'neutron::agents::n1kv_vem' do :operatingsystem => 'RedHat', :operatingsystemrelease => '7', :osfamily => 'RedHat', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, }) end diff --git a/spec/classes/neutron_agents_ovn_metadata_spec.rb b/spec/classes/neutron_agents_ovn_metadata_spec.rb index c193de525..ee75c7d3b 100644 --- a/spec/classes/neutron_agents_ovn_metadata_spec.rb +++ b/spec/classes/neutron_agents_ovn_metadata_spec.rb @@ -97,7 +97,8 @@ describe 'neutron::agents::ovn_metadata' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge( - { :osfamily => 'Debian' } + { :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } } } )) end @@ -113,7 +114,8 @@ describe 'neutron::agents::ovn_metadata' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_agents_vpnaas_spec.rb b/spec/classes/neutron_agents_vpnaas_spec.rb index c3caaa010..e22cc25a3 100644 --- a/spec/classes/neutron_agents_vpnaas_spec.rb +++ b/spec/classes/neutron_agents_vpnaas_spec.rb @@ -93,7 +93,8 @@ describe 'neutron::agents::vpnaas' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -122,6 +123,7 @@ describe 'neutron::agents::vpnaas' do @default_facts.merge(test_facts.merge( { :osfamily => 'RedHat', :operatingsystemrelease => '6.5', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '6', :minor => '5' } }, :operatingsystemmajrelease => 6 })) end @@ -138,6 +140,7 @@ describe 'neutron::agents::vpnaas' do @default_facts.merge(test_facts.merge( { :osfamily => 'RedHat', :operatingsystemrelease => '7.1.2', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '1.2' } }, :operatingsystemmajrelease => 7 })) end diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb index e72a333c7..f723045a1 100644 --- a/spec/classes/neutron_init_spec.rb +++ b/spec/classes/neutron_init_spec.rb @@ -500,7 +500,8 @@ describe 'neutron' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -515,7 +516,8 @@ describe 'neutron' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_cisco_spec.rb b/spec/classes/neutron_plugins_cisco_spec.rb index 8a4525a20..cd680ec86 100644 --- a/spec/classes/neutron_plugins_cisco_spec.rb +++ b/spec/classes/neutron_plugins_cisco_spec.rb @@ -167,7 +167,8 @@ describe 'neutron::plugins::cisco' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -203,7 +204,8 @@ describe 'neutron::plugins::cisco' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_midonet_spec.rb b/spec/classes/neutron_plugins_midonet_spec.rb index cfa39e609..b51ae3a76 100644 --- a/spec/classes/neutron_plugins_midonet_spec.rb +++ b/spec/classes/neutron_plugins_midonet_spec.rb @@ -89,7 +89,8 @@ describe 'neutron::plugins::midonet' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end it 'configures /etc/default/neutron-server' do @@ -109,7 +110,8 @@ describe 'neutron::plugins::midonet' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end it_configures 'neutron midonet plugin' diff --git a/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb b/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb index bfe5301e3..93973bbbd 100644 --- a/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb +++ b/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb @@ -103,7 +103,8 @@ describe 'neutron::plugins::ml2::bigswitch::restproxy' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb b/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb index a8176c281..d03c80929 100644 --- a/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb +++ b/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb @@ -48,7 +48,8 @@ describe 'neutron::plugins::ml2::bigswitch' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end @@ -58,7 +59,8 @@ describe 'neutron::plugins::ml2::bigswitch' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb index 9fdb21b6a..826f74fdc 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb @@ -76,6 +76,7 @@ describe 'neutron::plugins::ml2::cisco::nexus1000v' do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb index 97dd4f8ad..66f02bc02 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb @@ -101,7 +101,8 @@ describe 'neutron::plugins::ml2::cisco::nexus' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_ml2_cisco_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_spec.rb index 57747c15e..80e5bd6b6 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_spec.rb @@ -50,7 +50,8 @@ describe 'neutron::plugins::ml2::cisco' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb index 44f92bbdd..70fcfac24 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb @@ -53,7 +53,8 @@ describe 'neutron::plugins::ml2::cisco::type_nexus_vxlan' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb index 81606b8a9..36361a449 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb @@ -65,6 +65,7 @@ describe 'neutron::plugins::ml2::cisco::ucsm' do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb index bbb7866b3..0721eab54 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb @@ -64,7 +64,8 @@ describe 'neutron::plugins::ml2::cisco::vts' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end it_configures 'neutron plugin ml2 cisco vts' @@ -74,6 +75,7 @@ describe 'neutron::plugins::ml2::cisco::vts' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end it_configures 'neutron plugin ml2 cisco vts' diff --git a/spec/classes/neutron_plugins_ml2_mellanox_spec.rb b/spec/classes/neutron_plugins_ml2_mellanox_spec.rb index 782805258..3761afc53 100644 --- a/spec/classes/neutron_plugins_ml2_mellanox_spec.rb +++ b/spec/classes/neutron_plugins_ml2_mellanox_spec.rb @@ -49,7 +49,8 @@ describe 'neutron::plugins::ml2::mellanox' do let :facts do OSDefaults.get_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_ml2_midonet_spec.rb b/spec/classes/neutron_plugins_ml2_midonet_spec.rb index ecbb71199..8e212bcea 100644 --- a/spec/classes/neutron_plugins_ml2_midonet_spec.rb +++ b/spec/classes/neutron_plugins_ml2_midonet_spec.rb @@ -57,7 +57,8 @@ describe 'neutron::plugins::ml2::midonet' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_ml2_mlnx_sdn_assist_spec.rb b/spec/classes/neutron_plugins_ml2_mlnx_sdn_assist_spec.rb index 511ac9517..77e64ad5f 100644 --- a/spec/classes/neutron_plugins_ml2_mlnx_sdn_assist_spec.rb +++ b/spec/classes/neutron_plugins_ml2_mlnx_sdn_assist_spec.rb @@ -50,7 +50,8 @@ describe 'neutron::plugins::ml2::mellanox::mlnx_sdn_assist' do let :facts do OSDefaults.get_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end @@ -61,6 +62,7 @@ describe 'neutron::plugins::ml2::mellanox::mlnx_sdn_assist' do let :facts do OSDefaults.get_facts.merge(test_facts.merge({ :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb b/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb index 09b48456c..4011a1991 100644 --- a/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb +++ b/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb @@ -68,7 +68,8 @@ describe 'neutron::plugins::ml2::opendaylight' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end @@ -79,6 +80,7 @@ describe 'neutron::plugins::ml2::opendaylight' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_ml2_spec.rb b/spec/classes/neutron_plugins_ml2_spec.rb index aafdb67aa..e551a6fa1 100644 --- a/spec/classes/neutron_plugins_ml2_spec.rb +++ b/spec/classes/neutron_plugins_ml2_spec.rb @@ -305,7 +305,8 @@ describe 'neutron::plugins::ml2' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -335,7 +336,8 @@ describe 'neutron::plugins::ml2' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_nuage_spec.rb b/spec/classes/neutron_plugins_nuage_spec.rb index e3678df30..0560b4b04 100644 --- a/spec/classes/neutron_plugins_nuage_spec.rb +++ b/spec/classes/neutron_plugins_nuage_spec.rb @@ -72,7 +72,8 @@ describe 'neutron::plugins::nuage' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -83,7 +84,8 @@ describe 'neutron::plugins::nuage' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end @@ -94,7 +96,8 @@ describe 'neutron::plugins::nuage' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -115,7 +118,8 @@ describe 'neutron::plugins::nuage' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_nvp_spec.rb b/spec/classes/neutron_plugins_nvp_spec.rb index cd9b35194..9cff68e6e 100644 --- a/spec/classes/neutron_plugins_nvp_spec.rb +++ b/spec/classes/neutron_plugins_nvp_spec.rb @@ -100,7 +100,8 @@ describe 'neutron::plugins::nvp' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -115,7 +116,8 @@ describe 'neutron::plugins::nvp' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_opencontrail_spec.rb b/spec/classes/neutron_plugins_opencontrail_spec.rb index 64bf06497..db7e43df4 100644 --- a/spec/classes/neutron_plugins_opencontrail_spec.rb +++ b/spec/classes/neutron_plugins_opencontrail_spec.rb @@ -63,7 +63,8 @@ describe 'neutron::plugins::opencontrail' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -88,7 +89,8 @@ describe 'neutron::plugins::opencontrail' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_plugins_plumgrid_spec.rb b/spec/classes/neutron_plugins_plumgrid_spec.rb index 06c7cfc41..d6cdf02db 100644 --- a/spec/classes/neutron_plugins_plumgrid_spec.rb +++ b/spec/classes/neutron_plugins_plumgrid_spec.rb @@ -101,7 +101,8 @@ describe 'neutron::plugins::plumgrid' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -123,7 +124,8 @@ describe 'neutron::plugins::plumgrid' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_server_spec.rb b/spec/classes/neutron_server_spec.rb index e9ded96c9..2b93f1b95 100644 --- a/spec/classes/neutron_server_spec.rb +++ b/spec/classes/neutron_server_spec.rb @@ -329,7 +329,8 @@ describe 'neutron::server' do context 'on Debian platforms' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian', + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -349,6 +350,7 @@ describe 'neutron::server' do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_services_fwaas_spec.rb b/spec/classes/neutron_services_fwaas_spec.rb index c3bcc5bd2..436b83bf7 100644 --- a/spec/classes/neutron_services_fwaas_spec.rb +++ b/spec/classes/neutron_services_fwaas_spec.rb @@ -69,7 +69,8 @@ describe 'neutron::services::fwaas' do let :facts do @default_facts.merge(test_facts.merge( { :osfamily => 'Debian', - :operatingsystem => 'Ubuntu' + :operatingsystem => 'Ubuntu', + :os => { :name => 'Ubuntu', :family => 'Debian', :release => { :major => '16', :minor => '04' } }, } )) end @@ -89,7 +90,8 @@ describe 'neutron::services::fwaas' do let :facts do @default_facts.merge(test_facts.merge( { :osfamily => 'Debian', - :operatingsystem => 'Debian' + :operatingsystem => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, } )) end @@ -108,7 +110,8 @@ describe 'neutron::services::fwaas' do context 'on Debian platforms with VPNaaS' do let :facts do @default_facts.merge(test_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, })) end @@ -130,7 +133,8 @@ describe 'neutron::services::fwaas' do let :facts do @default_facts.merge(test_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, })) end diff --git a/spec/classes/neutron_services_lbaas_spec.rb b/spec/classes/neutron_services_lbaas_spec.rb index 097f47ee3..634e10490 100644 --- a/spec/classes/neutron_services_lbaas_spec.rb +++ b/spec/classes/neutron_services_lbaas_spec.rb @@ -65,7 +65,8 @@ describe 'neutron::services::lbaas' do context 'on Debian platforms' do let :facts do @default_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, }) end @@ -80,7 +81,8 @@ describe 'neutron::services::lbaas' do let :facts do @default_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, }) end diff --git a/spec/classes/neutron_services_vpnaas_spec.rb b/spec/classes/neutron_services_vpnaas_spec.rb index 188c0c86e..b4bd15e00 100644 --- a/spec/classes/neutron_services_vpnaas_spec.rb +++ b/spec/classes/neutron_services_vpnaas_spec.rb @@ -59,7 +59,8 @@ describe 'neutron::services::vpnaas' do context 'on Debian platforms' do let :facts do @default_facts.merge({ - :osfamily => 'Debian' + :osfamily => 'Debian', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, }) end @@ -74,7 +75,8 @@ describe 'neutron::services::vpnaas' do let :facts do @default_facts.merge({ :osfamily => 'RedHat', - :operatingsystemrelease => '7' + :operatingsystemrelease => '7', + :os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } }, }) end