Packaging changes in UCA / Mitaka
1/ Package renames neutron-plugin-openvswitch-agent -> neutron-openvswitch-agent neutron-plugin-linuxbridge-agent -> neutron-linuxbridge-agent neutron-plugin-sriov-agent -> neutron-sriov-agent https://bugs.launchpad.net/bugs/1548244 https://bugs.launchpad.net/bugs/1321257 2/ Dropping of ml2_conf.ini on config-file path for agents https://bugs.launchpad.net/bugs/1527005 Change-Id: Ic170d932df53bb1d7bd3b0eda116ad36d0b929c6 Closes-Bug: #1548918
This commit is contained in:
parent
97ec23c39e
commit
43997b3394
|
@ -4,11 +4,7 @@ Puppet::Type.type(:neutron_agent_linuxbridge).provide(
|
||||||
) do
|
) do
|
||||||
|
|
||||||
def file_path
|
def file_path
|
||||||
if Facter.value(:operatingsystem) == 'Ubuntu'
|
'/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini'
|
||||||
'/etc/neutron/plugins/ml2/ml2_conf.ini'
|
|
||||||
else
|
|
||||||
'/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini'
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,11 +4,7 @@ Puppet::Type.type(:neutron_agent_ovs).provide(
|
||||||
) do
|
) do
|
||||||
|
|
||||||
def file_path
|
def file_path
|
||||||
if Facter.value(:operatingsystem) == 'Ubuntu'
|
'/etc/neutron/plugins/ml2/openvswitch_agent.ini'
|
||||||
'/etc/neutron/plugins/ml2/ml2_conf.ini'
|
|
||||||
else
|
|
||||||
'/etc/neutron/plugins/ml2/openvswitch_agent.ini'
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -101,28 +101,21 @@ class neutron::params {
|
||||||
$ml2_server_package = false
|
$ml2_server_package = false
|
||||||
}
|
}
|
||||||
|
|
||||||
case $::os_package_type {
|
$ovs_agent_package = 'neutron-openvswitch-agent'
|
||||||
'debian': {
|
$ovs_agent_service = 'neutron-openvswitch-agent'
|
||||||
$ovs_agent_package = 'neutron-openvswitch-agent'
|
|
||||||
$ovs_agent_service = 'neutron-openvswitch-agent'
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
$ovs_agent_package = 'neutron-plugin-openvswitch-agent'
|
|
||||||
$ovs_agent_service = 'neutron-plugin-openvswitch-agent'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$ovs_server_package = 'neutron-plugin-openvswitch'
|
$ovs_server_package = 'neutron-plugin-openvswitch'
|
||||||
$ovs_cleanup_service = false
|
$ovs_cleanup_service = false
|
||||||
$ovs_package = 'openvswitch-switch'
|
$ovs_package = 'openvswitch-switch'
|
||||||
$libnl_package = 'libnl1'
|
$libnl_package = 'libnl1'
|
||||||
$package_provider = 'dpkg'
|
$package_provider = 'dpkg'
|
||||||
|
|
||||||
$linuxbridge_agent_package = 'neutron-plugin-linuxbridge-agent'
|
$linuxbridge_agent_package = 'neutron-linuxbridge-agent'
|
||||||
$linuxbridge_agent_service = 'neutron-plugin-linuxbridge-agent'
|
$linuxbridge_agent_service = 'neutron-linuxbridge-agent'
|
||||||
$linuxbridge_server_package = 'neutron-plugin-linuxbridge'
|
$linuxbridge_server_package = 'neutron-plugin-linuxbridge'
|
||||||
|
|
||||||
$sriov_nic_agent_service = 'neutron-plugin-sriov-agent'
|
$sriov_nic_agent_service = 'neutron-sriov-agent'
|
||||||
$sriov_nic_agent_package = 'neutron-plugin-sriov-agent'
|
$sriov_nic_agent_package = 'neutron-sriov-agent'
|
||||||
|
|
||||||
$cisco_server_package = 'neutron-plugin-cisco'
|
$cisco_server_package = 'neutron-plugin-cisco'
|
||||||
$cisco_config_file = '/etc/neutron/plugins/cisco/cisco_plugins.ini'
|
$cisco_config_file = '/etc/neutron/plugins/cisco/cisco_plugins.ini'
|
||||||
|
|
|
@ -150,8 +150,8 @@ describe 'neutron::agents::ml2::linuxbridge' do
|
||||||
end
|
end
|
||||||
|
|
||||||
let :platform_params do
|
let :platform_params do
|
||||||
{ :linuxbridge_agent_package => 'neutron-plugin-linuxbridge-agent',
|
{ :linuxbridge_agent_package => 'neutron-linuxbridge-agent',
|
||||||
:linuxbridge_agent_service => 'neutron-plugin-linuxbridge-agent' }
|
:linuxbridge_agent_service => 'neutron-linuxbridge-agent' }
|
||||||
end
|
end
|
||||||
|
|
||||||
it_configures 'neutron plugin linuxbridge agent with ml2 plugin'
|
it_configures 'neutron plugin linuxbridge agent with ml2 plugin'
|
||||||
|
|
|
@ -262,22 +262,6 @@ describe 'neutron::agents::ml2::ovs' do
|
||||||
it_configures 'neutron plugin ovs agent with ml2 plugin'
|
it_configures 'neutron plugin ovs agent with ml2 plugin'
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'on Ubuntu platforms' do
|
|
||||||
let :facts do
|
|
||||||
@default_facts.merge(test_facts.merge({
|
|
||||||
:osfamily => 'Debian',
|
|
||||||
:os_package_type => 'ubuntu'
|
|
||||||
}))
|
|
||||||
end
|
|
||||||
|
|
||||||
let :platform_params do
|
|
||||||
{ :ovs_agent_package => 'neutron-plugin-openvswitch-agent',
|
|
||||||
:ovs_agent_service => 'neutron-plugin-openvswitch-agent' }
|
|
||||||
end
|
|
||||||
|
|
||||||
it_configures 'neutron plugin ovs agent with ml2 plugin'
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'on RedHat platforms' do
|
context 'on RedHat platforms' do
|
||||||
let :facts do
|
let :facts do
|
||||||
@default_facts.merge(test_facts.merge({
|
@default_facts.merge(test_facts.merge({
|
||||||
|
|
|
@ -103,8 +103,8 @@ describe 'neutron::agents::ml2::sriov' do
|
||||||
end
|
end
|
||||||
|
|
||||||
let :platform_params do
|
let :platform_params do
|
||||||
{ :sriov_nic_agent_package => 'neutron-plugin-sriov-agent',
|
{ :sriov_nic_agent_package => 'neutron-sriov-agent',
|
||||||
:sriov_nic_agent_service => 'neutron-plugin-sriov-agent' }
|
:sriov_nic_agent_service => 'neutron-sriov-agent' }
|
||||||
end
|
end
|
||||||
|
|
||||||
it_configures 'neutron sriov-nic agent with ml2 plugin'
|
it_configures 'neutron sriov-nic agent with ml2 plugin'
|
||||||
|
|
|
@ -34,7 +34,7 @@ describe provider_class do
|
||||||
|
|
||||||
let (:provider) { resource.provider }
|
let (:provider) { resource.provider }
|
||||||
|
|
||||||
[ 'RedHat', 'Debian' ].each do |os|
|
[ 'RedHat', 'Debian', 'Ubuntu' ].each do |os|
|
||||||
context "on #{os} with default setting" do
|
context "on #{os} with default setting" do
|
||||||
it 'it should fall back to default and use plugins/ml2/openvswitch_agent.ini' do
|
it 'it should fall back to default and use plugins/ml2/openvswitch_agent.ini' do
|
||||||
Facter.fact(:operatingsystem).stubs(:value).returns("#{os}")
|
Facter.fact(:operatingsystem).stubs(:value).returns("#{os}")
|
||||||
|
@ -44,13 +44,4 @@ describe provider_class do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'on Ubuntu with default setting' do
|
|
||||||
it 'it should fall back to default and use ml2_conf.ini' do
|
|
||||||
Facter.fact(:operatingsystem).stubs(:value).returns('Ubuntu')
|
|
||||||
expect(provider.section).to eq('DEFAULT')
|
|
||||||
expect(provider.setting).to eq('foo')
|
|
||||||
expect(provider.file_path).to eq('/etc/neutron/plugins/ml2/ml2_conf.ini')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue