diff --git a/lib/puppet/type/neutron_plugin_midonet.rb b/lib/puppet/type/neutron_plugin_midonet.rb index 43aaeec95..d98abf0ee 100644 --- a/lib/puppet/type/neutron_plugin_midonet.rb +++ b/lib/puppet/type/neutron_plugin_midonet.rb @@ -52,7 +52,7 @@ Puppet::Type.newtype(:neutron_plugin_midonet) do end autorequire(:package) do - 'python-neutron-plugin-midonet' + 'python-networking-midonet' end end diff --git a/manifests/params.pp b/manifests/params.pp index 2a745b798..e2b473b60 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -39,7 +39,7 @@ class neutron::params { $opencontrail_plugin_package = 'neutron-plugin-contrail' $opencontrail_config_file = '/etc/neutron/plugins/opencontrail/ContrailPlugin.ini' - $midonet_server_package = 'python-neutron-plugin-midonet' + $midonet_server_package = 'python-networking-midonet' $midonet_config_file = '/etc/neutron/plugins/midonet/midonet.ini' $ovn_plugin_package = 'python-networking-ovn' @@ -127,7 +127,7 @@ class neutron::params { $opencontrail_plugin_package = 'neutron-plugin-contrail' $opencontrail_config_file = '/etc/neutron/plugins/opencontrail/ContrailPlugin.ini' - $midonet_server_package = 'python-neutron-plugin-midonet' + $midonet_server_package = 'python-networking-midonet' $midonet_config_file = '/etc/neutron/plugins/midonet/midonet.ini' $ovn_plugin_package = 'python-networking-ovn' diff --git a/manifests/plugins/midonet.pp b/manifests/plugins/midonet.pp index 96d554629..e8a8e2d52 100644 --- a/manifests/plugins/midonet.pp +++ b/manifests/plugins/midonet.pp @@ -1,7 +1,7 @@ # == Class: midonet::neutron_plugin # # Install and configure Midonet Neutron Plugin. Please note that this manifest -# does not install the 'python-neutron-midonet-plugin' package, it only +# does not install the 'python-networking-midonet' package, it only # configures Neutron to do so needed for this deployment. Check out the # MidoNet module to do so. # diff --git a/releasenotes/notes/update_midonet_package_name-86a68308aa067cb8.yaml b/releasenotes/notes/update_midonet_package_name-86a68308aa067cb8.yaml new file mode 100644 index 000000000..009c434bf --- /dev/null +++ b/releasenotes/notes/update_midonet_package_name-86a68308aa067cb8.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - The package name for the midonet neutron plugin previously used + an older naming syntax from times passed that no longer existed + in current repositories. To fix this issue the package name was + updated to "python-networking-midonet" which is provided by third + repository from Midokura. diff --git a/spec/classes/neutron_plugins_midonet_spec.rb b/spec/classes/neutron_plugins_midonet_spec.rb index fe2fdbe8a..d9bf620f9 100644 --- a/spec/classes/neutron_plugins_midonet_spec.rb +++ b/spec/classes/neutron_plugins_midonet_spec.rb @@ -5,7 +5,7 @@ describe 'neutron::plugins::midonet' do let :pre_condition do "class { 'neutron::server': auth_password => 'password' } class { 'neutron': rabbit_password => 'passw0rd' } - package { 'python-neutron-plugin-midonet': }" + package { 'python-networking-midonet': }" end let :default_params do @@ -39,7 +39,7 @@ describe 'neutron::plugins::midonet' do is_expected.to contain_file('/etc/neutron/plugin.ini').with( :ensure => 'link', :target => '/etc/neutron/plugins/midonet/midonet.ini', - :require => 'Package[python-neutron-plugin-midonet]') + :require => 'Package[python-networking-midonet]') end it 'passes purge to resource' do @@ -69,7 +69,7 @@ describe 'neutron::plugins::midonet' do :path => '/etc/default/neutron-server', :match => '^NEUTRON_PLUGIN_CONFIG=(.*)$', :line => 'NEUTRON_PLUGIN_CONFIG=/etc/neutron/plugins/midonet/midonet.ini', - :require => ['Package[neutron-server]', 'Package[python-neutron-plugin-midonet]'], + :require => ['Package[neutron-server]', 'Package[python-networking-midonet]'], :notify => 'Service[neutron-server]' ) end diff --git a/spec/unit/type/neutron_plugin_midonet_spec.rb b/spec/unit/type/neutron_plugin_midonet_spec.rb index f4b19d47f..17220359e 100644 --- a/spec/unit/type/neutron_plugin_midonet_spec.rb +++ b/spec/unit/type/neutron_plugin_midonet_spec.rb @@ -9,7 +9,7 @@ describe 'Puppet::Type.type(:neutron_plugin_midonet)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'python-neutron-plugin-midonet') + package = Puppet::Type.type(:package).new(:name => 'python-networking-midonet') catalog.add_resource package, @neutron_plugin_midonet dependency = @neutron_plugin_midonet.autorequire expect(dependency.size).to eq(1)