stackforge/puppet-openstack
Code Issues Proposed changes

Fix params missing in openstack::controller

Browse Source 
The openstack::cinder::controller in openstack::controller misses
three params which is needed to run:
  * keystone_host
  * rabbit_host
  * cinder_bind_address

Fixes bug 1184478

Change-Id: Ia631b2baf54a56bfd2f06d5d54fa978b422d7b28
This commit is contained in:
newptone
2013-05-27 11:35:41 +08:00
committed by Mathieu Gagné
parent aed432f502
commit 8be286c6e6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/controller.pp
View File

@@ -144,6 +144,7 @@ class openstack::controller (
$auto_assign_floating_ip = false, $auto_assign_floating_ip = false,
$network_config = {}, $network_config = {},
# Rabbit # Rabbit
$rabbit_host = '127.0.0.1',
$rabbit_user = 'openstack', $rabbit_user = 'openstack',
$rabbit_virtual_host = '/', $rabbit_virtual_host = '/',
# Horizon # Horizon
@@ -161,6 +162,7 @@ class openstack::controller (
$cinder = true, $cinder = true,
$cinder_db_user = 'cinder', $cinder_db_user = 'cinder',
$cinder_db_dbname = 'cinder', $cinder_db_dbname = 'cinder',
$cinder_bind_address = '0.0.0.0',
# Quantum # Quantum
$quantum = true, $quantum = true,
$bridge_interface = undef, $bridge_interface = undef,
@@ -272,7 +274,7 @@ class openstack::controller (
verbose => $verbose, verbose => $verbose,
db_type => $db_type, db_type => $db_type,
db_host => $db_host, db_host => $db_host,
keystone_host => '127.0.0.1', keystone_host => $keystone_host,
db_user => $glance_db_user, db_user => $glance_db_user,
db_name => $glance_db_dbname, db_name => $glance_db_dbname,
db_password => $glance_db_password, db_password => $glance_db_password,
@@ -398,7 +400,7 @@ class openstack::controller (
} }
class { 'openstack::cinder::controller': class { 'openstack::cinder::controller':
bind_host => $bind_host, bind_host => $cinder_bind_address,
keystone_auth_host => $keystone_host, keystone_auth_host => $keystone_host,
keystone_password => $cinder_user_password, keystone_password => $cinder_user_password,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,