Make tests pass on Puppet 4.x
This commit makes the following changes, mostly to specs to get them passing on Puppet 4.x: removes redefinition of $name because it is now a reserved word and redundant in Puppet 3.x, cleans up the use of Puppet's old behavior of implicitly converting String to Integers since Puppet 4.x is pretty strictly typed, sets facts required for doing flow control and comparison, fixes implicit use of empty string that is assumed to be the same as false by updating tests that inject empty string into params to represent a value not being provide by a user to false instead. Closes-bug: #1447620 Change-Id: Ibb651f26f33549dbe564dc88167b8f578a03fd77
This commit is contained in:
parent
e0b04137d9
commit
ccac02b917
@ -242,7 +242,7 @@ class neutron::server (
|
||||
Class['neutron::policy'] ~> Service['neutron-server']
|
||||
|
||||
if $l3_ha {
|
||||
if $min_l3_agents_per_router <= $max_l3_agents_per_router or $max_l3_agents_per_router == '0' {
|
||||
if $min_l3_agents_per_router <= $max_l3_agents_per_router or $max_l3_agents_per_router == 0 {
|
||||
neutron_config {
|
||||
'DEFAULT/l3_ha': value => true;
|
||||
'DEFAULT/max_l3_agents_per_router': value => $max_l3_agents_per_router;
|
||||
|
@ -80,7 +80,7 @@ class neutron::server::notifications (
|
||||
fail('nova_admin_password must be set.')
|
||||
}
|
||||
|
||||
if ! ( $nova_admin_tenant_id or $nova_admin_tenant_name ) {
|
||||
if ! ($nova_admin_tenant_id or $nova_admin_tenant_name) {
|
||||
fail('You must provide either nova_admin_tenant_name or nova_admin_tenant_id.')
|
||||
}
|
||||
|
||||
|
@ -26,6 +26,11 @@ describe 'neutron::agents::dhcp' do
|
||||
:enable_metadata_network => false }
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
shared_examples_for 'neutron dhcp agent' do
|
||||
let :p do
|
||||
@ -125,8 +130,8 @@ describe 'neutron::agents::dhcp' do
|
||||
shared_examples_for 'dnsmasq dhcp_driver' do
|
||||
it 'installs dnsmasq packages' do
|
||||
if platform_params.has_key?(:dhcp_agent_package)
|
||||
is_expected.to contain_package(platform_params[:dnsmasq_base_package]).with_before('Package[neutron-dhcp-agent]')
|
||||
is_expected.to contain_package(platform_params[:dnsmasq_utils_package]).with_before('Package[neutron-dhcp-agent]')
|
||||
is_expected.to contain_package(platform_params[:dnsmasq_base_package]).with_before(['Package[neutron-dhcp-agent]'])
|
||||
is_expected.to contain_package(platform_params[:dnsmasq_utils_package]).with_before(['Package[neutron-dhcp-agent]'])
|
||||
end
|
||||
is_expected.to contain_package(platform_params[:dnsmasq_base_package]).with(
|
||||
:ensure => 'present',
|
||||
@ -142,7 +147,7 @@ describe 'neutron::agents::dhcp' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -158,7 +163,7 @@ describe 'neutron::agents::dhcp' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -30,6 +30,12 @@ describe 'neutron::agents::l3' do
|
||||
:agent_mode => 'legacy' }
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
let :params do
|
||||
{ }
|
||||
end
|
||||
@ -125,7 +131,7 @@ describe 'neutron::agents::l3' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -139,7 +145,7 @@ describe 'neutron::agents::l3' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -21,6 +21,12 @@ describe 'neutron::agents::lbaas' do
|
||||
}
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
shared_examples_for 'neutron lbaas agent' do
|
||||
let :p do
|
||||
@ -73,7 +79,7 @@ describe 'neutron::agents::lbaas' do
|
||||
shared_examples_for 'haproxy lbaas_driver' do
|
||||
it 'installs haproxy packages' do
|
||||
if platform_params.has_key?(:lbaas_agent_package)
|
||||
is_expected.to contain_package(platform_params[:haproxy_package]).with_before('Package[neutron-lbaas-agent]')
|
||||
is_expected.to contain_package(platform_params[:haproxy_package]).with_before(['Package[neutron-lbaas-agent]'])
|
||||
end
|
||||
is_expected.to contain_package(platform_params[:haproxy_package]).with(
|
||||
:ensure => 'present'
|
||||
@ -100,9 +106,11 @@ describe 'neutron::agents::lbaas' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian',
|
||||
:concat_basedir => '/dne'
|
||||
}
|
||||
default_facts.merge(
|
||||
{ :osfamily => 'Debian',
|
||||
:concat_basedir => '/dne'
|
||||
}
|
||||
)
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -117,9 +125,11 @@ describe 'neutron::agents::lbaas' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat',
|
||||
:concat_basedir => '/dne'
|
||||
}
|
||||
default_facts.merge(
|
||||
{ :osfamily => 'RedHat',
|
||||
:concat_basedir => '/dne'
|
||||
}
|
||||
)
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -24,6 +24,13 @@ describe 'neutron::agents::metadata' do
|
||||
}
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default',
|
||||
:processorcount => '2'
|
||||
}
|
||||
end
|
||||
|
||||
shared_examples_for 'neutron metadata agent' do
|
||||
|
||||
it { is_expected.to contain_class('neutron::params') }
|
||||
@ -83,8 +90,9 @@ describe 'neutron::agents::metadata' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian',
|
||||
:processorcount => '2' }
|
||||
default_facts.merge(
|
||||
{ :osfamily => 'Debian' }
|
||||
)
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -107,8 +115,9 @@ describe 'neutron::agents::metadata' do
|
||||
|
||||
context 'on Red Hat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat',
|
||||
:processorcount => '2' }
|
||||
default_facts.merge(
|
||||
{ :osfamily => 'RedHat' }
|
||||
)
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -43,6 +43,11 @@ describe 'neutron::agents::metering' do
|
||||
}
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
shared_examples_for 'neutron metering agent' do
|
||||
let :p do
|
||||
@ -95,7 +100,7 @@ describe 'neutron::agents::metering' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -108,7 +113,7 @@ describe 'neutron::agents::metering' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -20,6 +20,12 @@ describe 'neutron::agents::ml2::linuxbridge' do
|
||||
:firewall_driver => 'neutron.agent.linux.iptables_firewall.IptablesFirewallDriver' }
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
let :params do
|
||||
{}
|
||||
end
|
||||
@ -132,7 +138,7 @@ describe 'neutron::agents::ml2::linuxbridge' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -145,7 +151,7 @@ describe 'neutron::agents::ml2::linuxbridge' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -22,6 +22,12 @@ describe 'neutron::agents::ml2::ovs' do
|
||||
:firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' }
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
let :params do
|
||||
{}
|
||||
end
|
||||
@ -174,7 +180,7 @@ describe 'neutron::agents::ml2::ovs' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -187,7 +193,7 @@ describe 'neutron::agents::ml2::ovs' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -15,6 +15,12 @@ describe 'neutron::agents::ml2::sriov' do
|
||||
}
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
let :params do
|
||||
{}
|
||||
end
|
||||
@ -65,7 +71,7 @@ describe 'neutron::agents::ml2::sriov' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -78,7 +84,7 @@ describe 'neutron::agents::ml2::sriov' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -3,7 +3,9 @@ require 'spec_helper'
|
||||
describe 'neutron::agents::n1kv_vem' do
|
||||
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
{ :operatingsystem => 'RedHat',
|
||||
:operatingsystemrelease => '7',
|
||||
:osfamily => 'RedHat' }
|
||||
end
|
||||
|
||||
it 'should have a n1kv-vem config file' do
|
||||
@ -16,9 +18,9 @@ describe 'neutron::agents::n1kv_vem' do
|
||||
end
|
||||
|
||||
it 'install n1kv-vem' do
|
||||
is_expected.to contain_package('libnl').with_before('Package[nexus1000v]')
|
||||
is_expected.to contain_service('openvswitch').with_notify('Package[nexus1000v]')
|
||||
is_expected.to contain_package('nexus1000v').with_notify('Service[nexus1000v]')
|
||||
is_expected.to contain_package('libnl').with_before(['Package[nexus1000v]'])
|
||||
is_expected.to contain_service('openvswitch').with_notify(['Package[nexus1000v]'])
|
||||
is_expected.to contain_package('nexus1000v').with_notify(['Service[nexus1000v]'])
|
||||
is_expected.to contain_service('nexus1000v').with_ensure('running')
|
||||
end
|
||||
|
||||
|
@ -39,6 +39,11 @@ describe 'neutron::agents::vpnaas' do
|
||||
}
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
shared_examples_for 'neutron vpnaas agent' do
|
||||
let :p do
|
||||
@ -104,7 +109,7 @@ describe 'neutron::agents::vpnaas' do
|
||||
shared_examples_for 'openswan vpnaas_driver' do
|
||||
it 'installs openswan packages' do
|
||||
if platform_params.has_key?(:vpnaas_agent_package)
|
||||
is_expected.to contain_package('openswan').with_before('Package[neutron-vpnaas-agent]')
|
||||
is_expected.to contain_package('openswan').with_before(['Package[neutron-vpnaas-agent]'])
|
||||
end
|
||||
is_expected.to contain_package('openswan').with(
|
||||
:ensure => 'present',
|
||||
@ -115,7 +120,7 @@ describe 'neutron::agents::vpnaas' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -129,9 +134,10 @@ describe 'neutron::agents::vpnaas' do
|
||||
|
||||
context 'on RedHat 6 platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat',
|
||||
:operatingsystemrelease => '6.5',
|
||||
:operatingsystemmajrelease => 6 }
|
||||
default_facts.merge(
|
||||
{ :osfamily => 'RedHat',
|
||||
:operatingsystemrelease => '6.5',
|
||||
:operatingsystemmajrelease => 6 })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -145,9 +151,10 @@ describe 'neutron::agents::vpnaas' do
|
||||
|
||||
context 'on RedHat 7 platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat',
|
||||
:operatingsystemrelease => '7.1.2',
|
||||
:operatingsystemmajrelease => 7 }
|
||||
default_facts.merge(
|
||||
{ :osfamily => 'RedHat',
|
||||
:operatingsystemrelease => '7.1.2',
|
||||
:operatingsystemmajrelease => 7 })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -2,9 +2,15 @@ require 'spec_helper'
|
||||
|
||||
describe 'neutron::client' do
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
it { is_expected.to contain_class('neutron::client') }
|
||||
@ -12,7 +18,7 @@ describe 'neutron::client' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
it { is_expected.to contain_class('neutron::client') }
|
||||
|
@ -10,14 +10,17 @@ describe 'neutron::db::mysql' do
|
||||
{ :password => 'passw0rd',
|
||||
}
|
||||
end
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
it { is_expected.to contain_openstacklib__db__mysql('neutron').with(
|
||||
@ -31,7 +34,7 @@ describe 'neutron::db::mysql' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
it { is_expected.to contain_openstacklib__db__mysql('neutron').with(
|
||||
|
@ -10,13 +10,19 @@ describe 'neutron::db::postgresql' do
|
||||
'include postgresql::server'
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
context 'on a RedHat osfamily' do
|
||||
let :facts do
|
||||
{
|
||||
default_facts.merge({
|
||||
:osfamily => 'RedHat',
|
||||
:operatingsystemrelease => '7.0',
|
||||
:concat_basedir => '/var/lib/puppet/concat'
|
||||
}
|
||||
})
|
||||
end
|
||||
|
||||
context 'with only required parameters' do
|
||||
@ -34,12 +40,12 @@ describe 'neutron::db::postgresql' do
|
||||
|
||||
context 'on a Debian osfamily' do
|
||||
let :facts do
|
||||
{
|
||||
default_facts.merge({
|
||||
:operatingsystemrelease => '7.8',
|
||||
:operatingsystem => 'Debian',
|
||||
:osfamily => 'Debian',
|
||||
:concat_basedir => '/var/lib/puppet/concat'
|
||||
}
|
||||
})
|
||||
end
|
||||
|
||||
context 'with only required parameters' do
|
||||
|
@ -19,6 +19,12 @@ describe 'neutron' do
|
||||
}
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
shared_examples_for 'neutron' do
|
||||
|
||||
context 'and if rabbit_host parameter is provided' do
|
||||
@ -432,7 +438,7 @@ describe 'neutron' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -444,7 +450,7 @@ describe 'neutron' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -2,6 +2,12 @@ require 'spec_helper'
|
||||
|
||||
describe 'neutron::keystone::auth' do
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
describe 'with default class parameters' do
|
||||
let :params do
|
||||
{
|
||||
@ -18,7 +24,7 @@ describe 'neutron::keystone::auth' do
|
||||
|
||||
it { is_expected.to contain_keystone_user_role('neutron@foobar').with(
|
||||
:ensure => 'present',
|
||||
:roles => 'admin'
|
||||
:roles => ['admin']
|
||||
)}
|
||||
|
||||
it { is_expected.to contain_keystone_service('neutron').with(
|
||||
@ -42,7 +48,7 @@ describe 'neutron::keystone::auth' do
|
||||
end
|
||||
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
let :params do
|
||||
@ -52,7 +58,7 @@ describe 'neutron::keystone::auth' do
|
||||
}
|
||||
end
|
||||
|
||||
it { is_expected.to contain_keystone_endpoint('RegionOne/neutron').with_notify('Service[neutron-server]') }
|
||||
it { is_expected.to contain_keystone_endpoint('RegionOne/neutron').with_notify(['Service[neutron-server]']) }
|
||||
end
|
||||
|
||||
describe 'when overriding public_protocol, public_port and public address' do
|
||||
|
@ -24,7 +24,10 @@ describe 'neutron::plugins::ml2::cisco::nexus' do
|
||||
end
|
||||
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default',
|
||||
:osfamily => 'Debian'
|
||||
}
|
||||
end
|
||||
|
||||
context 'fail when missing nexus_config' do
|
||||
|
@ -33,6 +33,12 @@ describe 'neutron::plugins::cisco' do
|
||||
}
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
shared_examples_for 'default cisco plugin' do
|
||||
|
||||
before do
|
||||
@ -131,7 +137,7 @@ describe 'neutron::plugins::cisco' do
|
||||
end
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
context 'on Ubuntu operating systems' do
|
||||
@ -162,7 +168,7 @@ describe 'neutron::plugins::cisco' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
it_configures 'default cisco plugin'
|
||||
|
@ -18,6 +18,12 @@ describe 'neutron::plugins::midonet' do
|
||||
}
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
shared_examples_for 'neutron midonet plugin' do
|
||||
|
||||
let :params do
|
||||
@ -47,7 +53,7 @@ describe 'neutron::plugins::midonet' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian'}
|
||||
default_facts.merge({ :osfamily => 'Debian'})
|
||||
end
|
||||
it 'configures /etc/default/neutron-server' do
|
||||
is_expected.to contain_file_line('/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG').with(
|
||||
@ -63,7 +69,7 @@ describe 'neutron::plugins::midonet' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat'}
|
||||
default_facts.merge({ :osfamily => 'RedHat'})
|
||||
end
|
||||
it_configures 'neutron midonet plugin'
|
||||
end
|
||||
|
@ -40,6 +40,12 @@ describe 'neutron::plugins::ml2' do
|
||||
:package_ensure => 'present' }
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
let :params do
|
||||
{}
|
||||
end
|
||||
@ -210,7 +216,7 @@ describe 'neutron::plugins::ml2' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -237,7 +243,7 @@ describe 'neutron::plugins::ml2' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -14,6 +14,12 @@ describe 'neutron::plugins::nvp' do
|
||||
:package_ensure => 'present'}
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
let :params do
|
||||
{
|
||||
:default_tz_uuid => '0344130f-1add-4e86-b36e-ad1c44fe40dc',
|
||||
@ -87,7 +93,7 @@ describe 'neutron::plugins::nvp' do
|
||||
begin
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{:osfamily => 'Debian'}
|
||||
default_facts.merge({:osfamily => 'Debian'})
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -99,7 +105,7 @@ describe 'neutron::plugins::nvp' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{:osfamily => 'RedHat'}
|
||||
default_facts.merge({:osfamily => 'RedHat'})
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -17,6 +17,12 @@ describe 'neutron::plugins::plumgrid' do
|
||||
}
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
shared_examples_for 'neutron plumgrid plugin' do
|
||||
|
||||
let :params do
|
||||
@ -62,7 +68,7 @@ describe 'neutron::plugins::plumgrid' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian'}
|
||||
default_facts.merge({ :osfamily => 'Debian'})
|
||||
end
|
||||
|
||||
it 'configures /etc/default/neutron-server' do
|
||||
@ -80,7 +86,7 @@ describe 'neutron::plugins::plumgrid' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat'}
|
||||
default_facts.merge({ :osfamily => 'RedHat'})
|
||||
end
|
||||
|
||||
it 'should create plugin symbolic link' do
|
||||
|
@ -2,6 +2,12 @@ require 'spec_helper'
|
||||
|
||||
describe 'neutron::policy' do
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
shared_examples_for 'neutron policies' do
|
||||
let :params do
|
||||
{
|
||||
@ -25,7 +31,7 @@ describe 'neutron::policy' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
it_configures 'neutron policies'
|
||||
@ -33,7 +39,7 @@ describe 'neutron::policy' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
it_configures 'neutron policies'
|
||||
|
@ -28,6 +28,12 @@ describe 'neutron::quota' do
|
||||
:quota_vip => 10 }
|
||||
end
|
||||
|
||||
let :facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
shared_examples_for 'neutron quota' do
|
||||
let :params_hash do
|
||||
default_params.merge(params)
|
||||
|
@ -17,7 +17,7 @@ require 'spec_helper'
|
||||
|
||||
describe 'neutron::server::notifications' do
|
||||
let :pre_condition do
|
||||
'define keystone_user ($name) {}'
|
||||
'define keystone_user() {}'
|
||||
end
|
||||
|
||||
let :default_params do
|
||||
@ -33,6 +33,12 @@ describe 'neutron::server::notifications' do
|
||||
}
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
let :params do
|
||||
{
|
||||
:nova_admin_password => 'secrete',
|
||||
@ -87,7 +93,7 @@ describe 'neutron::server::notifications' do
|
||||
|
||||
context 'when no nova_admin_password is specified' do
|
||||
before :each do
|
||||
params.merge!(:nova_admin_password => '')
|
||||
params.merge!({ :nova_admin_password => false })
|
||||
end
|
||||
|
||||
it_raises 'a Puppet::Error', /nova_admin_password must be set./
|
||||
@ -95,10 +101,10 @@ describe 'neutron::server::notifications' do
|
||||
|
||||
context 'when no nova_admin_tenant_id and nova_admin_tenant_name specified' do
|
||||
before :each do
|
||||
params.merge!(
|
||||
:nova_admin_tenant_id => '',
|
||||
:nova_admin_tenant_name => ''
|
||||
)
|
||||
params.merge!({
|
||||
:nova_admin_tenant_name => false,
|
||||
:nova_admin_tenant_id => false,
|
||||
})
|
||||
end
|
||||
|
||||
it_raises 'a Puppet::Error', /You must provide either nova_admin_tenant_name or nova_admin_tenant_id./
|
||||
@ -106,10 +112,10 @@ describe 'neutron::server::notifications' do
|
||||
|
||||
context 'when providing a tenant name' do
|
||||
before :each do
|
||||
params.merge!(
|
||||
:nova_admin_tenant_id => '',
|
||||
:nova_admin_tenant_name => 'services'
|
||||
)
|
||||
params.merge!({
|
||||
:nova_admin_tenant_name => 'services',
|
||||
:nova_admin_tenant_id => false,
|
||||
})
|
||||
end
|
||||
it 'should configure nova admin tenant id' do
|
||||
is_expected.to contain_nova_admin_tenant_id_setter('nova_admin_tenant_id').with(
|
||||
@ -125,7 +131,7 @@ describe 'neutron::server::notifications' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -137,7 +143,7 @@ describe 'neutron::server::notifications' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -20,24 +20,30 @@ describe 'neutron::server' do
|
||||
:auth_tenant => 'services',
|
||||
:auth_user => 'neutron',
|
||||
:database_connection => 'sqlite:////var/lib/neutron/ovs.sqlite',
|
||||
:database_max_retries => '10',
|
||||
:database_idle_timeout => '3600',
|
||||
:database_retry_interval => '10',
|
||||
:database_min_pool_size => '1',
|
||||
:database_max_pool_size => '10',
|
||||
:database_max_overflow => '20',
|
||||
:database_max_retries => 10,
|
||||
:database_idle_timeout => 3600,
|
||||
:database_retry_interval => 10,
|
||||
:database_min_pool_size => 1,
|
||||
:database_max_pool_size => 10,
|
||||
:database_max_overflow => 20,
|
||||
:sync_db => false,
|
||||
:agent_down_time => '75',
|
||||
:agent_down_time => 75,
|
||||
:router_scheduler_driver => 'neutron.scheduler.l3_agent_scheduler.ChanceScheduler',
|
||||
:router_distributed => false,
|
||||
:l3_ha => false,
|
||||
:max_l3_agents_per_router => '3',
|
||||
:min_l3_agents_per_router => '2',
|
||||
:max_l3_agents_per_router => 3,
|
||||
:min_l3_agents_per_router => 2,
|
||||
:l3_ha_net_cidr => '169.254.192.0/18',
|
||||
:allow_automatic_l3agent_failover => false
|
||||
}
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
shared_examples_for 'a neutron server' do
|
||||
let :p do
|
||||
default_params.merge(params)
|
||||
@ -125,8 +131,8 @@ describe 'neutron::server' do
|
||||
end
|
||||
it 'should enable HA routers' do
|
||||
is_expected.to contain_neutron_config('DEFAULT/l3_ha').with_value(true)
|
||||
is_expected.to contain_neutron_config('DEFAULT/max_l3_agents_per_router').with_value('3')
|
||||
is_expected.to contain_neutron_config('DEFAULT/min_l3_agents_per_router').with_value('2')
|
||||
is_expected.to contain_neutron_config('DEFAULT/max_l3_agents_per_router').with_value(3)
|
||||
is_expected.to contain_neutron_config('DEFAULT/min_l3_agents_per_router').with_value(2)
|
||||
is_expected.to contain_neutron_config('DEFAULT/l3_ha_net_cidr').with_value('169.254.192.0/18')
|
||||
end
|
||||
end
|
||||
@ -143,18 +149,18 @@ describe 'neutron::server' do
|
||||
context 'with HA routers enabled with unlimited l3 agents per router' do
|
||||
before :each do
|
||||
params.merge!(:l3_ha => true,
|
||||
:max_l3_agents_per_router => '0' )
|
||||
:max_l3_agents_per_router => 0 )
|
||||
end
|
||||
it 'should enable HA routers' do
|
||||
is_expected.to contain_neutron_config('DEFAULT/max_l3_agents_per_router').with_value('0')
|
||||
is_expected.to contain_neutron_config('DEFAULT/max_l3_agents_per_router').with_value(0)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with HA routers enabled and wrong parameters' do
|
||||
before :each do
|
||||
params.merge!(:l3_ha => true,
|
||||
:max_l3_agents_per_router => '2',
|
||||
:min_l3_agents_per_router => '3' )
|
||||
:max_l3_agents_per_router => 2,
|
||||
:min_l3_agents_per_router => 3 )
|
||||
end
|
||||
|
||||
it_raises 'a Puppet::Error', /min_l3_agents_per_router should be less than or equal to max_l3_agents_per_router./
|
||||
@ -254,7 +260,7 @@ describe 'neutron::server' do
|
||||
|
||||
describe "with custom keystone auth_uri" do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
before do
|
||||
params.merge!({
|
||||
@ -273,7 +279,7 @@ describe 'neutron::server' do
|
||||
|
||||
describe "with custom keystone identity_uri" do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
before do
|
||||
params.merge!({
|
||||
@ -292,7 +298,7 @@ describe 'neutron::server' do
|
||||
|
||||
describe "with custom keystone identity_uri and auth_uri" do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
before do
|
||||
params.merge!({
|
||||
@ -312,8 +318,9 @@ describe 'neutron::server' do
|
||||
|
||||
context 'on Debian platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian',
|
||||
:processorcount => '2' }
|
||||
default_facts.merge(
|
||||
{ :osfamily => 'Debian',
|
||||
:processorcount => '2' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
@ -331,8 +338,9 @@ describe 'neutron::server' do
|
||||
|
||||
context 'on RedHat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat',
|
||||
:processorcount => '2' }
|
||||
default_facts.merge(
|
||||
{ :osfamily => 'RedHat',
|
||||
:processorcount => '2' })
|
||||
end
|
||||
|
||||
let :platform_params do
|
||||
|
@ -25,6 +25,12 @@ describe 'neutron::services::fwaas' do
|
||||
"class { 'neutron': rabbit_password => 'passw0rd' }"
|
||||
end
|
||||
|
||||
let :default_facts do
|
||||
{ :operatingsystem => 'default',
|
||||
:operatingsystemrelease => 'default'
|
||||
}
|
||||
end
|
||||
|
||||
let :params do
|
||||
{}
|
||||
end
|
||||
@ -48,8 +54,9 @@ describe 'neutron::services::fwaas' do
|
||||
|
||||
context 'on Ubuntu platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian',
|
||||
:operatingsystem => 'Ubuntu' }
|
||||
default_facts.merge(
|
||||
{ :osfamily => 'Debian',
|
||||
:operatingsystem => 'Ubuntu' })
|
||||
end
|
||||
|
||||
it_configures 'neutron fwaas service plugin'
|
||||
@ -64,8 +71,9 @@ describe 'neutron::services::fwaas' do
|
||||
|
||||
context 'on Debian platforms without VPNaaS' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian',
|
||||
:operatingsystem => 'Debian' }
|
||||
default_facts.merge(
|
||||
{ :osfamily => 'Debian',
|
||||
:operatingsystem => 'Debian' })
|
||||
end
|
||||
|
||||
it_configures 'neutron fwaas service plugin'
|
||||
@ -80,7 +88,7 @@ describe 'neutron::services::fwaas' do
|
||||
|
||||
context 'on Debian platforms with VPNaaS' do
|
||||
let :facts do
|
||||
{ :osfamily => 'Debian' }
|
||||
default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
let :params do
|
||||
@ -99,7 +107,7 @@ describe 'neutron::services::fwaas' do
|
||||
|
||||
context 'on Red Hat platforms' do
|
||||
let :facts do
|
||||
{ :osfamily => 'RedHat' }
|
||||
default_facts.merge({ :osfamily => 'RedHat' })
|
||||
end
|
||||
|
||||
it_configures 'neutron fwaas service plugin'
|
||||
|
@ -47,7 +47,7 @@
|
||||
# username=admin
|
||||
# password=mySecretPassword
|
||||
|
||||
<% nexus_config.each do |switch_hostname, switch_data| %>
|
||||
<% @nexus_config.each do |switch_hostname, switch_data| %>
|
||||
[ML2_MECH_CISCO_NEXUS:<%= switch_data['ip_address'] %>]
|
||||
<%- switch_data['servers'].each do|host_name, port| -%>
|
||||
<%=host_name-%>=<%= port %>
|
||||
|
Loading…
Reference in New Issue
Block a user