From 9fc89a77ffa6c35eb2bf170762b1dcd7d9801e0c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 30 Apr 2021 11:42:54 +0900 Subject: [PATCH] Fix name of networking-ansible/baremetal package We should install python3-* instead of python2-* in CentOS8. This change fixes the remaining usage of python2-* left for netwokring-ansible and networking-baremetal. Backport note: This includes 260aa9fe292646f553467cc6b63475261fed9b54 which fixed the wrong package names in unit tests. Conflicts: manifests/plugins/ml2/networking_ansible.pp spec/classes/neutron_plugins_ml2_networking_ansible_spec.rb spec/classes/neutron_plugins_ml2_networking_baremetal_spec.rb Change-Id: I136a81cc857130b3befa5df204525bfa6c6f0206 (cherry picked from commit 34b5036ed8a1b7d7b50ec85484f496d861be57bf) (cherry picked from commit ca266112909fdd15f1c90c2778238bb66ff6c491) (cherry picked from commit b85b99dfac4fb29c136bba52779d32cef16cab3b) (cherry picked from commit 3b9df8e4b043471d875b8c112e04634a02ca64f6) --- manifests/agents/ml2/networking_baremetal.pp | 2 +- manifests/params.pp | 4 ++-- manifests/plugins/ml2/networking_ansible.pp | 3 ++- manifests/plugins/ml2/networking_baremetal.pp | 2 +- ...on_agents_ml2_networking_baremetal_spec.rb | 20 ++++++++++++++----- ...ron_plugins_ml2_networking_ansible_spec.rb | 18 ++++++++++++----- ...n_plugins_ml2_networking_baremetal_spec.rb | 18 ++++++++++++----- 7 files changed, 47 insertions(+), 20 deletions(-) diff --git a/manifests/agents/ml2/networking_baremetal.pp b/manifests/agents/ml2/networking_baremetal.pp index 532214c55..b6b1ed015 100644 --- a/manifests/agents/ml2/networking_baremetal.pp +++ b/manifests/agents/ml2/networking_baremetal.pp @@ -156,7 +156,7 @@ class neutron::agents::ml2::networking_baremetal ( 'ironic/max_retries': value => $max_retries; } - package { 'python2-ironic-neutron-agent': + package { 'python-ironic-neutron-agent': ensure => $package_ensure, name => $::neutron::params::networking_baremetal_agent_package, tag => ['openstack', 'neutron-package'], diff --git a/manifests/params.pp b/manifests/params.pp index fe5fb5ecb..7313ac18b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -90,8 +90,8 @@ class neutron::params { $fwaas_package = 'openstack-neutron-fwaas' $neutron_wsgi_script_path = '/var/www/cgi-bin/neutron' $neutron_wsgi_script_source = '/usr/bin/neutron-api' - $networking_baremetal_package = 'python2-networking-baremetal' - $networking_baremetal_agent_package = 'python2-ironic-neutron-agent' + $networking_baremetal_package = "python${pyvers}-networking-baremetal" + $networking_baremetal_agent_package = "python${pyvers}-ironic-neutron-agent" $networking_baremetal_agent_service = 'ironic-neutron-agent' $networking_ansible_package = "python${pyvers}-networking-ansible" $mlnx_agent_service = 'neutron-mlnx-agent' diff --git a/manifests/plugins/ml2/networking_ansible.pp b/manifests/plugins/ml2/networking_ansible.pp index 7c165f417..23f0cc382 100644 --- a/manifests/plugins/ml2/networking_ansible.pp +++ b/manifests/plugins/ml2/networking_ansible.pp @@ -44,9 +44,10 @@ class neutron::plugins::ml2::networking_ansible( fail("Unsupported osfamily ${::osfamily}") } - ensure_resource('package', 'python2-networking-ansible', + ensure_resource('package', 'python-networking-ansible', { ensure => $package_ensure, + name => $::neutron::params::networking_ansible_package, tag => ['openstack', 'neutron-package'] } ) diff --git a/manifests/plugins/ml2/networking_baremetal.pp b/manifests/plugins/ml2/networking_baremetal.pp index 364bb7ceb..57698cc02 100644 --- a/manifests/plugins/ml2/networking_baremetal.pp +++ b/manifests/plugins/ml2/networking_baremetal.pp @@ -21,7 +21,7 @@ class neutron::plugins::ml2::networking_baremetal( # Drivers are only packaged for RedHat at this time fail("Unsupported osfamily ${::osfamily}") } else { - package { 'python2-networking-baremetal': + package { 'python-networking-baremetal': ensure => $package_ensure, name => $::neutron::params::networking_baremetal_package, tag => ['openstack', 'neutron-package'], diff --git a/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb b/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb index c0418b674..ac357db46 100644 --- a/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb +++ b/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb @@ -58,13 +58,13 @@ describe 'neutron::agents::ml2::networking_baremetal' do end it 'installs ironic-neutron-agent agent package' do - should contain_package('python2-ironic-neutron-agent').with( + should contain_package('python-ironic-neutron-agent').with( :name => platform_params[:networking_baremetal_agent_package], :ensure => p[:package_ensure], :tag => ['openstack', 'neutron-package'], ) - should contain_package('python2-ironic-neutron-agent').that_requires('Anchor[neutron::install::begin]') - should contain_package('python2-ironic-neutron-agent').that_notifies('Anchor[neutron::install::end]') + should contain_package('python-ironic-neutron-agent').that_requires('Anchor[neutron::install::begin]') + should contain_package('python-ironic-neutron-agent').that_notifies('Anchor[neutron::install::end]') end it 'configures networking-baremetal ironic-neutron-agent service' do @@ -105,8 +105,18 @@ describe 'neutron::agents::ml2::networking_baremetal' do let (:platform_params) do case facts[:osfamily] when 'RedHat' - { :networking_baremetal_agent_package => 'python2-ironic-neutron-agent', - :networking_baremetal_agent_service => 'ironic-neutron-agent' } + if facts[:operatingsystem] == 'Fedora' + { :networking_baremetal_agent_package => 'python3-ironic-neutron-agent', + :networking_baremetal_agent_service => 'ironic-neutron-agent' } + else + if facts[:operatingsystemmajrelease] > '7' + { :networking_baremetal_agent_package => 'python3-ironic-neutron-agent', + :networking_baremetal_agent_service => 'ironic-neutron-agent' } + else + { :networking_baremetal_agent_package => 'python-ironic-neutron-agent', + :networking_baremetal_agent_service => 'ironic-neutron-agent' } + end + end end end case facts[:osfamily] diff --git a/spec/classes/neutron_plugins_ml2_networking_ansible_spec.rb b/spec/classes/neutron_plugins_ml2_networking_ansible_spec.rb index 9fe32b703..5a4324b33 100644 --- a/spec/classes/neutron_plugins_ml2_networking_ansible_spec.rb +++ b/spec/classes/neutron_plugins_ml2_networking_ansible_spec.rb @@ -30,14 +30,14 @@ describe 'neutron::plugins::ml2::networking_ansible' do it { should contain_class('neutron::params') } - it 'installs networking-ansible python2-networking-ansible package' do - should contain_package('python2-networking-ansible').with( + it 'installs networking-ansible python-networking-ansible package' do + should contain_package('python-networking-ansible').with( :name => platform_params[:networking_ansible_package], :ensure => p[:package_ensure], :tag => ['openstack', 'neutron-package'], ) - should contain_package('python2-networking-ansible').that_requires('Anchor[neutron::install::begin]') - should contain_package('python2-networking-ansible').that_notifies('Anchor[neutron::install::end]') + should contain_package('python-networking-ansible').that_requires('Anchor[neutron::install::begin]') + should contain_package('python-networking-ansible').that_notifies('Anchor[neutron::install::end]') end it 'should configure non-host config' do @@ -73,7 +73,15 @@ describe 'neutron::plugins::ml2::networking_ansible' do let (:platform_params) do case facts[:osfamily] when 'RedHat' - { :networking_ansible_package => 'python2-networking-ansible'} + if facts[:operatingsystem] == 'Fedora' + { :networking_ansible_package => 'python3-networking-ansible'} + else + if facts[:operatingsystemmajrelease] > '7' + { :networking_ansible_package => 'python3-networking-ansible'} + else + { :networking_ansible_package => 'python-networking-ansible'} + end + end end end case facts[:osfamily] diff --git a/spec/classes/neutron_plugins_ml2_networking_baremetal_spec.rb b/spec/classes/neutron_plugins_ml2_networking_baremetal_spec.rb index c9a6b908e..4e5dce3c9 100644 --- a/spec/classes/neutron_plugins_ml2_networking_baremetal_spec.rb +++ b/spec/classes/neutron_plugins_ml2_networking_baremetal_spec.rb @@ -18,14 +18,14 @@ describe 'neutron::plugins::ml2::networking_baremetal' do it { should contain_class('neutron::params') } - it 'installs networking-baremetal python2-networking-baremetal package' do - should contain_package('python2-networking-baremetal').with( + it 'installs networking-baremetal python-networking-baremetal package' do + should contain_package('python-networking-baremetal').with( :name => platform_params[:networking_baremetal_package], :ensure => p[:package_ensure], :tag => ['openstack', 'neutron-package'], ) - should contain_package('python2-networking-baremetal').that_requires('Anchor[neutron::install::begin]') - should contain_package('python2-networking-baremetal').that_notifies('Anchor[neutron::install::end]') + should contain_package('python-networking-baremetal').that_requires('Anchor[neutron::install::begin]') + should contain_package('python-networking-baremetal').that_notifies('Anchor[neutron::install::end]') end end @@ -39,7 +39,15 @@ describe 'neutron::plugins::ml2::networking_baremetal' do let (:platform_params) do case facts[:osfamily] when 'RedHat' - { :networking_baremetal_package => 'python2-networking-baremetal'} + if facts[:operatingsystem] == 'Fedora' + { :networking_baremetal_package => 'python3-networking-baremetal'} + else + if facts[:operatingsystemmajrelease] > '7' + { :networking_baremetal_package => 'python3-networking-baremetal'} + else + { :networking_baremetal_package => 'python-networking-baremetal'} + end + end end end case facts[:osfamily]