From f11a8897a3e7ae859c8dda7ae6318e8676cf767e Mon Sep 17 00:00:00 2001 From: Vladimir Kuklin Date: Wed, 31 Oct 2012 13:14:21 +0400 Subject: [PATCH] change rabbit_addresses config variable name to rabbit_hosts --- deployment/puppet/openstack/manifests/nova/controller.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/puppet/openstack/manifests/nova/controller.pp b/deployment/puppet/openstack/manifests/nova/controller.pp index caa5257035..bbdba9a766 100644 --- a/deployment/puppet/openstack/manifests/nova/controller.pp +++ b/deployment/puppet/openstack/manifests/nova/controller.pp @@ -74,14 +74,14 @@ class openstack::nova::controller ( } else { $real_glance_api_servers = $glance_api_servers } - $rabbit_addresses = inline_template("<%= @rabbit_nodes.map {|x| x + ':5672'}.join ',' %>") + $rabbit_hosts = inline_template("<%= @rabbit_nodes.map {|x| x + ':5672'}.join ',' %>") if ($exported_resources) { # export all of the things that will be needed by the clients # @@nova_config { 'DEFAULT/rabbit_host': value => $internal_address } # Nova_config <| title == 'rabbit_host' |> - @@nova_config { 'DEFAULT/rabbit_addresses': value => $rabbit_addresses } - Nova_config <| title == 'rabbit_nodes' |> + @@nova_config { 'DEFAULT/rabbit_hosts': value => $rabbit_hosts } + Nova_config <| title == 'rabbit_hosts' |> @@nova_config { 'DEFAULT/sql_connection': value => $nova_db } Nova_config <| title == 'sql_connection' |>