stackforge/puppet-openstack_dev_env
Code Issues Proposed changes

set multi_host when network is nova

Browse Source
This commit is contained in:
Dan Bode
2012-10-30 00:47:19 -07:00
parent 5e3cf3257e
commit 3f33680f90
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/site.pp
View File

@@ -45,6 +45,7 @@ $network_type = 'quantum'
#$network_type = 'nova' #$network_type = 'nova'
if $network_type == 'nova' { if $network_type == 'nova' {
$use_quantum = false $use_quantum = false
$multi_host = true
} else { } else {
$use_quamtum = true $use_quamtum = true
} }
@@ -55,6 +56,7 @@ $floating_network_range = '172.16.0.128/25'
$auto_assign_floating_ip = false $auto_assign_floating_ip = false
#### end shared variables ################# #### end shared variables #################
#### controller/compute mode settings #### #### controller/compute mode settings ####
$openstack_controller = '172.16.0.3' $openstack_controller = '172.16.0.3'
#### controller/compute mode settings #### #### controller/compute mode settings ####
@@ -108,7 +110,7 @@ node /openstack-controller/ {
fixed_range => $fixed_network_range, fixed_range => $fixed_network_range,
floating_range => $floating_network_range, floating_range => $floating_network_range,
create_networks => true, create_networks => true,
multi_host => true, multi_host => $multi_host,
db_host => '127.0.0.1', db_host => '127.0.0.1',
db_type => 'mysql', db_type => 'mysql',
mysql_account_security => true, mysql_account_security => true,
@@ -182,7 +184,7 @@ node /compute/ {
sql_connection => "mysql://nova:${nova_db_password}@${openstack_controller}/nova", sql_connection => "mysql://nova:${nova_db_password}@${openstack_controller}/nova",
cinder_sql_connection => "mysql://cinder:${cinder_db_password}@${openstack_controller}/cinder", cinder_sql_connection => "mysql://cinder:${cinder_db_password}@${openstack_controller}/cinder",
quantum_sql_connection => "mysql://quantum:${quantum_db_password}@${openstack_controller}/quantum?charset=utf8", quantum_sql_connection => "mysql://quantum:${quantum_db_password}@${openstack_controller}/quantum?charset=utf8",
multi_host => true, multi_host => $multi_host,
nova_user_password => $nova_user_password, nova_user_password => $nova_user_password,
quantum_user_password => $quantum_user_password, quantum_user_password => $quantum_user_password,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,