openstack/puppet-openstack-integration
Code Issues Proposed changes

scenario001/ubuntu: enable Ceph again

Browse Source 
Yeah!

Change-Id: Ic959ee1ea5285ead7fee8d42b3aea58689abd43b
Depends-On: Ie9ba521cdb4ac6823746d37bb5d1697e274e4119
This commit is contained in:
Emilien Macchi 2016-07-07 16:12:29 -04:00
parent c7b137f45d
commit 7edd9d7bf5
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fixtures/scenario001.pp
View File

@ -34,18 +34,11 @@ case $::osfamily {
} }
# List of workarounds for Ubuntu Xenial: # List of workarounds for Ubuntu Xenial:
# - disable ceph
# - disable SSL # - disable SSL
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) { if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
$ssl_enabled = false $ssl_enabled = false
$glance_backend = 'file'
$cinder_backend = 'iscsi'
$libvirt_rbd = false
} else { } else {
$ssl_enabled = true $ssl_enabled = true
$glance_backend = 'rbd'
$cinder_backend = 'rbd'
$libvirt_rbd = true
} }
include ::openstack_integration include ::openstack_integration
@ -58,25 +51,23 @@ include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql include ::openstack_integration::mysql
include ::openstack_integration::keystone include ::openstack_integration::keystone
class { '::openstack_integration::glance': class { '::openstack_integration::glance':
backend => $glance_backend, backend => 'rbd',
} }
class { '::openstack_integration::neutron': class { '::openstack_integration::neutron':
lbaasv2 => true lbaasv2 => true
} }
class { '::openstack_integration::nova': class { '::openstack_integration::nova':
libvirt_rbd => $libvirt_rbd, libvirt_rbd => true,
} }
class { '::openstack_integration::cinder': class { '::openstack_integration::cinder':
backend => $cinder_backend, backend => 'rbd',
} }
if $ceilometer_enabled { if $ceilometer_enabled {
include ::openstack_integration::ceilometer include ::openstack_integration::ceilometer
include ::openstack_integration::aodh include ::openstack_integration::aodh
include ::openstack_integration::gnocchi include ::openstack_integration::gnocchi
} }
if $libvirt_rbd { include ::openstack_integration::ceph
include ::openstack_integration::ceph
}
include ::openstack_integration::provision include ::openstack_integration::provision
class { '::openstack_integration::tempest': class { '::openstack_integration::tempest':