Bug 1162454 - default hostnames should use infra zone if provided

https://bugzilla.redhat.com/show_bug.cgi?id=1162454

- If no hostname is provided and dns_infrastructure_zone is configured
  the default hostnames should use dns_infrastructure_zone instead of
  domain variable

Author: detiber

manifests/init.pp

@@ -769,27 +769,49 @@
   $jenkins_repo_base                    = undef,
   $optional_repo                        = undef,
   $domain                               = 'example.com',
-  $broker_hostname                      = "broker.${domain}",
-  $node_hostname                        = "node.${domain}",
-  $nameserver_hostname                  = "ns1.${domain}",
-  $msgserver_hostname                   = "msgserver.${domain}",
-  $datastore_hostname                   = "mongodb.${domain}",
-  $datastore1_ip_addr                   = undef,
-  $datastore2_ip_addr                   = undef,
-  $datastore3_ip_addr                   = undef,
-  $nameserver_ip_addr                   = $::ipaddress,
   $bind_key                             = '',
   $bind_key_algorithm                   = 'HMAC-MD5',
   $bind_krb_keytab                      = '',
   $bind_krb_principal                   = '',
+  $dns_infrastructure_zone              = '',
+  $dns_infrastructure_key               = '',
+  $dns_infrastructure_key_algorithm     = 'HMAC-MD5',
+  $dns_infrastructure_names             = [],
+  $broker_hostname                      = $dns_infrastructure_zone ? {
+                                            ''      => "broker.${domain}",
+                                            default => "broker.${dns_infrastructure_zone}",
+                                          },
+  $node_hostname                        = $dns_infrastructure_zone ? {
+                                            ''      => "node.${domain}",
+                                            default => "node.${dns_infrastructure_zone}",
+                                          },
+  $nameserver_hostname                  = $dns_infrastructure_zone ? {
+                                            ''      => "ns1.${domain}",
+                                            default => "ns1.${dns_infrastructure_zone}",
+                                          },
+  $msgserver_hostname                   = $dns_infrastructure_zone ? {
+                                            ''      => "msgserver.${domain}",
+                                            default => "msgserver.${dns_infrastructure_zone}",
+                                          },
+  $datastore_hostname                   = $dns_infrastructure_zone ? {
+                                            ''      => "mongodb.${domain}",
+                                            default => "mongodb.${dns_infrastructure_zone}",
+                                          },
+  $datastore1_ip_addr                   = undef,
+  $datastore2_ip_addr                   = undef,
+  $datastore3_ip_addr                   = undef,
+  $nameserver_ip_addr                   = $::ipaddress,
   $aws_access_key_id                    = '',
   $aws_secret_key                       = '',
   $aws_zone_id                          = '',
   $broker_ip_addr                       = $::ipaddress,
   $broker_cluster_members               = undef,
   $broker_cluster_ip_addresses          = undef,
   $broker_virtual_ip_address            = undef,
-  $broker_virtual_hostname              = "broker.${domain}",
+  $broker_virtual_hostname              = $dns_infrastructure_zone ? {
+                                            ''      => "broker.${domain}",
+                                            default => "broker.${dns_infrastructure_zone}",
+                                          },
   $load_balancer_master                 = false,
   $load_balancer_auth_password          = 'changeme',
   $node_ip_addr                         = $::ipaddress,
@@ -883,10 +905,6 @@
   $conf_nameserver_upstream_dns         = ['8.8.8.8'],
   $install_login_shell                  = false,
   $register_host_with_nameserver        = false,
-  $dns_infrastructure_zone              = '',
-  $dns_infrastructure_key               = '',
-  $dns_infrastructure_key_algorithm     = 'HMAC-MD5',
-  $dns_infrastructure_names             = [],
   $update_network_conf_files            = true,
   $install_cartridges                   = $ose_version ? {
                                             undef => ['10gen-mms-agent','cron','diy','haproxy','mongodb','nodejs',