Merge "Added changes for lbaas testing."

openstack/puppet-openstack-integration

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2016年06月23日 20:19:45 +00:00

committed by Gerrit Code Review

parent 04e82b16cf 10543a2aef

commit 1b08dcb8f3

3 changed files with 23 additions and 2 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

@@ -40,6 +40,7 @@ scenario](#All-In-One).

| glance | rbd | swift | file | file |

| nova | rbd | X | X | X |

| neutron | ovs | ovs | linuxbridge | ovs |

| lbaas | v2 | v1 | v1 | v1 |

| cinder | rbd | iscsi | | iscsi |

| ceilometer | X | | | |

| aodh | X | | | |

4
fixtures/scenario001.pp

View File

@@ -56,7 +56,9 @@ include ::openstack_integration::keystone

class{ '::openstack_integration::glance':

backend => $glance_backend,

}

include::openstack_integration::neutron

class{ '::openstack_integration::neutron':

lbaasv2 => true

}

class{ '::openstack_integration::nova':

libvirt_rbd => $libvirt_rbd,

}

20
manifests/neutron.pp

View File

@@ -5,8 +5,13 @@

#Canbe:openvswitchorlinuxbridge.

#Defaultsto'ml2_ovs'.

#

#[*lbaasv2*]

#(optional)Configurelbaasv2insteadofv1

#Defaultstofalse

#

classopenstack_integration::neutron(

$driver='openvswitch',

$driver ='openvswitch',

$lbaasv2=false,

){

include ::openstack_integration::config

@@ -124,7 +129,10 @@ class openstack_integration::neutron (

rpc_workers => 2,

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

auth_url => $::openstack_integration::config::keystone_admin_uri,

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

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

}

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

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

type_drivers => ['vxlan', 'flat'],

tenant_network_types => ['vxlan', 'flat'],

@@ -136,9 +144,19 @@ class openstack_integration::neutron (

shared_secret => 'a_big_secret',

metadata_workers => 2,

}

if$lbaasv2{

$lbaasv1 = false

$device_driver = 'neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver'

}else{

$lbaasv1 = true

$device_driver = 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver'

}

class{ '::neutron::agents::lbaas':

interface_driver => $driver,

enable_v1 => $lbaasv1,

enable_v2 => $lbaasv2,

debug => true,

device_driver => $device_driver

}

class{ '::neutron::agents::l3':

interface_driver => $driver,