stackforge/puppet-openstack
Code Issues Proposed changes

Add cinder config to nova::compute

Browse Source 
embed logic for managing cinder in openstack::compute.
This commit is contained in:
Joe Topjian
2012-10-24 11:13:27 -07:00
committed by Dan Bode
parent 69e48a2ed2
commit 867b783b8a
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/compute.pp
View File

@@ -46,6 +46,13 @@ class openstack::compute (
# VNC
$vnc_enabled = true,
$vncproxy_host = undef,
$vncserver_listen = $internal_address,
# cinder / volumes
$cinder = true,
$cinder_sql_connection = undef,
$manage_volumes = true,
$nova_volume = 'cinder-volumes',
$iscsi_ip_address = '127.0.0.1',
# General
$verbose = 'False',
$enabled = true
@@ -134,5 +141,17 @@ class openstack::compute (
# TODO install quantum
}
if ($cinder) {
class { 'cinder':
rabbit_password => $rabbit_password,
rabbit_host => $rabbit_host,
sql_connection => $cinder_sql_connection,
verbose => $verbose,
}
class { 'cinder::volume': }
class { 'cinder::volume::iscsi': }
} else {
# Set up nova-volume
}
}

1
manifests/controller.pp
View File

@@ -127,6 +127,7 @@ class openstack::controller (
$verbose = 'False',
$export_resources = true,
# if the cinder management components should be installed
$cinder = false,
$cinder_user_password = 'cinder_user_pass',
$cinder_db_password = 'cinder_db_pass',
$cinder_db_user = 'cinder',