Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Global update to python version and executable name (linux)

  • Loading branch information...
commit 5acd732fb32c923880dc4bcb4f6b4ff6a4b455c1 1 parent b0df924
@pdmack pdmack authored
Showing with 91 additions and 84 deletions.
  1. +6 −7 ambari-agent/conf/unix/ambari-agent
  2. +12 −7 ambari-agent/pom.xml
  3. +1 −1  ambari-agent/src/main/puppet/modules/hdp-yarn/files/validateYarnComponentStatus.py
  4. +1 −1  ambari-agent/src/main/python/ambari_agent/AmbariAgent.py
  5. +1 −1  ambari-agent/src/main/python/ambari_agent/Facter.py
  6. +1 −1  ambari-agent/src/main/python/resource_management/libraries/script/hook.py
  7. +3 −3 ambari-client/pom.xml
  8. +2 −2 ambari-server/conf/unix/ambari.properties
  9. +22 −20 ambari-server/pom.xml
  10. +2 −2 ambari-server/sbin/ambari-server
  11. +2 −2 ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
  12. +1 −1  ambari-server/src/main/python/bootstrap.py
  13. +1 −1  ambari-server/src/main/resources/stacks/HDP/1.3._/hooks/before-START.py
  14. +1 −1  ambari-server/src/main/resources/stacks/HDP/1.3._/hooks/before-START/scripts/hook.py
  15. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/hooks/before-START/scripts/hook.py
  16. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/PIG/package/scripts/params.py
  17. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/PIG/package/scripts/pig.py
  18. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/PIG/package/scripts/pig_client.py
  19. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/PIG/package/scripts/service_check.py
  20. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/WEBHCAT/package/scripts/__init__.py
  21. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/WEBHCAT/package/scripts/params.py
  22. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/WEBHCAT/package/scripts/service_check.py
  23. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/WEBHCAT/package/scripts/webhcat.py
  24. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/WEBHCAT/package/scripts/webhcat_server.py
  25. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/WEBHCAT/package/scripts/webhcat_service.py
  26. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/__init__.py
  27. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/historyserver.py
  28. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/mapred_service_check.py
  29. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/mapreduce2_client.py
  30. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/nodemanager.py
  31. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/params.py
  32. +2 −2 ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/resourcemanager.py
  33. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/service.py
  34. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/service_check.py
  35. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/yarn.py
  36. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/yarn_client.py
  37. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/__init__.py
  38. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/params.py
  39. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/service_check.py
  40. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/zookeeper.py
  41. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/zookeeper_client.py
  42. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/zookeeper_server.py
  43. +1 −1  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/zookeeper_service.py
  44. +1 −1  ambari-web/app/messages.js
  45. +2 −1  ambari-web/pom.xml
  46. +2 −2 contrib/ambari-scom/ambari-scom-server/src/test/resources/ambari.properties
View
13 ambari-agent/conf/unix/ambari-agent
@@ -37,20 +37,19 @@ export PATH=/usr/lib/ambari-server/*:$PATH
export AMBARI_CONF_DIR=/etc/ambari-server/conf:$PATH
# Because Ambari rpm unpacks modules here on all systems
-export PYTHONPATH=/usr/lib/python2.6/site-packages:$PYTHONPATH
+export PYTHONPATH=/usr/lib/python2.7/site-packages:$PYTHONPATH
AMBARI_AGENT=ambari-agent
PIDFILE=/var/run/ambari-agent/$AMBARI_AGENT.pid
OUTFILE=/var/log/ambari-agent/ambari-agent.out
LOGFILE=/var/log/ambari-agent/ambari-agent.log
-AGENT_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/main.py
-AMBARI_AGENT_PY_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/AmbariAgent.py
+AGENT_SCRIPT=/usr/sbin/ambari-agent.py
OK=1
NOTOK=0
-if [ -a /usr/bin/python2.6 ]; then
- PYTHON=/usr/bin/python2.6
+if [ -a /usr/bin/python ]; then
+ PYTHON=/usr/bin/python
fi
if [ "x$PYTHON" == "x" ]; then
@@ -128,7 +127,7 @@ case "$1" in
fi
fi
echo "Starting ambari-agent"
- nohup $PYTHON $AMBARI_AGENT_PY_SCRIPT "$@" > $OUTFILE 2>&1 &
+ nohup $AGENT_SCRIPT "$@" > $OUTFILE 2>&1 &
sleep 2
PID=$!
echo "Verifying $AMBARI_AGENT process status..."
@@ -189,7 +188,7 @@ case "$1" in
tput sgr0
else
echo "Stopping $AMBARI_AGENT"
- $PYTHON $AGENT_SCRIPT stop
+ $AGENT_SCRIPT stop
fi
echo "Removing PID file at $PIDFILE"
rm -f $PIDFILE
View
19 ambari-agent/pom.xml
@@ -31,6 +31,9 @@
<description>Ambari Agent</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <python.ver>2.6</python.ver>
+ <python.exec>python</python.exec>
+ <python.requires>python &gt;= ${python.ver}</python.requires>
<final.name>${project.artifactId}-${project.version}</final.name>
<package.release>1</package.release>
<package.prefix>/usr</package.prefix>
@@ -39,12 +42,11 @@
<skipTests>false</skipTests>
<facter.tar>http://downloads.puppetlabs.com/facter/facter-1.6.10.tar.gz</facter.tar>
<puppet.tar>http://downloads.puppetlabs.com/puppet/puppet-2.7.9.tar.gz</puppet.tar>
- <agent.install.dir>/usr/lib/python2.6/site-packages/ambari_agent</agent.install.dir>
- <resmgmt.install.dir>/usr/lib/python2.6/site-packages/resource_management</resmgmt.install.dir>
- <jinja.install.dir>/usr/lib64/python2.6/site-packages/jinja2</jinja.install.dir>
+ <agent.install.dir>/usr/lib/python${python.ver}/site-packages/ambari_agent</agent.install.dir>
+ <resmgmt.install.dir>/usr/lib/python${python.ver}/site-packages/resource_management</resmgmt.install.dir>
+ <jinja.install.dir>/usr/lib64/python${python.ver}/site-packages/jinja2</jinja.install.dir>
<ruby.tar>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6/ruby-1.8.7-p370.tar.gz</ruby.tar>
<lib.dir>/usr/lib/ambari-agent/lib</lib.dir>
- <python.ver>python &gt;= 2.6</python.ver>
</properties>
<profiles>
<profile>
@@ -118,7 +120,7 @@
<executions>
<execution>
<configuration>
- <executable>python2.6</executable>
+ <executable>${python.exec}</executable>
<workingDirectory>src/test/python</workingDirectory>
<arguments>
<argument>unitTests.py</argument>
@@ -136,7 +138,7 @@
</execution>
<execution>
<configuration>
- <executable>python2.6</executable>
+ <executable>${python.exec}</executable>
<workingDirectory>target/ambari-agent-${project.version}</workingDirectory>
<arguments>
<argument>${project.basedir}/src/main/python/setup.py</argument>
@@ -175,7 +177,7 @@
<requires>
<require>openssl</require>
<require>zlib</require>
- <require>${python.ver}</require>
+ <require>${python.requires}</require>
</requires>
<postinstallScriptlet>
<scriptFile>src/main/package/rpm/postinstall.sh</scriptFile>
@@ -275,6 +277,9 @@
<location>conf/unix/ambari-agent</location>
<filter>true</filter>
</source>
+ <source>
+ <location>src/main/python/ambari-agent.py</location>
+ </source>
</sources>
</mapping>
<mapping>
View
2  ambari-agent/src/main/puppet/modules/hdp-yarn/files/validateYarnComponentStatus.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
'''
Licensed to the Apache Software Foundation (ASF) under one
View
2  ambari-agent/src/main/python/ambari_agent/AmbariAgent.py
@@ -23,7 +23,7 @@
import subprocess
from Controller import AGENT_AUTO_RESTART_EXIT_CODE
-AGENT_SCRIPT = "/usr/lib/python2.6/site-packages/ambari_agent/main.py"
+AGENT_SCRIPT = "/usr/lib/python2.7/site-packages/ambari_agent/main.py"
AGENT_PID_FILE = "/var/run/ambari-agent/ambari-agent.pid"
# AGENT_AUTO_RESTART_EXIT_CODE = 77 is exit code which we return when restart_agent() is called
status = AGENT_AUTO_RESTART_EXIT_CODE
View
2  ambari-agent/src/main/python/ambari_agent/Facter.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
'''
Licensed to the Apache Software Foundation (ASF) under one
View
2  ambari-agent/src/main/python/resource_management/libraries/script/hook.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
'''
Licensed to the Apache Software Foundation (ASF) under one
View
6 ambari-client/pom.xml
@@ -37,7 +37,7 @@
<package.log.dir>/var/log/ambari-client</package.log.dir>
<package.pid.dir>/var/run/ambari-client</package.pid.dir>
<skipTests>false</skipTests>
- <install.dir>/usr/lib/python2.6/site-packages/ambari_client</install.dir>
+ <install.dir>/usr/lib/python2.7/site-packages/ambari_client</install.dir>
<lib.dir>/usr/lib/ambari-client/lib</lib.dir>
<python.ver>python &gt;= 2.6</python.ver>
</properties>
@@ -72,7 +72,7 @@
<executions>
<execution>
<configuration>
- <executable>python2.6</executable>
+ <executable>python</executable>
<workingDirectory>src/test/python</workingDirectory>
<arguments>
<argument>unitTests.py</argument>
@@ -90,7 +90,7 @@
</execution>
<execution>
<configuration>
- <executable>python2.6</executable>
+ <executable>python</executable>
<workingDirectory>target/ambari-client-${project.version}</workingDirectory>
<arguments>
<argument>${project.basedir}/src/main/python/setup.py</argument>
View
4 ambari-server/conf/unix/ambari.properties
@@ -24,8 +24,8 @@ metadata.path=/var/lib/ambari-server/resources/stacks
server.version.file=/var/lib/ambari-server/resources/version
webapp.dir=/usr/lib/ambari-server/web
bootstrap.dir=/var/run/ambari-server/bootstrap
-bootstrap.script=/usr/lib/python2.6/site-packages/ambari_server/bootstrap.py
-bootstrap.setup_agent.script=/usr/lib/python2.6/site-packages/ambari_server/setupAgent.py
+bootstrap.script=/usr/libexec/ambari-server/bootstrap.py
+bootstrap.setup_agent.script=/usr/libexec/ambari-server/setupAgent.py
api.authenticate=true
server.connection.max.idle.millis=900000
server.fqdn.service.url=http://169.254.169.254/latest/meta-data/public-hostname
View
42 ambari-server/pom.xml
@@ -24,7 +24,9 @@
<description>Ambari Server</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <python.ver>python &gt;= 2.6</python.ver>
+ <python.ver>2.6</python.ver>
+ <python.exec>python</python.exec>
+ <python.requires>python &gt;= ${python.ver}</python.requires>
<hdpUrlForCentos6>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</hdpUrlForCentos6>
<ambari-web-dir>${basedir}/../ambari-web/public</ambari-web-dir>
</properties>
@@ -180,7 +182,7 @@
<requires>
<require>postgresql-server &gt;= 8.1</require>
<require>openssl</require>
- <require>${python.ver}</require>
+ <require>${python.requires}</require>
</requires>
<postinstallScriptlet>
<scriptFile>src/main/package/rpm/postinstall.sh</scriptFile>
@@ -274,6 +276,23 @@
</sources>
</mapping>
<mapping>
+ <directory>/usr/libexec/ambari-server</directory>
+ <filemode>755</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>src/main/python/bootstrap.py</location>
+ </source>
+ <source>
+ <location>src/main/python/setupAgent.py</location>
+ </source>
+ <source>
+ <location>src/main/python/os_type_check.sh</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
<directory>/var/lib/ambari-server/keys/db</directory>
<filemode>700</filemode>
<username>root</username>
@@ -384,23 +403,6 @@
</sources>
</mapping>
<mapping>
- <directory>/usr/lib/python2.6/site-packages/ambari_server</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>src/main/python/bootstrap.py</location>
- </source>
- <source>
- <location>src/main/python/setupAgent.py</location>
- </source>
- <source>
- <location>src/main/python/os_type_check.sh</location>
- </source>
- </sources>
- </mapping>
- <mapping>
<directory>/var/run/ambari-server</directory>
</mapping>
<mapping>
@@ -438,7 +440,7 @@
<executions>
<execution>
<configuration>
- <executable>python2.6</executable>
+ <executable>${python.exec}</executable>
<workingDirectory>src/test/python</workingDirectory>
<arguments>
<argument>unitTests.py</argument>
View
4 ambari-server/sbin/ambari-server
@@ -38,8 +38,8 @@ esac
export PATH=/usr/lib/ambari-server/*:$PATH
export AMBARI_CONF_DIR=/etc/ambari-server/conf:$PATH
-if [ -a /usr/bin/python2.6 ]; then
- PYTHON=/usr/bin/python2.6
+if [ -a /usr/bin/python ]; then
+ PYTHON=/usr/bin/python
fi
if [ -a /var/lib/ambari-server/ambari-env.sh ]; then
View
4 ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -52,7 +52,7 @@
public static final String BOOTSTRAP_DIR_DEFAULT = "/var/run/ambari-server/bootstrap";
public static final String WEBAPP_DIR = "webapp.dir";
public static final String BOOTSTRAP_SCRIPT = "bootstrap.script";
- public static final String BOOTSTRAP_SCRIPT_DEFAULT = "/usr/bin/ambari_bootstrap";
+ public static final String BOOTSTRAP_SCRIPT_DEFAULT = "/usr/libexec/ambari-server/bootstrap.py";
public static final String BOOTSTRAP_SETUP_AGENT_SCRIPT = "bootstrap.setup_agent.script";
public static final String BOOTSTRAP_SETUP_AGENT_PASSWORD = "bootstrap.setup_agent.password";
public static final String BOOTSTRAP_MASTER_HOSTNAME = "bootstrap.master_host_name";
@@ -475,7 +475,7 @@ public String getBootStrapScript() {
public String getBootSetupAgentScript() {
return properties.getProperty(BOOTSTRAP_SETUP_AGENT_SCRIPT,
- "/usr/lib/python2.6/site-packages/ambari_server/setupAgent.py");
+ "/usr/libexec/ambari-server/setupAgent.py");
}
public String getBootSetupAgentPassword() {
View
2  ambari-server/src/main/python/bootstrap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
'''
Licensed to the Apache Software Foundation (ASF) under one
View
2  ambari-server/src/main/resources/stacks/HDP/1.3._/hooks/before-START.py
@@ -1,4 +1,4 @@
-##!/usr/bin/env python2.6
+##!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/1.3._/hooks/before-START/scripts/hook.py
@@ -1,4 +1,4 @@
-##!/usr/bin/env python2.6
+##!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/hooks/before-START/scripts/hook.py
@@ -1,4 +1,4 @@
-##!/usr/bin/env python2.6
+##!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/PIG/package/scripts/params.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/PIG/package/scripts/pig.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/PIG/package/scripts/pig_client.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/PIG/package/scripts/service_check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/WEBHCAT/package/scripts/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/WEBHCAT/package/scripts/params.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/WEBHCAT/package/scripts/service_check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/WEBHCAT/package/scripts/webhcat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/WEBHCAT/package/scripts/webhcat_server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/WEBHCAT/package/scripts/webhcat_service.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/historyserver.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/mapred_service_check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/mapreduce2_client.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/nodemanager.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/params.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
4 ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/resourcemanager.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -20,7 +20,7 @@
"""
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/service.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/service_check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/yarn.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/yarn_client.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/params.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/service_check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/zookeeper.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/zookeeper_client.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/zookeeper_server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-server/src/main/resources/stacks/HDP/2.0._/services/ZOOKEEPER/package/scripts/zookeeper_service.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
View
2  ambari-web/app/messages.js
@@ -373,7 +373,7 @@ Em.I18n.translations = {
'installer.step3.hostWarningsPopup.checks': 'Host Checks found',
'installer.step3.hostWarningsPopup.notice':'After manually resolving the issues, click <b>Rerun Checks</b>.'+
'<br>To manually resolve issues on <b>each host</b> run the HostCleanup script (Python 2.6 or greater is required):'+
- '<br><div class="code-snippet">python /usr/lib/python2.6/site-packages/ambari_agent/HostCleanup.py --silent --skip=users</div>' +
+ '<br><div class="code-snippet">python /usr/lib/python2.7/site-packages/ambari_agent/HostCleanup.py --silent --skip=users</div>' +
'<div class="alert alert-warn"><b>Note</b>: To clean up in interactive mode, remove <b>--silent</b> option. To clean up all resources, including <i>users</i>, remove <b>--skip=users</b> option. Use <b>--help</b> for a list of available options.</div>',
'installer.step3.hostWarningsPopup.summary':'{0} on {1}',
'installer.step3.hostWarningsPopup.firewall':'Firewall Issues',
View
3  ambari-web/pom.xml
@@ -31,6 +31,7 @@
<description>Ambari Web</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <python.exec>python</python.exec>
</properties>
<build>
<plugins>
@@ -90,7 +91,7 @@
<configuration>
<target name="ambari-web-compile">
<exec dir="${basedir}" executable="npm" failonerror="false">
- <env key="PYTHON" value="python2.6" />
+ <env key="PYTHON" value="${python.exec}" />
<arg value="install"/>
</exec>
<exec dir="${basedir}" executable="brunch" failonerror="false">
View
4 contrib/ambari-scom/ambari-scom-server/src/test/resources/ambari.properties
@@ -24,8 +24,8 @@ metadata.path=/var/lib/ambari-server/resources/stacks
server.version.file=/var/lib/ambari-server/resources/version
webapp.dir=/usr/lib/ambari-server/web
bootstrap.dir=/var/run/ambari-server/bootstrap
-bootstrap.script=/usr/lib/python2.6/site-packages/ambari_server/bootstrap.py
-bootstrap.setup_agent.script=/usr/lib/python2.6/site-packages/ambari_server/setupAgent.py
+bootstrap.script=/usr/lib/python2.7/site-packages/ambari_server/bootstrap.py
+bootstrap.setup_agent.script=/usr/lib/python2.7/site-packages/ambari_server/setupAgent.py
api.authenticate=true
server.connection.max.idle.millis=900000
server.fqdn.service.url=http://169.254.169.254/latest/meta-data/public-hostname
Please sign in to comment.
Something went wrong with that request. Please try again.