stackforge/puppet-openstack_dev_env
Code Issues Proposed changes

update site manifest based on cinder changes

Browse Source 
Add valid mysql connection, remove explicit cinder reference.
This commit is contained in:
Dan Bode
2012-10-25 16:14:19 -07:00
parent 711066d437
commit 84c6a7a229
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
manifests/site.pp
View File

@@ -308,25 +308,18 @@ node /compute/ {
# $glance_api_addr = unique(query_nodes('Class[glance::api]', 'ipaddress_eth1')) # $glance_api_addr = unique(query_nodes('Class[glance::api]', 'ipaddress_eth1'))
class { 'openstack::compute': class { 'openstack::compute':
internal_address => $::ipaddress_eth1, internal_address => $::ipaddress_eth1,
libvirt_type => $libvirt_type, libvirt_type => $libvirt_type,
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",
#multi_host => true, #multi_host => true,
nova_user_password => $nova_user_password, nova_user_password => $nova_user_password,
rabbit_host => $openstack_controller, rabbit_host => $openstack_controller,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
glance_api_servers => ["${openstack_controller}:9292"], glance_api_servers => ["${openstack_controller}:9292"],
vncproxy_host => $openstack_controller, vncproxy_host => $openstack_controller,
vnc_enabled => true, vnc_enabled => true,
verbose => $verbose, verbose => $verbose,
}
class { 'openstack::cinder':
sql_connection => "mysql://cinder:${cinder_db_password}@${openstack_controller}/cinder",
rabbit_host => $openstack_controller,
# TODO where is rabbit host?
rabbit_password => $rabbit_password,
volume_group => 'precise64',
} }
# manual steps # manual steps