[metron] branch master updated: METRON-1965 Knox should work on a multi-node installation (merrimanr) closes apache/metron#1320

[rm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rmerriman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metron.git


The following commit(s) were added to refs/heads/master by this push:
     new 2c99257  METRON-1965 Knox should work on a multi-node installation (merrimanr) closes apache/metron#1320
2c99257 is described below

commit 2c99257c970a5e8b29157a5fe52e74769ecd3444
Author: merrimanr <me...@gmail.com>
AuthorDate: Wed Jan 9 15:47:50 2019 -0600

    METRON-1965 Knox should work on a multi-node installation (merrimanr) closes apache/metron#1320
---
 .../common-services/METRON/CURRENT/package/scripts/metron_client.py     | 2 +-
 .../common-services/METRON/CURRENT/package/scripts/metron_service.py    | 2 +-
 .../common-services/METRON/CURRENT/package/templates/metronsso.xml.j2   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_client.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_client.py
index e65d62e..97083c6 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_client.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_client.py
@@ -32,6 +32,7 @@ class MetronClient(Script):
     def install(self, env):
         from params import params
         env.set_params(params)
+        self.install_packages(env)
         self.configure(env)
 
     def configure(self, env):
@@ -45,7 +46,6 @@ class MetronClient(Script):
         if params.metron_knox_enabled:
             if not is_metron_knox_installed(params):
                 install_metron_knox(params)
-                set_metron_knox_installed(params)
             metron_knox_topology_setup(params)
 
     def start(self, env, upgrade_type=None):
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
index f538122..5b35e64 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
@@ -600,8 +600,8 @@ def install_metron_knox(params):
             unset KNOX_GROUP; \
             unset KNOX_HOME;"""
         cmd = template.format(params.knox_home, params.knox_user, params.knox_group, params.metron_home)
-
         Execute(cmd)
+        set_metron_knox_installed(params)
 
 def is_metron_knox_installed(params):
     return os.path.isfile(params.metron_knox_installed_flag_file)
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/metronsso.xml.j2 b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/metronsso.xml.j2
index d32f86a..181d6b2 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/metronsso.xml.j2
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/templates/metronsso.xml.j2
@@ -93,7 +93,7 @@
     </param>
     <param>
       <name>knoxsso.redirect.whitelist.regex</name>
-      <value>^https?:\/\/(localhost|127\.0\.0\.1|0:0:0:0:0:0:0:1|::1|{{metron_rest_host}}|{{metron_management_ui_host}}|{{metron_alerts_ui_host}}):[0-9].*$</value>
+      <value>^https?:\/\/(localhost|127\.0\.0\.1|0:0:0:0:0:0:0:1|::1|{{metron_rest_host}}|{{metron_management_ui_host}}|{{metron_alerts_ui_host}}|{{knox_host}}):[0-9].*$</value>
     </param>
   </service>