AMBARI-2198. Avoid using $::fqdn in puppet which uses the fqdn value from puppet/facter, instead pass in the hostname from python socket.getfqdn().. (smohanty)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1487667 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -904,6 +904,10 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2198. Avoid using $::fqdn in puppet which uses the fqdn value from
+ puppet/facter, instead pass in the hostname from
+ python socket.getfqdn(). (smohanty)
+
  AMBARI-2223. Using an external MySQL / Oracle database for Oozie does not 
  work. (swagle)
 

ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/bigtop/init.pp

@@ -161,7 +161,7 @@ class kerberos {
 
     realize(File[$kerberos::site::keytab_export_dir])
 
-    $principal = "$title/$::fqdn"
+    $principal = "$title/$hdp::params::hostname"
     $keytab    = "$kerberos::site::keytab_export_dir/$title.keytab"
 
     exec { "addprinc.$title":

ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/params.pp

@@ -24,7 +24,7 @@ class hdp-kerberos::params(
 {
   $domain  = 'hadoop.com'
   $realm = inline_template('<%= @domain.upcase %>')
-  $kdc_server = $::fqdn
+  $kdc_server = $hdp::params::hostname
   $kdc_port = 88
   $keytab_export_base_dir = '/etc/security/'
   $keytab_export_dir = "${keytab_export_base_dir}/keytabs"

ambari-agent/src/main/puppet/modules/hdp/manifests/download_keytabs.pp

@@ -27,7 +27,7 @@ define hdp::download_keytab(
   $hostnameInPrincipals = 'yes'
 )
 {
-  $hostname = $::fqdn
+  $hostname = $hdp::params::hostname
   if ($hostnameInPrincipals == 'yes') {
     $keytabsrc = "puppet://${masterhost}/modules/keytabs/${hostname}.${keytabfile}"
   } else {

ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp

@@ -696,9 +696,9 @@ class hdp::params()
   $component_exists = {} 
   $service_exists = {}
 
-  $is_namenode_master = $::fqdn in $namenode_host
-  $is_jtnode_master   = $::fqdn in $jtnode_host
-  $is_rmnode_master   = $::fqdn in $rm_host
-  $is_hsnode_master   = $::fqdn in $hs_host
-  $is_hbase_master    = $::fqdn in $hbase_master_hosts
+  $is_namenode_master = $hdp::params::hostname in $namenode_host
+  $is_jtnode_master   = $hdp::params::hostname in $jtnode_host
+  $is_rmnode_master   = $hdp::params::hostname in $rm_host
+  $is_hsnode_master   = $hdp::params::hostname in $hs_host
+  $is_hbase_master    = $hdp::params::hostname in $hbase_master_hosts
 }

ambari-agent/src/main/python/ambari_agent/manifestGenerator.py

@@ -82,7 +82,10 @@ def generateManifest(parsedJson, fileName, modulesdir, ambariconfig):
     
   #writing imports from external static file
   writeImports(outputFile=manifest, modulesdir=modulesdir, importsList=AmbariConfig.imports)
-  
+
+  #writing hostname
+  writeHostnames(manifest)
+
   #writing nodes
   writeNodes(manifest, clusterHostInfo)
   
@@ -114,6 +117,12 @@ def generateManifest(parsedJson, fileName, modulesdir, ambariconfig):
   manifest.close()
     
 
+def writeHostnames(outputFile):
+  fqdn = hostname.hostname()
+  public_fqdn = hostname.public_hostname()
+  outputFile.write('$myhostname' + " = '" + fqdn + "'" + os.linesep)
+  outputFile.write('$public_hostname' + " = '" + public_fqdn + "'" + os.linesep)
+
   #write nodes
 def writeNodes(outputFile, clusterHostInfo):
   if clusterHostInfo.has_key('zookeeper_hosts'):
@@ -167,16 +176,12 @@ def writeHostAttributes(outputFile, hostAttributes):
 #write flat configurations
 def writeFlatConfigurations(outputFile, flatConfigs):
   flatDict = {}
-  fqdn = hostname.hostname()
-  public_fqdn = hostname.public_hostname()
   logger.debug("Generating global configurations =>\n" + pprint.pformat(flatConfigs))
   for flatConfigName in flatConfigs.iterkeys():
     for flatConfig in flatConfigs[flatConfigName].iterkeys():
       flatDict[flatConfig] = flatConfigs[flatConfigName][flatConfig]
   for gconfigKey in flatDict.iterkeys():
     outputFile.write('$' + gconfigKey + " = '" + flatDict[gconfigKey] + "'" + os.linesep)
-  outputFile.write('$myhostname' + " = '" + fqdn + "'" + os.linesep)
-  outputFile.write('$public_hostname' + " = '" + public_fqdn + "'" + os.linesep)
 
 #write xml configurations
 def writeNonGlobalConfigurations(outputFile, xmlConfigs):