Bring Redhat support to acceptance tests
OpenStack Infra has jobs to run this on both Ubuntu Trusty and OS7. * Add minitest to Gemfile (dependency to run beaker on centos - see http://projects.theforeman.org/issues/2650 for details) * separate nodepool files to have trusty & centos7 support in OS * infra * spec: add case for repo configuration and support RH systems. * rabbitmq: install module from source * apt: pin the module * configure device_driver for LBaaS (update in Kilo) Change-Id: If6c724243ba2e4932b1121b7b7f148d8b5a3f187 Closes-bug: #1444736
This commit is contained in:
Emilien Macchi
Martin Mágr
parent
3f2ec9002a
commit
e74a84f4eb
1
Gemfile
1
Gemfile
|
|
@ -3,6 +3,7 @@ source 'https://rubygems.org'
|
|||
group :development, :test do
|
||||
gem 'puppetlabs_spec_helper', :require => false
|
||||
gem 'rspec-puppet', '~> 2.1.0', :require => false
|
||||
gem 'minitest', '~> 4.7', :require => 'minitest/unit'
|
||||
|
||||
gem 'metadata-json-lint'
|
||||
gem 'puppet-lint-absolute_classname-check'
|
||||
|
|
|
|||
|
|
@ -8,10 +8,34 @@ describe 'basic neutron' do
|
|||
pp= <<-EOS
|
||||
Exec { logoutput => 'on_failure' }
|
||||
|
||||
include ::apt
|
||||
class { '::openstack_extras::repo::debian::ubuntu':
|
||||
release => 'kilo',
|
||||
package_require => true,
|
||||
# Common resources
|
||||
case $::osfamily {
|
||||
'Debian': {
|
||||
include ::apt
|
||||
class { '::openstack_extras::repo::debian::ubuntu':
|
||||
release => 'kilo',
|
||||
package_require => true,
|
||||
}
|
||||
$package_provider = 'apt'
|
||||
}
|
||||
'RedHat': {
|
||||
class { '::openstack_extras::repo::redhat::redhat':
|
||||
# Kilo is not GA yet, so let's use the testing repo
|
||||
manage_rdo => false,
|
||||
repo_hash => {
|
||||
'rdo-kilo-testing' => {
|
||||
'baseurl' => 'https://repos.fedorapeople.org/repos/openstack/openstack-kilo/testing/el7/',
|
||||
# packages are not GA so not signed
|
||||
'gpgcheck' => '0',
|
||||
'priority' => 97,
|
||||
},
|
||||
},
|
||||
}
|
||||
$package_provider = 'yum'
|
||||
}
|
||||
default: {
|
||||
fail("Unsupported osfamily (${::osfamily})")
|
||||
}
|
||||
}
|
||||
|
||||
class { '::mysql::server': }
|
||||
|
|
@ -19,6 +43,7 @@ describe 'basic neutron' do
|
|||
class { '::rabbitmq':
|
||||
delete_guest_user => true,
|
||||
erlang_cookie => 'secrete',
|
||||
package_provider => $package_provider,
|
||||
}
|
||||
|
||||
rabbitmq_vhost { '/':
|
||||
|
|
@ -67,7 +92,12 @@ describe 'basic neutron' do
|
|||
rabbit_password => 'an_even_bigger_secret',
|
||||
rabbit_host => '127.0.0.1',
|
||||
allow_overlapping_ips => true,
|
||||
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin',
|
||||
core_plugin => 'ml2',
|
||||
service_plugins => [
|
||||
'neutron.services.l3_router.l3_router_plugin.L3RouterPlugin',
|
||||
'neutron.services.loadbalancer.plugin.LoadBalancerPlugin',
|
||||
'neutron.services.metering.metering_plugin.MeteringPlugin',
|
||||
],
|
||||
}
|
||||
class { '::neutron::db::mysql':
|
||||
password => 'a_big_secret',
|
||||
|
|
@ -79,18 +109,26 @@ describe 'basic neutron' do
|
|||
database_connection => 'mysql://neutron:a_big_secret@127.0.0.1/neutron?charset=utf8',
|
||||
auth_password => 'a_big_secret',
|
||||
identity_uri => 'http://127.0.0.1:35357/',
|
||||
sync_db => true,
|
||||
}
|
||||
class { '::neutron::client': }
|
||||
class { '::neutron::quota': }
|
||||
class { '::neutron::agents::dhcp': }
|
||||
class { '::neutron::agents::l3': }
|
||||
class { '::neutron::agents::lbaas': }
|
||||
class { '::neutron::agents::lbaas':
|
||||
device_driver => 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver',
|
||||
}
|
||||
class { '::neutron::agents::metering': }
|
||||
class { '::neutron::agents::ml2::ovs':
|
||||
enable_tunneling => true,
|
||||
local_ip => '127.0.0.1',
|
||||
tunnel_types => ['vxlan'],
|
||||
}
|
||||
class { '::neutron::plugins::ml2':
|
||||
type_drivers => ['vxlan'],
|
||||
tenant_network_types => ['vxlan'],
|
||||
mechanism_drivers => ['openvswitch']
|
||||
}
|
||||
class { '::neutron::plugins::ml2': }
|
||||
EOS
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
HOSTS:
|
||||
centos-70-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: el-7-x86_64
|
||||
hypervisor : none
|
||||
ip: 127.0.0.1
|
||||
CONFIG:
|
||||
type: foss
|
||||
|
|
@ -29,15 +29,19 @@ RSpec.configure do |c|
|
|||
on host, puppet('module','install','puppetlabs-mysql'), { :acceptable_exit_codes => 0 }
|
||||
on host, puppet('module','install','dprince/qpid'), { :acceptable_exit_codes => 0 }
|
||||
on host, puppet('module','install','duritong/sysctl'), { :acceptable_exit_codes => 0 }
|
||||
# pin apt module until openstack_extras use >= 2.0.0 version
|
||||
on host, puppet('module','install','puppetlabs-apt','--version','1.8.0'), { :acceptable_exit_codes => 0 }
|
||||
on host, puppet('module','install','puppetlabs-inifile'), { :acceptable_exit_codes => 0 }
|
||||
on host, puppet('module','install','stahnma-epel'), { :acceptable_exit_codes => 0 }
|
||||
on host, puppet('module','install','puppetlabs-rabbitmq'), { :acceptable_exit_codes => 0 }
|
||||
|
||||
# install puppet modules from git, use master
|
||||
shell('git clone https://git.openstack.org/stackforge/puppet-openstacklib /etc/puppet/modules/openstacklib')
|
||||
shell('git clone https://git.openstack.org/stackforge/puppet-vswitch /etc/puppet/modules/vswitch')
|
||||
shell('git clone https://git.openstack.org/stackforge/puppet-keystone /etc/puppet/modules/keystone')
|
||||
shell('git clone https://git.openstack.org/stackforge/puppet-openstack_extras /etc/puppet/modules/openstack_extras')
|
||||
# TODO(EmilienM) Cloning RabbitMQ module for now because we wait for a release including
|
||||
# https://github.com/enovance/puppetlabs-rabbitmq/commit/0227f762070ffbbea3c28d6a60174de98fa4cc1c
|
||||
shell('git clone https://github.com/puppetlabs/puppetlabs-rabbitmq/ /etc/puppet/modules/rabbitmq')
|
||||
|
||||
# Install the module being tested
|
||||
puppet_module_install(:source => proj_root, :module_name => 'neutron')
|
||||
|
|
|
|||
Loading…
Reference in New Issue