openstack/puppet-openstack-integration
Code Issues Proposed changes

Move all lbaas to v2

Browse Source 
Upstream has just removed lbaasv1 from openstack-lbaas
(https://review.openstack.org/286381). A full fix will involve
removing all lbaasv1 support from puppet-neutron, but while it is
done we should only use lbaasv2 in puppet-openstack-integration
to avoid CI issues.

Change-Id: If63110644d441bb8b088c93aebc02356b158aebd
This commit is contained in:
Javier Pena 2016-08-25 10:55:11 +02:00
parent 2af4eacdcb
commit 9b8717b2bc
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -40,7 +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 |
| lbaas | v2 | v2 | v2 | v2 |
| cinder | rbd | iscsi | | iscsi |
| ceilometer | X | | | |
| aodh | X | | | |

4
fixtures/scenario001.pp
View File

@ -51,9 +51,7 @@ include ::openstack_integration::keystone
class { '::openstack_integration::glance':
backend => 'rbd',
}
class { '::openstack_integration::neutron':
lbaasv2 => true
}
include ::openstack_integration::neutron
class { '::openstack_integration::nova':
libvirt_rbd => true,
}

4
manifests/neutron.pp
View File

@ -7,11 +7,11 @@
#
# [*lbaasv2*]
# (optional) Configure lbaas v2 instead of v1
# Defaults to false
# Defaults to true
#
class openstack_integration::neutron (
$driver = 'openvswitch',
$lbaasv2 = false,
$lbaasv2 = true,
) {
include ::openstack_integration::config