Add L2GW service to scenario004

Code Issues Proposed changes

This submission will enable L2GW on scenario004
and one of its tempest test.
Change-Id: I87fb7ca3671cf93d6b47ac393e047e1810daf375
Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>

This commit is contained in:

Ricardo Noriega

2017年04月26日 14:05:33 +02:00

committed by Alfredo Moralejo

parent d40188dfba

commit 002d4d25d7

5 changed files with 55 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1
README.md

View File

@@ -72,6 +72,7 @@ scenario](#all-in-one).

| watcher | | | | X | |

| bgpvpn-api | | | | X | |

| redis | X | | | | |

| l2gw | | | | X | |

When the Jenkins slave is created, the *run_tests.sh* script will be executed.

This script will execute *install_modules.sh* that prepare /etc/puppet/modules

9
fixtures/scenario004.pp

View File

@@ -48,7 +48,8 @@ class { '::openstack_integration::glance':

backend => 'swift',

}

class{ '::openstack_integration::neutron':

bgpvpn_enabled => $bgpvpn_enabled

bgpvpn_enabled => $bgpvpn_enabled,

l2gw_enabled => true,

}

class{ '::openstack_integration::nova':

libvirt_rbd => true,

@@ -67,6 +68,8 @@ include ::openstack_integration::provision

#Don't test swift, radosgw won'tpassthecurrenttests

#Glance,nova,neutronaretruebydefault.

class{ '::openstack_integration::tempest':

watcher => $watcher_enabled,

bgpvpn => $bgpvpn_enabled,

watcher => $watcher_enabled,

bgpvpn => $bgpvpn_enabled,

l2gw => true,

l2gw_switch => 'cell08-5930-01::FortyGigE1/0/1|100',

}

37
manifests/neutron.pp

View File

@@ -10,9 +10,14 @@

#APIextensions.

#Defaultstofalse.

#

#[*l2gw_enabled*]

#(optional)FlagtoenableL2GW.

#Defaultstofalse.

#

classopenstack_integration::neutron(

$driver='openvswitch',

$bgpvpn_enabled=false,

$l2gw_enabled=false,

){

include ::openstack_integration::config

@@ -104,10 +109,28 @@ class openstack_integration::neutron (

admin_url=>"${::openstack_integration::config::base_url}:9696",

password=>'a_big_secret',

}

$plugins_list=$bgpvpn_enabled?{

true => ['router', 'metering', 'firewall', 'lbaasv2', 'bgpvpn'],

default => ['router', 'metering', 'firewall', 'lbaasv2'],

$bgpvpn_plugin=$bgpvpn_enabled?{

true => 'bgpvpn',

default => undef,

}

if$l2gw_enabled{

if ($::operatingsystem == 'Ubuntu') {

class {'::neutron::services::l2gw': }

$l2gw_provider='L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default'

}

elsif($::operatingsystem!='Ubuntu'){

class {'::neutron::services::l2gw':

service_providers => ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default']

}

$l2gw_provider=undef

}

$l2gw_plugin=$l2gw_enabled?{

true => 'networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin',

default => undef,

}

$plugins_list=delete_undef_values(['router','metering','firewall','lbaasv2',$bgpvpn_plugin,$l2gw_plugin])

class{ '::neutron':

default_transport_url => os_transport_url({

'transport' => 'rabbit',

@@ -135,14 +158,16 @@ class openstack_integration::neutron (

auth_uri => $::openstack_integration::config::keystone_auth_uri,

memcached_servers => $::openstack_integration::config::memcached_servers,

}

$providers_list=delete_undef_values(['LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default',

'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default',

'FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver:default',

$l2gw_provider])

class{ '::neutron::server':

database_connection => 'mysql+pymysql://neutron:neutron@127.0.0.1/neutron?charset=utf8',

sync_db => true,

api_workers => 2,

rpc_workers => 2,

 service_providers => ['LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default',

'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default',

'FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver:default'],

service_providers => $providers_list,

}

class{ '::neutron::services::lbaas': }

class{ '::neutron::plugins::ml2':

14
manifests/tempest.pp

View File

@@ -52,6 +52,14 @@

#(optional)DefineifIronicneedstobetested.

#Defaulttofalse.

#

#[*l2gw*]

#(optional)DefineifL2GWneedstobetested.

#Defaulttofalse.

#

#[*l2gw_switch*]

#(optional)Defineaswitchnamefortesting.

#Defaulttoundef.

#

#[*mistral*]

#(optional)DefineifMistralneedstobetested.

#Defaulttofalse.

@@ -115,6 +123,8 @@ class openstack_integration::tempest (

$heat=false,

$horizon=false,

$ironic=false,

$l2gw=false,

$l2gw_switch=undef,

$mistral=false,

$murano=false,

$neutron=true,

@@ -164,6 +174,8 @@ class openstack_integration::tempest (

'subnet_allocation',

'tag',

'tag-ext',

'l2-gateway',

'l2-gateway-connection',

],

){

@@ -210,6 +222,7 @@ class openstack_integration::tempest (

neutron_available=>$neutron,

neutron_bgpvpn_available=>$bgpvpn,

neutron_lbaas_available=>true,

neutron_l2gw_available=>$l2gw,

neutron_fwaas_available=>true,

ceilometer_available=>$ceilometer,

aodh_available=>$aodh,

@@ -241,6 +254,7 @@ class openstack_integration::tempest (

murano_available=>$murano,

tempest_workspace=>'/tmp/openstack/tempest',

run_ssh=>true,

l2gw_switch=>$l2gw_switch,

#TODO(emilien)optimizationby1/usingHieratoconfigureGlanceimagesource

#and2/ifrunninginthegate,use/home/jenkins/cache/files/cirrosimage.

#img_dir=>'/home/jenkins/cache/files',

3
run_tests.sh

View File

@@ -309,6 +309,9 @@ echo "test_create_and_delete_workflow" >> /tmp/openstack/tempest/test-whitelist.

# BGPVPN

echo "test_create_bgpvpn" >> /tmp/openstack/tempest/test-whitelist.txt

# L2GW

echo "test_create_show_list_update_delete_l2gateway" >> /tmp/openstack/tempest/test-whitelist.txt

if uses_debs; then

# TODO(aschultz): check this after pike-m1

# 1) fwaas tests from ubuntu are still out of date LP#1667736