Add cinder config to nova::compute
embed logic for managing cinder in openstack::compute.
This commit is contained in:
@@ -46,6 +46,13 @@ class openstack::compute (
|
|||||||
# VNC
|
# VNC
|
||||||
$vnc_enabled = true,
|
$vnc_enabled = true,
|
||||||
$vncproxy_host = undef,
|
$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
|
# General
|
||||||
$verbose = 'False',
|
$verbose = 'False',
|
||||||
$enabled = true
|
$enabled = true
|
||||||
@@ -134,5 +141,17 @@ class openstack::compute (
|
|||||||
# TODO install quantum
|
# 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
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -127,6 +127,7 @@ class openstack::controller (
|
|||||||
$verbose = 'False',
|
$verbose = 'False',
|
||||||
$export_resources = true,
|
$export_resources = true,
|
||||||
# if the cinder management components should be installed
|
# if the cinder management components should be installed
|
||||||
|
$cinder = false,
|
||||||
$cinder_user_password = 'cinder_user_pass',
|
$cinder_user_password = 'cinder_user_pass',
|
||||||
$cinder_db_password = 'cinder_db_pass',
|
$cinder_db_password = 'cinder_db_pass',
|
||||||
$cinder_db_user = 'cinder',
|
$cinder_db_user = 'cinder',
|
||||||
|
Reference in New Issue
Block a user