You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/11/11 07:47:48 UTC
[1/2] incubator-slider git commit: SLIDER-634. slider wrapper should
look for and use python version greater than or equal to 2.6 (Yu Liu via
smohanty)
Repository: incubator-slider
Updated Branches:
refs/heads/releases/slider-0.60 5591b7209 -> 71a8559da
SLIDER-634. slider wrapper should look for and use python version greater than or equal to 2.6 (Yu Liu via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a26840e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a26840e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a26840e3
Branch: refs/heads/releases/slider-0.60
Commit: a26840e3e73f12e40a8d6c468b60932f654c160d
Parents: 5591b72
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Nov 10 19:47:53 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Nov 10 22:47:10 2014 -0800
----------------------------------------------------------------------
slider-assembly/src/main/scripts/slider | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a26840e3/slider-assembly/src/main/scripts/slider
----------------------------------------------------------------------
diff --git a/slider-assembly/src/main/scripts/slider b/slider-assembly/src/main/scripts/slider
index 9646694..97dabaf 100755
--- a/slider-assembly/src/main/scripts/slider
+++ b/slider-assembly/src/main/scripts/slider
@@ -23,11 +23,21 @@ import os
import sys
import subprocess
-ON_POSIX = 'posix' in sys.builtin_module_names
+pyExecPath = None
+
+if os.path.isfile('/usr/bin/python2.7') and (pyExecPath is None):
+ pyExecPath = '/usr/bin/python2.7'
+if os.path.isfile('/usr/bin/python2.6') and (pyExecPath is None):
+ pyExecPath = '/usr/bin/python2.6'
+if os.path.isfile('/usr/bin/python') and (pyExecPath is None):
+ pyExecPath = '/usr/bin/python'
+if pyExecPath is None:
+ pyExecPath = 'python'
+ON_POSIX = 'posix' in sys.builtin_module_names
currDir = os.path.dirname(os.path.realpath(__file__))
args = sys.argv[1:]
-cmd = [currDir + "/slider.py"]
+cmd = [pyExecPath + " " + currDir + "/slider.py"]
cmd.extend(args)
finalCmd = " ".join(cmd)
[2/2] incubator-slider git commit: Storm secured config defaults for
principal names
Posted by sm...@apache.org.
Storm secured config defaults for principal names
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/71a8559d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/71a8559d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/71a8559d
Branch: refs/heads/releases/slider-0.60
Commit: 71a8559da2e80b9581ca938e5433d9313c60e8c8
Parents: a26840e
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Nov 10 22:34:28 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Nov 10 22:47:23 2014 -0800
----------------------------------------------------------------------
app-packages/storm/appConfig-secured-default.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/71a8559d/app-packages/storm/appConfig-secured-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/appConfig-secured-default.json b/app-packages/storm/appConfig-secured-default.json
index f0eae5c..21d32e5 100644
--- a/app-packages/storm/appConfig-secured-default.json
+++ b/app-packages/storm/appConfig-secured-default.json
@@ -39,10 +39,10 @@
"site.storm-site.storm.thrift.transport": "backtype.storm.security.auth.kerberos.KerberosSaslTransportPlugin",
"site.storm-site.java.security.auth.login.config": "${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/conf/storm_jaas.conf",
"site.storm-site.storm.principal.tolocal": "backtype.storm.security.auth.KerberosPrincipalToLocal",
- "site.storm-site.storm.zookeeper.superACL": "PLACE_JAAS_CLIENT_PRINCIPAL_HERE",
- "site.storm-site.nimbus.admins": "['${USER_NAME}', 'PLACE_JAAS_STORMCLIENT_PRINCIPAL_HERE']",
+ "site.storm-site.storm.zookeeper.superACL": "sasl:${USER_NAME}@EXAMPLE.COM",
+ "site.storm-site.nimbus.admins": "['${USER_NAME}']",
"site.storm-site.nimbus.users": "['${USER_NAME}']",
- "site.storm-site.nimbus.supervisor.users": "['PLACE_JAAS_STORMCLIENT_PRINCIPAL_HERE']",
+ "site.storm-site.nimbus.supervisor.users": "['${USER_NAME}']",
"site.storm-site.nimubs.authorizer": "backtype.storm.security.auth.authorizer.SimpleACLAuthorizer",
"site.storm-site.storm.thrift.transport": "backtype.storm.security.auth.kerberos.KerberosSaslTransportPlugin",
"site.storm-site.storm.principal.tolocal": "backtype.storm.security.auth.KerberosPrincipalToLocal",
@@ -50,8 +50,8 @@
"site.storm-site.ui.filter.params": "{'type': 'kerberos', 'kerberos.principal': 'HTTP/_HOST', 'kerberos.keytab': '/etc/security/keytabs/spnego.service.keytab', 'kerberos.name.rules': 'RULE:[2:$1@$0]([jt]t@.*EXAMPLE.COM)s/.*/$MAPRED_USER/ RULE:[2:$1@$0]([nd]n@.*EXAMPLE.COM)s/.*/$HDFS_USER/DEFAULT'}",
"site.storm-env.kerberos_domain": "EXAMPLE.COM",
- "site.storm-env.storm_client_principal_name": "PLACE_JAAS_STORMCLIENT_PRINCIPAL_HERE",
- "site.storm-env.storm_server_principal_name": "PLACE_JAAS_STORMSERVER_PRINCIPAL_HERE/_HOST",
+ "site.storm-env.storm_client_principal_name": "${USER_NAME}@EXAMPLE.COM",
+ "site.storm-env.storm_server_principal_name": "${USER_NAME}/_HOST@EXAMPLE.COM",
"site.storm-env.storm_client_keytab": "${AGENT_WORK_ROOT}/keytabs/${USER_NAME}.STORM.client.keytab",
"site.storm-env.storm_server_keytab": "${AGENT_WORK_ROOT}/keytabs/${USER_NAME}.STORM.nimbus.keytab"