Merge "Use FQDNs for the services' RabbitMQ configuration"

13 files changed, 52 insertions, 52 deletions

diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp
index 281e069..6e70b50 100644
--- a/manifests/profile/base/aodh.pp
+++ b/manifests/profile/base/aodh.pp
@@ -28,8 +28,8 @@
 #   Defaults to hiera('bootstrap_nodeid')
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -38,7 +38,7 @@
 class tripleo::profile::base::aodh (
   $step           = hiera('step'),
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $rabbit_hosts   = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts   = hiera('rabbitmq_node_names', undef),
   $rabbit_port    = hiera('aodh::rabbit_port', 5672),
 ) {
 
@@ -49,7 +49,7 @@ class tripleo::profile::base::aodh (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::aodh' :
       rabbit_hosts => $rabbit_endpoints,
     }
diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp
index 392d0c7..bbe7f27 100644
--- a/manifests/profile/base/ceilometer.pp
+++ b/manifests/profile/base/ceilometer.pp
@@ -24,8 +24,8 @@
 #   Defaults to hiera('step')
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -33,12 +33,12 @@
 
 class tripleo::profile::base::ceilometer (
   $step          = hiera('step'),
-  $rabbit_hosts  = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts  = hiera('rabbitmq_node_names', undef),
   $rabbit_port   = hiera('ceilometer::rabbit_port', 5672),
 ) {
 
   if $step >= 3 {
-    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::ceilometer' :
       rabbit_hosts => $rabbit_endpoints,
     }
diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp
index 8023fcc..6a821f3 100644
--- a/manifests/profile/base/cinder.pp
+++ b/manifests/profile/base/cinder.pp
@@ -31,8 +31,8 @@
 #   Defaults to hiera('step')
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -42,7 +42,7 @@ class tripleo::profile::base::cinder (
   $bootstrap_node         = hiera('bootstrap_nodeid', undef),
   $cinder_enable_db_purge = true,
   $step                   = hiera('step'),
-  $rabbit_hosts           = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts           = hiera('rabbitmq_node_names', undef),
   $rabbit_port            = hiera('cinder::rabbit_port', 5672),
 ) {
   if $::hostname == downcase($bootstrap_node) {
@@ -52,7 +52,7 @@ class tripleo::profile::base::cinder (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::cinder' :
       rabbit_hosts => $rabbit_endpoints,
     }
diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp
index af3b0ac..5ba7a0b 100644
--- a/manifests/profile/base/glance/api.pp
+++ b/manifests/profile/base/glance/api.pp
@@ -32,8 +32,8 @@
 #   Defaults to hiera('step')
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -43,7 +43,7 @@ class tripleo::profile::base::glance::api (
   $glance_backend     = downcase(hiera('glance_backend', 'swift')),
   $glance_nfs_enabled = false,
   $step               = hiera('step'),
-  $rabbit_hosts       = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts       = hiera('rabbitmq_node_names', undef),
   $rabbit_port        = hiera('glance::notify::rabbitmq::rabbit_port', 5672),
 ) {
 
@@ -67,7 +67,7 @@ class tripleo::profile::base::glance::api (
     class { '::glance::api':
       stores => $glance_store,
     }
-    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::glance::notify::rabbitmq' :
       rabbit_hosts => $rabbit_endpoints,
     }
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index 00a9809..c743ce0 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -36,8 +36,8 @@
 #   Defaults to hiera('step')
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -48,7 +48,7 @@ class tripleo::profile::base::heat (
   $manage_db_purge     = hiera('heat_enable_db_purge', true),
   $notification_driver = 'messaging',
   $step                = hiera('step'),
-  $rabbit_hosts        = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts        = hiera('rabbitmq_node_names', undef),
   $rabbit_port         = hiera('heat::rabbit_port', 5672),
 ) {
   # Domain resources will be created at step5 on the node running keystone.pp
@@ -62,7 +62,7 @@ class tripleo::profile::base::heat (
   }
 
   if $step >= 4 {
-    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::heat' :
       notification_driver => $notification_driver,
       rabbit_hosts        => $rabbit_endpoints,
diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp
index 7b44421..5db1e1f 100644
--- a/manifests/profile/base/ironic.pp
+++ b/manifests/profile/base/ironic.pp
@@ -27,8 +27,8 @@
 #   Defaults to hiera('step')
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -37,7 +37,7 @@
 class tripleo::profile::base::ironic (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
-  $rabbit_hosts   = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts   = hiera('rabbitmq_node_names', undef),
   $rabbit_port    = hiera('ironic::rabbit_port', 5672),
 ) {
   # Database is accessed by both API and conductor, hence it's here.
@@ -48,7 +48,7 @@ class tripleo::profile::base::ironic (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::ironic':
       sync_db      => $sync_db,
       rabbit_hosts => $rabbit_endpoints,
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index ff8d790..26e7b1f 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -78,8 +78,8 @@
 #
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -102,7 +102,7 @@ class tripleo::profile::base::keystone (
   $heat_admin_user               = undef,
   $manage_db_purge               = hiera('keystone_enable_db_purge', true),
   $public_endpoint_network       = hiera('keystone_public_api_network', undef),
-  $rabbit_hosts                  = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts                  = hiera('rabbitmq_node_names', undef),
   $rabbit_port                   = hiera('keystone::rabbit_port', 5672),
   $step                          = hiera('step'),
 ) {
@@ -142,7 +142,7 @@ class tripleo::profile::base::keystone (
   }
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
-    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::keystone':
       sync_db          => $sync_db,
       enable_bootstrap => $sync_db,
diff --git a/manifests/profile/base/manila.pp b/manifests/profile/base/manila.pp
index 3e16dff..f021f64 100644
--- a/manifests/profile/base/manila.pp
+++ b/manifests/profile/base/manila.pp
@@ -27,8 +27,8 @@
 #   Defaults to hiera('step')
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -37,7 +37,7 @@
 class tripleo::profile::base::manila (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
-  $rabbit_hosts   = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts   = hiera('rabbitmq_node_names', undef),
   $rabbit_port    = hiera('manila::rabbit_port', 5672),
 ) {
   if $::hostname == downcase($bootstrap_node) {
@@ -47,7 +47,7 @@ class tripleo::profile::base::manila (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::manila' :
       rabbit_hosts => $rabbit_endpoints,
     }
diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index 3da754c..d8e1330 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -28,8 +28,8 @@
 #   Defaults to hiera('step')
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -38,7 +38,7 @@
 class tripleo::profile::base::mistral (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
-  $rabbit_hosts   = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts   = hiera('rabbitmq_node_names', undef),
   $rabbit_port    = hiera('mistral::rabbit_port', 5672),
 ) {
   if $::hostname == downcase($bootstrap_node) {
@@ -48,7 +48,7 @@ class tripleo::profile::base::mistral (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class  { '::mistral':
       rabbit_hosts => $rabbit_endpoints,
     }
diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp
index 64f5f32..e6a32db 100644
--- a/manifests/profile/base/neutron.pp
+++ b/manifests/profile/base/neutron.pp
@@ -23,8 +23,8 @@
 #   Defaults to hiera('step')
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -32,11 +32,11 @@
 
 class tripleo::profile::base::neutron (
   $step         = hiera('step'),
-  $rabbit_hosts = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts = hiera('rabbitmq_node_names', undef),
   $rabbit_port  = hiera('neutron::rabbit_port', 5672),
 ) {
   if $step >= 3 {
-    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::neutron' :
       rabbit_hosts => $rabbit_endpoints,
     }
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index 4626465..7f1c862 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -39,8 +39,8 @@
 #   Defaults to hiera('step')
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -52,7 +52,7 @@ class tripleo::profile::base::nova (
   $manage_migration     = false,
   $nova_compute_enabled = false,
   $step                 = hiera('step'),
-  $rabbit_hosts         = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts         = hiera('rabbitmq_node_names', undef),
   $rabbit_port          = hiera('nova::rabbit_port', 5672),
 ) {
   if $::hostname == downcase($bootstrap_node) {
@@ -68,7 +68,7 @@ class tripleo::profile::base::nova (
   }
 
   if hiera('step') >= 4 or (hiera('step') >= 3 and $sync_db) {
-    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::nova' :
       rabbit_hosts => $rabbit_endpoints,
     }
diff --git a/manifests/profile/base/sahara.pp b/manifests/profile/base/sahara.pp
index f509225..8db071b 100644
--- a/manifests/profile/base/sahara.pp
+++ b/manifests/profile/base/sahara.pp
@@ -27,8 +27,8 @@
 #   Defaults to hiera('step')
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -37,7 +37,7 @@
 class tripleo::profile::base::sahara (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
-  $rabbit_hosts   = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts   = hiera('rabbitmq_node_names', undef),
   $rabbit_port    = hiera('sahara::rabbit_port', 5672),
 ) {
   if $::hostname == downcase($bootstrap_node) {
@@ -47,7 +47,7 @@ class tripleo::profile::base::sahara (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db){
-    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::sahara':
       sync_db      => $sync_db,
       rabbit_hosts => $rabbit_endpoints,
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index ea309db..974a725 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -32,8 +32,8 @@
 #   Defaults to 11211
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -43,7 +43,7 @@ class tripleo::profile::base::swift::proxy (
   $step             = hiera('step'),
   $memcache_servers = hiera('memcached_node_ips'),
   $memcache_port    = 11211,
-  $rabbit_hosts     = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts     = hiera('rabbitmq_node_names', undef),
   $rabbit_port      = hiera('swift::proxy::ceilometer::rabbit_port', 5672),
 ) {
   if $step >= 4 {
@@ -63,7 +63,7 @@ class tripleo::profile::base::swift::proxy (
     include ::swift::proxy::tempurl
     include ::swift::proxy::formpost
     include ::swift::proxy::bulk
-    $swift_rabbit_hosts = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $swift_rabbit_hosts = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::swift::proxy::ceilometer':
       rabbit_hosts => $swift_rabbit_hosts,
     }