Merge "Switch acceptance test to use integration classes"

This commit is contained in:
Zuul 2018-03-16 22:35:08 +00:00 committed by Gerrit Code Review
commit 85dcf1c296
1 changed files with 1 additions and 73 deletions

View File

@ -11,79 +11,7 @@ describe 'basic neutron' do
include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql
include ::openstack_integration::keystone
rabbitmq_user { 'neutron':
admin => true,
password => 'an_even_bigger_secret',
provider => 'rabbitmqctl',
require => Class['rabbitmq'],
}
rabbitmq_user_permissions { 'neutron@/':
configure_permission => '.*',
write_permission => '.*',
read_permission => '.*',
provider => 'rabbitmqctl',
require => Class['rabbitmq'],
}
Rabbitmq_user_permissions['neutron@/'] -> Service<| tag == 'neutron-service' |>
# Neutron resources
class { '::neutron':
default_transport_url => 'rabbit://neutron:an_even_bigger_secret@127.0.0.1:5672/',
allow_overlapping_ips => true,
core_plugin => 'ml2',
debug => true,
service_plugins => ['router', 'metering'],
}
class { '::neutron::db::mysql':
password => 'a_big_secret',
}
class { '::neutron::keystone::auth':
password => 'a_big_secret',
}
class { '::neutron::plugins::ml2':
type_drivers => ['vxlan'],
tenant_network_types => ['vxlan'],
mechanism_drivers => ['openvswitch'],
}
class { '::neutron::keystone::authtoken':
password => 'a_big_secret',
}
class { '::neutron::server':
database_connection => 'mysql+pymysql://neutron:a_big_secret@127.0.0.1/neutron?charset=utf8',
sync_db => true,
service_providers => [
'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver'
],
}
class { '::neutron::client': }
class { '::neutron::quota': }
class { '::neutron::agents::dhcp': debug => true }
class { '::neutron::agents::l3': debug => true }
class { '::neutron::agents::lbaas':
debug => true,
}
class { '::neutron::agents::metering': debug => true }
class { '::neutron::agents::ml2::ovs':
local_ip => '127.0.0.1',
tunnel_types => ['vxlan'],
# Prior to Newton, the neutron-openvswitch-agent used 'ovs-ofctl' of_interface driver by default.
# In Newton, 'of_interface' defaults to 'native'.
# This mostly eliminates spawning ovs-ofctl and improves performance a little.
# Current openstack-selinux does not allow the Ryu controller to listen on 6633 port.
# So in the meantime, let's use old interface:
of_interface => 'ovs-ofctl',
ovsdb_interface => 'vsctl',
}
class { '::neutron::services::lbaas::haproxy': }
class { '::neutron::services::lbaas::octavia': }
# Create Neutron security group for admin tenant
neutron_security_group { 'test':
ensure => present,
description => 'Test security group',
}
include ::openstack_integration::neutron
EOS