You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@metron.apache.org by GitBox <gi...@apache.org> on 2019/01/09 21:48:15 UTC
[GitHub] asfgit closed pull request #1320: METRON-1965: Knox should work on
a multi-node installation
asfgit closed pull request #1320: METRON-1965: Knox should work on a multi-node installation
URL: https://github.com/apache/metron/pull/1320
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 e65d62e210..97083c63bd 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 @@ def configure(self, env):
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 f53812256f..5b35e64985 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 d32f86ac03..181d6b265b 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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services