stackforge/kickstack
Code Issues Proposed changes

Correctly set AMQP credentials for Nova services

Browse Source
This commit is contained in:
Florian Haas 2013-07-14 09:40:33 +00:00
parent a0cfc843f8
commit 8f3a3ecd8a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/nova/config.pp
View File

@ -4,12 +4,13 @@ class kickstack::nova::config inherits kickstack {
case "$::kickstack::rpc" { case "$::kickstack::rpc" {
'rabbitmq': { 'rabbitmq': {
$rabbit_host = getvar("${::kickstack::fact_prefix}rabbit_host")
$rabbit_password = getvar("${fact_prefix}rabbit_password") $rabbit_password = getvar("${fact_prefix}rabbit_password")
class { '::nova': class { '::nova':
ensure_package => 'latest', ensure_package => 'latest',
sql_connection => $sql_conn, sql_connection => $sql_conn,
rpc_backend => 'nova.openstack.common.rpc.impl_kombu', rpc_backend => 'nova.openstack.common.rpc.impl_kombu',
rabbit_host => $::kickstack::rabbit_host, rabbit_host => $rabbit_host,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
rabbit_virtual_host => $::kickstack::rabbit_virtual_host, rabbit_virtual_host => $::kickstack::rabbit_virtual_host,
rabbit_userid => $::kickstack::rabbit_userid, rabbit_userid => $::kickstack::rabbit_userid,
@ -20,12 +21,13 @@ class kickstack::nova::config inherits kickstack {
} }
} }
'qpid': { 'qpid': {
$qpid_hostname = getvar("${::kickstack::fact_prefix}qpid_hostname")
$qpid_password = getvar("${fact_prefix}qpid_password") $qpid_password = getvar("${fact_prefix}qpid_password")
class { '::nova': class { '::nova':
ensure_package => 'latest', ensure_package => 'latest',
sql_connection => $sql_conn, sql_connection => $sql_conn,
rpc_backend => 'nova.openstack.common.rpc.impl_qpid', rpc_backend => 'nova.openstack.common.rpc.impl_qpid',
qpid_hostname => $::kickstack::qpid_hostname, qpid_hostname => $qpid_hostname,
qpid_password => $qpid_password, qpid_password => $qpid_password,
qpid_realm => $::kickstack::qpid_realm, qpid_realm => $::kickstack::qpid_realm,
qpid_user => $::kickstack::qpid_user, qpid_user => $::kickstack::qpid_user,