openstack
/
fuel-web
Code Issues Proposed changes

Merge pull request #1186 from Mirantis/fix-assign-and-glance 

Fix autoassign and cinder2glance
This commit is contained in:
Mike Scherbakov 2013-06-20 03:20:32 -07:00
parent c935e8e9e3 984b26cdcc
commit ec85ef081f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/osnailyfacter/manifests/cluster_ha.pp
View File

@ -208,6 +208,7 @@ class compact_controller {
rabbit_password => $rabbit_hash[password],
rabbit_user => $rabbit_user,
rabbit_ha_virtual_ip => $management_vip,
auto_assign_floating_ip => $auto_assign_floating_ip,
glance_api_servers => "${management_vip}:9292",
vncproxy_host => $public_vip,
verbose => $verbose,

3
puppet/osnailyfacter/manifests/cluster_simple.pp
View File

@ -149,6 +149,7 @@ Exec { logoutput => true }
rabbit_nodes => [$controller_node_address],
rabbit_password => $rabbit_hash[password],
rabbit_user => $rabbit_user,
auto_assign_floating_ip => $auto_assign_floating_ip,
glance_api_servers => "${controller_node_address}:9292",
vncproxy_host => $controller_node_public,
vnc_enabled => true,
@ -188,7 +189,7 @@ Exec { logoutput => true }
}
class { 'openstack::cinder':
sql_connection => "mysql://cinder:${cinder_hash[db_password]}@${controller_node_address}/cinder?charset=utf8",
glance_api_servers => "${management_vip}:9292",
glance_api_servers => "${controller_node_address}:9292",
rabbit_password => $rabbit_hash[password],
rabbit_host => false,
rabbit_nodes => [$controller_node_address],