openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Move all lbaas to v2"

Browse Source
This commit is contained in:
Jenkins 2016-08-25 19:26:45 +00:00 committed by Gerrit Code Review
commit 2cdb5e0282
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 | | glance | rbd | swift | file | file |
| nova | rbd | X | X | X | | nova | rbd | X | X | X |
| neutron | ovs | ovs | linuxbridge | ovs | | neutron | ovs | ovs | linuxbridge | ovs |
| lbaas | v2 | v1 | v1 | v1 | | lbaas | v2 | v2 | v2 | v2 |
| cinder | rbd | iscsi | | iscsi | | cinder | rbd | iscsi | | iscsi |
| ceilometer | X | | | | | ceilometer | X | | | |
| aodh | X | | | | | aodh | X | | | |

4
fixtures/scenario001.pp
View File

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

4
manifests/neutron.pp
View File

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