Change MidoNet Plugin package name

Move the MidoNet package name to the current (and more standard)
`python-networking-midonet`

Co-Authored-By: Cody Herriges <cody@herriges.org>
Change-Id: Id2dd117b752ad114448baa6659be485e4df38ce1
This commit is contained in:
Jaume Devesa
2016-03-18 11:07:23 +01:00
committed by Cody Herriges
parent 25cf3271dd
commit 7f2c802123
6 changed files with 15 additions and 8 deletions

View File

@@ -52,7 +52,7 @@ Puppet::Type.newtype(:neutron_plugin_midonet) do
end
autorequire(:package) do
'python-neutron-plugin-midonet'
'python-networking-midonet'
end
end

View File

@@ -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'

View File

@@ -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.
#

View File

@@ -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.

View File

@@ -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

View File

@@ -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)