AMBARI-19162. LogSearch - use fully qualified hostname instead of localhost for spnego.host (oleewere)

Change-Id: I07599997c4358213cd300bdc3c9179afa15e9acd

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml

@@ -268,7 +268,7 @@
   </property>
   <property>
     <name>logsearch.spnego.kerberos.host</name>
-    <value>localhost</value>
+    <value>_HOST</value>
     <display-name>Http Spnego hostname</display-name>
     <description>Fully-qualified host name in the Kerberos service principal name (SPN) that is used by SPNEGO</description>
     <value-attributes>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py

@@ -86,9 +86,9 @@ if 'infra-solr-env' in config['configurations']:
   infra_solr_ssl_enabled = default('configurations/infra-solr-env/infra_solr_ssl_enabled', False)
   infra_solr_jmx_port = config['configurations']['infra-solr-env']['infra_solr_jmx_port']
 
+_hostname_lowercase = config['hostname'].lower()
 if security_enabled:
   kinit_path_local = status_params.kinit_path_local
-  _hostname_lowercase = config['hostname'].lower()
   logsearch_jaas_file = logsearch_server_conf + '/logsearch_jaas.conf'
   logfeeder_jaas_file = logsearch_logfeeder_conf + '/logfeeder_jaas.conf'
   use_external_solr_with_kerberos = default('configurations/logsearch-env/logsearch_external_solr_kerberos_enabled', False)
@@ -103,6 +103,8 @@ if security_enabled:
     logfeeder_kerberos_keytab = config['configurations']['logfeeder-env']['logfeeder_kerberos_keytab']
     logfeeder_kerberos_principal = config['configurations']['logfeeder-env']['logfeeder_kerberos_principal'].replace('_HOST',_hostname_lowercase)
 
+logsearch_spnego_host = config['configurations']['logsearch-properties']['logsearch.spnego.kerberos.host'].replace('_HOST', _hostname_lowercase)
+
 #####################################
 # Logsearch configs
 #####################################
@@ -222,6 +224,7 @@ del logsearch_properties['logsearch.solr.audit.logs.use.ranger']
 
 logsearch_properties['logsearch.solr.metrics.collector.hosts'] = format(logsearch_properties['logsearch.solr.metrics.collector.hosts'])
 logsearch_properties['logsearch.auth.external_auth.host_url'] = format(logsearch_properties['logsearch.auth.external_auth.host_url'])
+logsearch_properties['logsearch.spnego.kerberos.host'] = logsearch_spnego_host
 
 if logsearch_solr_kerberos_enabled:
   logsearch_properties['logsearch.solr.kerberos.enable'] = 'true'

ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py

@@ -94,7 +94,8 @@ class TestLogSearch(RMFTestCase):
                                             'logsearch.solr.history.config.name': 'history',
                                             'logsearch.solr.metrics.collector.hosts': '',
                                             'logsearch.solr.jmx.port': '1',
-                                            'logsearch.solr.zk_connect_string': 'c6401.ambari.apache.org:2181/infra-solr'
+                                            'logsearch.solr.zk_connect_string': 'c6401.ambari.apache.org:2181/infra-solr',
+                                            'logsearch.spnego.kerberos.host': 'localhost'
                               }
     )
     self.assertResourceCalled('File', '/etc/ambari-logsearch-portal/conf/HadoopServiceConfig.json',