You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2018/01/31 20:18:08 UTC
[ambari] branch trunk updated: AMBARI-22830. Ambari-agent puts
Python scripts in 2.6 directory on OSes that use python 2.7.x by default
(aonishuk)
This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0bc48df AMBARI-22830. Ambari-agent puts Python scripts in 2.6 directory on OSes that use python 2.7.x by default (aonishuk)
0bc48df is described below
commit 0bc48df2015432a0232db3bfdbcc2f139b187ae2
Author: Andrew Onishuk <ao...@hortonworks.com>
AuthorDate: Wed Jan 31 13:11:32 2018 +0200
AMBARI-22830. Ambari-agent puts Python scripts in 2.6 directory on OSes that use python 2.7.x by default (aonishuk)
---
ambari-agent/conf/unix/ambari-agent | 8 +--
ambari-agent/conf/unix/ambari-env.sh | 2 +-
ambari-agent/conf/unix/install-helper.sh | 57 ++++++++++------------
ambari-agent/pom.xml | 13 +----
.../src/main/package/rpm/posttrans_agent.sh | 20 --------
.../src/main/python/ambari_agent/AmbariAgent.py | 2 +-
.../src/main/python/ambari_agent/HostCleanup.py | 2 +-
ambari-server/conf/ambari-env.sh | 1 +
ambari-server/conf/unix/ambari-env.sh | 2 +-
ambari-server/conf/unix/ambari.properties | 4 +-
ambari-server/conf/unix/install-helper.sh | 43 ++++++----------
ambari-server/pom.xml | 10 ----
ambari-server/src/main/assemblies/server.xml | 8 +--
.../ambari/server/configuration/Configuration.java | 4 +-
.../src/main/package/rpm/posttrans_server.sh | 20 --------
ambari-server/src/main/python/bootstrap.py | 4 +-
.../src/main/resources/scripts/Ambaripreupload.py | 2 +-
.../resources/scripts/check_ambari_permissions.py | 8 +--
.../src/main/resources/scripts/kerberos-setup.sh | 4 +-
19 files changed, 68 insertions(+), 146 deletions(-)
diff --git a/ambari-agent/conf/unix/ambari-agent b/ambari-agent/conf/unix/ambari-agent
index f010800..8168002 100755
--- a/ambari-agent/conf/unix/ambari-agent
+++ b/ambari-agent/conf/unix/ambari-agent
@@ -62,7 +62,7 @@ export PATH=/usr/sbin:/sbin:/usr/lib/ambari-server/*:$PATH
export AMBARI_CONF_DIR=$HOME_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/ambari-agent/lib:${PYTHONPATH:-}
export AMBARI_PID_DIR=`get_agent_property piddir`
export AMBARI_PID_DIR=`valid_path "${AMBARI_PID_DIR:?}"`
@@ -79,11 +79,11 @@ PYTHON_WRAP=/usr/bin/ambari-python-wrap
PIDFILE=$AMBARI_PID_DIR/$AMBARI_AGENT.pid
OUTFILE=$AMBARI_AGENT_LOG_DIR/ambari-agent.out
LOGFILE=$AMBARI_AGENT_LOG_DIR/ambari-agent.log
-AGENT_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/main.py
+AGENT_SCRIPT=/usr/lib/ambari-agent/lib/ambari_agent/main.py
AGENT_TMP_DIR=/var/lib/ambari-agent/tmp
AGENT_WORKING_DIR=/var/lib/ambari-agent
-AMBARI_AGENT_PY_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/AmbariAgent.py
-COMMON_DIR=/usr/lib/python2.6/site-packages/ambari_commons
+AMBARI_AGENT_PY_SCRIPT=/usr/lib/ambari-agent/lib/ambari_agent/AmbariAgent.py
+COMMON_DIR=/usr/lib/ambari-agent/lib/ambari_commons
COMMON_DIR_AGENT=/usr/lib/ambari-agent/lib/ambari_commons
OK=0
NOTOK=1
diff --git a/ambari-agent/conf/unix/ambari-env.sh b/ambari-agent/conf/unix/ambari-env.sh
index 1f93431..6458b87 100644
--- a/ambari-agent/conf/unix/ambari-env.sh
+++ b/ambari-agent/conf/unix/ambari-env.sh
@@ -17,7 +17,7 @@
# given through environment variable
AMBARI_PASSPHRASE="DEV"
export PATH=$PATH:/var/lib/ambari-agent
-export PYTHONPATH=$PYTHONPATH:/usr/lib/python2.6/site-packages
+export PYTHONPATH=/usr/lib/ambari-agent/lib:$PYTHONPATH
# customize python binary for ambari
# export PYTHON=/usr/bin/python2
diff --git a/ambari-agent/conf/unix/install-helper.sh b/ambari-agent/conf/unix/install-helper.sh
index 37bbe4a..e305866 100644
--- a/ambari-agent/conf/unix/install-helper.sh
+++ b/ambari-agent/conf/unix/install-helper.sh
@@ -18,22 +18,32 @@
# AGENT INSTALL HELPER #
##################################################################
-COMMON_DIR="/usr/lib/python2.6/site-packages/ambari_commons"
-RESOURCE_MANAGEMENT_DIR="/usr/lib/python2.6/site-packages/resource_management"
-JINJA_DIR="/usr/lib/python2.6/site-packages/ambari_jinja2"
-SIMPLEJSON_DIR="/usr/lib/python2.6/site-packages/ambari_simplejson"
-OLD_COMMON_DIR="/usr/lib/python2.6/site-packages/common_functions"
INSTALL_HELPER_SERVER="/var/lib/ambari-server/install-helper.sh"
COMMON_DIR_AGENT="/usr/lib/ambari-agent/lib/ambari_commons"
RESOURCE_MANAGEMENT_DIR_AGENT="/usr/lib/ambari-agent/lib/resource_management"
JINJA_AGENT_DIR="/usr/lib/ambari-agent/lib/ambari_jinja2"
SIMPLEJSON_AGENT_DIR="/usr/lib/ambari-agent/lib/ambari_simplejson"
-AMBARI_AGENT="/usr/lib/python2.6/site-packages/ambari_agent"
PYTHON_WRAPER_TARGET="/usr/bin/ambari-python-wrap"
AMBARI_AGENT_VAR="/var/lib/ambari-agent"
AMBARI_AGENT_BINARY="/etc/init.d/ambari-agent"
AMBARI_AGENT_BINARY_SYMLINK="/usr/sbin/ambari-agent"
+
+OLD_COMMON_DIR="/usr/lib/python2.6/site-packages/ambari_commons"
+OLD_RESOURCE_MANAGEMENT_DIR="/usr/lib/python2.6/site-packages/resource_management"
+OLD_JINJA_DIR="/usr/lib/python2.6/site-packages/ambari_jinja2"
+OLD_SIMPLEJSON_DIR="/usr/lib/python2.6/site-packages/ambari_simplejson"
+OLD_AMBARI_AGENT_DIR="/usr/lib/python2.6/site-packages/ambari_agent"
+
+COMMON_DIR="/usr/lib/ambari-agent/lib/ambari_commons"
+RESOURCE_MANAGEMENT_DIR="/usr/lib/ambari-agent/lib/resource_management"
+JINJA_DIR="/usr/lib/ambari-agent/lib/ambari_jinja2"
+SIMPLEJSON_DIR="/usr/lib/ambari-agent/lib/ambari_simplejson"
+STOMP_DIR="/usr/lib/ambari-agent/lib/ambari_stomp"
+WS4PY_DIR="/usr/lib/ambari-agent/lib/ambari_ws4py"
+OLD_COMMON_DIR="/usr/lib/ambari-agent/lib/common_functions"
+AMBARI_AGENT="/usr/lib/ambari-agent/lib/ambari_agent"
+
clean_pyc_files(){
# cleaning old *.pyc files
find ${RESOURCE_MANAGEMENT_DIR:?} -name *.pyc -exec rm {} \;
@@ -49,27 +59,8 @@ do_install(){
mv /etc/ambari-agent/conf.save /etc/ambari-agent/conf_$(date '+%d_%m_%y_%H_%M').save
fi
- # setting up /usr/sbin/ambari-agent symlink
- rm -f "$AMBARI_AGENT_BINARY_SYMLINK"
- ln -s "$AMBARI_AGENT_BINARY" "$AMBARI_AGENT_BINARY_SYMLINK"
-
- # setting ambari_commons shared resource
- rm -rf "$OLD_COMMON_DIR"
- if [ ! -d "$COMMON_DIR" ]; then
- ln -s "$COMMON_DIR_AGENT" "$COMMON_DIR"
- fi
- # setting resource_management shared resource
- if [ ! -d "$RESOURCE_MANAGEMENT_DIR" ]; then
- ln -s "$RESOURCE_MANAGEMENT_DIR_AGENT" "$RESOURCE_MANAGEMENT_DIR"
- fi
- # setting jinja2 shared resource
- if [ ! -d "$JINJA_DIR" ]; then
- ln -s "$JINJA_AGENT_DIR" "$JINJA_DIR"
- fi
- # setting simplejson shared resource
- if [ ! -d "$SIMPLEJSON_DIR" ]; then
- ln -s "$SIMPLEJSON_AGENT_DIR" "$SIMPLEJSON_DIR"
- fi
+ # these symlinks (or directories) where created in ambari releases prior to ambari-2.6.2. Do clean up.
+ rm -rf "$OLD_COMMON_DIR" "$OLD_RESOURCE_MANAGEMENT_DIR" "$OLD_JINJA_DIR" "$OLD_SIMPLEJSON_DIR" "$OLD_COMMON_DIR" "$OLD_AMBARI_AGENT_DIR"
# on nano Ubuntu, when umask=027 those folders are created without 'x' bit for 'others'.
# which causes failures when hadoop users try to access tmp_dir
@@ -124,6 +115,14 @@ do_install(){
mv $BAK ${BAK}_$(date '+%d_%m_%y_%H_%M').save
fi
fi
+
+ if [ -f "$AMBARI_ENV_RPMSAVE" ] ; then
+ PYTHON_PATH_LINE='export PYTHONPATH=/usr/lib/ambari-agent/lib:$PYTHONPATH'
+ grep "^$PYTHON_PATH_LINE\$" "$AMBARI_ENV_RPMSAVE" > /dev/null
+ if [ $? -ne 0 ] ; then
+ echo -e "\n$PYTHON_PATH_LINE" >> $AMBARI_ENV_RPMSAVE
+ fi
+ fi
}
do_remove(){
@@ -158,10 +157,6 @@ do_remove(){
rm -f $SIMPLEJSON_DIR
fi
- if [ -d "$OLD_COMMON_DIR" ]; then
- rm -f $OLD_COMMON_DIR
- fi
-
# if server package exists, restore their settings
if [ -f "$INSTALL_HELPER_SERVER" ]; then # call server shared files installer
$INSTALL_HELPER_SERVER install
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index eede374..38a0ada 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -36,7 +36,7 @@
<package.log.dir>/var/log/ambari-agent</package.log.dir>
<package.pid.dir>/var/run/ambari-agent</package.pid.dir>
<skipTests>false</skipTests>
- <agent.install.dir>/usr/lib/python2.6/site-packages/ambari_agent</agent.install.dir>
+ <agent.install.dir>/usr/lib/ambari-agent/lib/ambari_agent</agent.install.dir>
<ambari_commons.install.dir>/usr/lib/ambari-agent/lib/ambari_commons</ambari_commons.install.dir>
<resource_management.install.dir>/usr/lib/ambari-agent/lib/resource_management</resource_management.install.dir>
<jinja.install.dir>/usr/lib/ambari-agent/lib/ambari_jinja2</jinja.install.dir>
@@ -285,17 +285,6 @@
</sources>
</mapping>
<mapping>
- <directory>/usr/lib/python2.6/site-packages</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/usr/lib/python2.6/site-packages</location>
- </source>
- </sources>
- </mapping>
- <mapping>
<directory>/var/lib/ambari-agent</directory>
<filemode>755</filemode>
<username>root</username>
diff --git a/ambari-agent/src/main/package/rpm/posttrans_agent.sh b/ambari-agent/src/main/package/rpm/posttrans_agent.sh
index 723bb93..35ec59a 100644
--- a/ambari-agent/src/main/package/rpm/posttrans_agent.sh
+++ b/ambari-agent/src/main/package/rpm/posttrans_agent.sh
@@ -14,29 +14,9 @@
# limitations under the License
-RESOURCE_MANAGEMENT_DIR="/usr/lib/python2.6/site-packages/resource_management"
-RESOURCE_MANAGEMENT_DIR_AGENT="/usr/lib/ambari-agent/lib/resource_management"
-JINJA_DIR="/usr/lib/python2.6/site-packages/ambari_jinja2"
-JINJA_AGENT_DIR="/usr/lib/ambari-agent/lib/ambari_jinja2"
AMBARI_AGENT_BINARY="/etc/init.d/ambari-agent"
AMBARI_AGENT_BINARY_SYMLINK="/usr/sbin/ambari-agent"
-# remove RESOURCE_MANAGEMENT_DIR if it's a directory
-if [ -d "$RESOURCE_MANAGEMENT_DIR" ]; then # resource_management dir exists
- if [ ! -L "$RESOURCE_MANAGEMENT_DIR" ]; then # resource_management dir is not link
- rm -rf "$RESOURCE_MANAGEMENT_DIR"
- fi
-fi
-# setting resource_management shared resource
-if [ ! -d "$RESOURCE_MANAGEMENT_DIR" ]; then
- ln -s "$RESOURCE_MANAGEMENT_DIR_AGENT" "$RESOURCE_MANAGEMENT_DIR"
-fi
-
-# setting jinja2 shared resource
-if [ ! -d "$JINJA_DIR" ]; then
- ln -s "$JINJA_AGENT_DIR" "$JINJA_DIR"
-fi
-
# setting ambari-agent binary symlink
if [ ! -f "$AMBARI_AGENT_BINARY_SYMLINK" ]; then
ln -s "$AMBARI_AGENT_BINARY" "$AMBARI_AGENT_BINARY_SYMLINK"
diff --git a/ambari-agent/src/main/python/ambari_agent/AmbariAgent.py b/ambari-agent/src/main/python/ambari_agent/AmbariAgent.py
index aeb200c..8475551 100644
--- a/ambari-agent/src/main/python/ambari_agent/AmbariAgent.py
+++ b/ambari-agent/src/main/python/ambari_agent/AmbariAgent.py
@@ -27,7 +27,7 @@ from Controller import AGENT_AUTO_RESTART_EXIT_CODE
if os.environ.has_key("PYTHON_BIN"):
AGENT_SCRIPT = os.path.join(os.environ["PYTHON_BIN"],"site-packages/ambari_agent/main.py")
else:
- AGENT_SCRIPT = "/usr/lib/python2.6/site-packages/ambari_agent/main.py"
+ AGENT_SCRIPT = "/usr/lib/ambari-agent/lib/ambari_agent/main.py"
if os.environ.has_key("AMBARI_PID_DIR"):
AGENT_PID_FILE = os.path.join(os.environ["AMBARI_PID_DIR"],"ambari-agent.pid")
else:
diff --git a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
index 7ee3b1c..3db90ea 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
@@ -20,7 +20,7 @@ limitations under the License.
# For compatibility with different OSes
# Edit PYTHONPATH to be able to import common_functions
import sys
-sys.path.append("/usr/lib/python2.6/site-packages/")
+sys.path.append("/usr/lib/ambari-agent/lib/")
########################################################
import os
diff --git a/ambari-server/conf/ambari-env.sh b/ambari-server/conf/ambari-env.sh
index 51dcbc4..62fee14 100644
--- a/ambari-server/conf/ambari-env.sh
+++ b/ambari-server/conf/ambari-env.sh
@@ -15,5 +15,6 @@
AMBARI_PID_DIR=/var/run/ambari-server
AMBARI_PASSPHRASE="DEV"
+export PYTHONPATH=/usr/lib/ambari-server/lib:$PYTHONPATH
# to add additional directory or jar to server classpath use SERVER_CLASSPATH variable
# export SERVER_CLASSPATH=/etc/hadoop/conf/secure
\ No newline at end of file
diff --git a/ambari-server/conf/unix/ambari-env.sh b/ambari-server/conf/unix/ambari-env.sh
index 7c91c85..7ee2dc5 100644
--- a/ambari-server/conf/unix/ambari-env.sh
+++ b/ambari-server/conf/unix/ambari-env.sh
@@ -17,7 +17,7 @@
AMBARI_PASSHPHRASE="DEV"
export AMBARI_JVM_ARGS="$AMBARI_JVM_ARGS -Xms512m -Xmx2048m -XX:MaxPermSize=128m -Djava.security.auth.login.config=$ROOT/etc/ambari-server/conf/krb5JAASLogin.conf -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false"
export PATH=$PATH:$ROOT/var/lib/ambari-server
-export PYTHONPATH=$PYTHONPATH:$ROOT/usr/lib/python2.6/site-packages
+export PYTHONPATH=$ROOT/usr/lib/ambari-server/lib:$PYTHONPATH
# customize python binary for ambari
# export PYTHON=/usr/bin/python2
diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties
index 212591f..e7ad381 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -51,8 +51,8 @@ webapp.dir=$ROOT/usr/lib/ambari-server/web
pid.dir=$ROOT/var/run/ambari-server
recommendations.dir=$ROOT/var/run/ambari-server/stack-recommendations
bootstrap.dir=$ROOT/var/run/ambari-server/bootstrap
-bootstrap.script=$ROOT/usr/lib/python2.6/site-packages/ambari_server/bootstrap.py
-bootstrap.setup_agent.script=$ROOT/usr/lib/python2.6/site-packages/ambari_server/setupAgent.py
+bootstrap.script=$ROOT/usr/lib/ambari-server/lib/ambari_server/bootstrap.py
+bootstrap.setup_agent.script=$ROOT/usr/lib/ambari-server/lib/ambari_server/setupAgent.py
stackadvisor.script=$ROOT/var/lib/ambari-server/resources/scripts/stack_advisor.py
server.tmp.dir=$ROOT/var/lib/ambari-server/data/tmp
ambari.python.wrap=ambari-python-wrap
diff --git a/ambari-server/conf/unix/install-helper.sh b/ambari-server/conf/unix/install-helper.sh
index 6d7b3c7..954db74 100644
--- a/ambari-server/conf/unix/install-helper.sh
+++ b/ambari-server/conf/unix/install-helper.sh
@@ -19,12 +19,19 @@
ROOT_DIR_PATH="${RPM_INSTALL_PREFIX}"
ROOT=`echo "${RPM_INSTALL_PREFIX}" | sed 's|/$||g'` # Customized folder, which ambari-server files are installed into ('/' or '' are default).
-COMMON_DIR="${ROOT}/usr/lib/python2.6/site-packages/ambari_commons"
-RESOURCE_MANAGEMENT_DIR="${ROOT}/usr/lib/python2.6/site-packages/resource_management"
-JINJA_DIR="${ROOT}/usr/lib/python2.6/site-packages/ambari_jinja2"
-SIMPLEJSON_DIR="${ROOT}/usr/lib/python2.6/site-packages/ambari_simplejson"
-OLD_COMMON_DIR="${ROOT}/usr/lib/python2.6/site-packages/common_functions"
-AMBARI_SERVER="${ROOT}/usr/lib/python2.6/site-packages/ambari_server"
+OLD_COMMON_DIR="${ROOT}/usr/lib/python2.6/site-packages/ambari_commons"
+OLD_RESOURCE_MANAGEMENT_DIR="${ROOT}/usr/lib/python2.6/site-packages/resource_management"
+OLD_JINJA_DIR="${ROOT}/usr/lib/python2.6/site-packages/ambari_jinja2"
+OLD_SIMPLEJSON_DIR="${ROOT}/usr/lib/python2.6/site-packages/ambari_simplejson"
+OLD_AMBARI_SERVER_DIR="${ROOT}/usr/lib/python2.6/site-packages/ambari_server"
+
+COMMON_DIR="${ROOT}/usr/lib/ambari-server/lib/ambari_commons"
+RESOURCE_MANAGEMENT_DIR="${ROOT}/usr/lib/ambari-server/lib/resource_management"
+JINJA_DIR="${ROOT}/usr/lib/ambari-server/lib/ambari_jinja2"
+SIMPLEJSON_DIR="${ROOT}/usr/lib/ambari-server/lib/ambari_simplejson"
+AMBARI_SERVER="${ROOT}/usr/lib/ambari-server/lib/ambari_server"
+
+
INSTALL_HELPER_AGENT="/var/lib/ambari-agent/install-helper.sh"
CA_CONFIG="${ROOT}/var/lib/ambari-server/keys/ca.config"
COMMON_DIR_SERVER="${ROOT}/usr/lib/ambari-server/lib/ambari_commons"
@@ -60,23 +67,7 @@ do_install(){
rm -f "$AMBARI_SERVER_EXECUTABLE_LINK"
ln -s "$AMBARI_SERVER_EXECUTABLE" "$AMBARI_SERVER_EXECUTABLE_LINK"
- # setting ambari_commons shared resource
- rm -rf "$OLD_COMMON_DIR"
- if [ ! -d "$COMMON_DIR" ]; then
- ln -s "$COMMON_DIR_SERVER" "$COMMON_DIR"
- fi
- # setting resource_management shared resource
- if [ ! -d "$RESOURCE_MANAGEMENT_DIR" ]; then
- ln -s "$RESOURCE_MANAGEMENT_DIR_SERVER" "$RESOURCE_MANAGEMENT_DIR"
- fi
- # setting jinja2 shared resource
- if [ ! -d "$JINJA_DIR" ]; then
- ln -s "$JINJA_SERVER_DIR" "$JINJA_DIR"
- fi
- # setting simplejson shared resource
- if [ ! -d "$SIMPLEJSON_DIR" ]; then
- ln -s "$SIMPLEJSON_SERVER_DIR" "$SIMPLEJSON_DIR"
- fi
+rm -rf "$OLD_COMMON_DIR" "$OLD_RESOURCE_MANAGEMENT_DIR" "$OLD_JINJA_DIR" "$OLD_SIMPLEJSON_DIR" "$OLD_COMMON_DIR" "$OLD_AMBARI_SERVER_DIR"
#TODO we need this when upgrading from pre 2.4 versions to 2.4, remove this when upgrade from pre 2.4 versions will be
#TODO unsupported
@@ -144,7 +135,7 @@ do_install(){
fi
if [ -f "$AMBARI_ENV_RPMSAVE" ] ; then
- PYTHON_PATH_LINE='export PYTHONPATH=$PYTHONPATH:/usr/lib/python2.6/site-packages'
+ PYTHON_PATH_LINE='export PYTHONPATH=/usr/lib/ambari-server/lib:$PYTHONPATH'
grep "^$PYTHON_PATH_LINE\$" "$AMBARI_ENV_RPMSAVE" > /dev/null
if [ $? -ne 0 ] ; then
echo -e "\n$PYTHON_PATH_LINE" >> $AMBARI_ENV_RPMSAVE
@@ -184,10 +175,6 @@ do_remove(){
rm -f $SIMPLEJSON_DIR
fi
- if [ -d "$OLD_COMMON_DIR" ]; then
- rm -rf $OLD_COMMON_DIR
- fi
-
if [ -d "$AMBARI_SERVER" ]; then
rm -rf "$AMBARI_SERVER"
fi
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 3399e4a..4f32d36 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -608,16 +608,6 @@
</sources>
</mapping>
<mapping>
- <directory>/usr/lib/python2.6/site-packages</directory>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}-dist/usr/lib/python2.6/site-packages</location>
- </source>
- </sources>
- </mapping>
- <mapping>
<directory>/var/log/ambari-server</directory>
<username>root</username>
<groupname>root</groupname>
diff --git a/ambari-server/src/main/assemblies/server.xml b/ambari-server/src/main/assemblies/server.xml
index cbf11c5..6d32a76 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -205,7 +205,7 @@
<fileSet>
<fileMode>755</fileMode>
<directory>src/main/python/ambari_server</directory>
- <outputDirectory>/usr/lib/python2.6/site-packages/ambari_server</outputDirectory>
+ <outputDirectory>/usr/lib/ambari-server/lib/ambari_server</outputDirectory>
</fileSet>
<fileSet>
<fileMode>755</fileMode>
@@ -419,17 +419,17 @@
<file>
<fileMode>755</fileMode>
<source>src/main/python/bootstrap.py</source>
- <outputDirectory>/usr/lib/python2.6/site-packages/ambari_server</outputDirectory>
+ <outputDirectory>/usr/lib/ambari-server/lib/ambari_server</outputDirectory>
</file>
<file>
<fileMode>755</fileMode>
<source>src/main/python/setupAgent.py</source>
- <outputDirectory>/usr/lib/python2.6/site-packages/ambari_server</outputDirectory>
+ <outputDirectory>/usr/lib/ambari-server/lib/ambari_server</outputDirectory>
</file>
<file>
<fileMode>755</fileMode>
<source>src/main/python/os_check_type.py</source>
- <outputDirectory>/usr/lib/python2.6/site-packages/ambari_server</outputDirectory>
+ <outputDirectory>/usr/lib/ambari-server/lib/ambari_server</outputDirectory>
</file>
<file>
<fileMode>755</fileMode>
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index a14a421..59bda55 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -375,7 +375,7 @@ public class Configuration {
*/
@Markdown(description = "The location and name of the Python script used to bootstrap new Ambari Agent hosts.")
public static final ConfigurationProperty<String> BOOTSTRAP_SCRIPT = new ConfigurationProperty<>(
- "bootstrap.script", AmbariPath.getPath("/usr/lib/python2.6/site-packages/ambari_server/bootstrap.py"));
+ "bootstrap.script", AmbariPath.getPath("/usr/lib/ambari-server/lib/ambari_server/bootstrap.py"));
/**
* The location and name of the Python script executed on the Ambari Agent
@@ -384,7 +384,7 @@ public class Configuration {
@Markdown(description = "The location and name of the Python script executed on the Ambari Agent host during the bootstrap process.")
public static final ConfigurationProperty<String> BOOTSTRAP_SETUP_AGENT_SCRIPT = new ConfigurationProperty<>(
"bootstrap.setup_agent.script",
- AmbariPath.getPath("/usr/lib/python2.6/site-packages/ambari_server/setupAgent.py"));
+ AmbariPath.getPath("/usr/lib/ambari-server/lib/ambari_server/setupAgent.py"));
/**
* The password to set on the {@code AMBARI_PASSPHRASE} environment variable
diff --git a/ambari-server/src/main/package/rpm/posttrans_server.sh b/ambari-server/src/main/package/rpm/posttrans_server.sh
index 1384eea..19fba9e 100644
--- a/ambari-server/src/main/package/rpm/posttrans_server.sh
+++ b/ambari-server/src/main/package/rpm/posttrans_server.sh
@@ -15,10 +15,6 @@
ROOT=`echo "${RPM_INSTALL_PREFIX}" | sed 's|/$||g'`
-RESOURCE_MANAGEMENT_DIR="${ROOT}/usr/lib/python2.6/site-packages/resource_management"
-RESOURCE_MANAGEMENT_DIR_SERVER="${ROOT}/usr/lib/ambari-server/lib/resource_management"
-JINJA_DIR="${ROOT}/usr/lib/python2.6/site-packages/ambari_jinja2"
-JINJA_SERVER_DIR="${ROOT}/usr/lib/ambari-server/lib/ambari_jinja2"
AMBARI_SERVER_EXECUTABLE_LINK="${ROOT}/usr/sbin/ambari-server"
AMBARI_SERVER_EXECUTABLE="${ROOT}/etc/init.d/ambari-server"
@@ -27,20 +23,4 @@ AMBARI_SERVER_EXECUTABLE="${ROOT}/etc/init.d/ambari-server"
rm -f "$AMBARI_SERVER_EXECUTABLE_LINK"
ln -s "$AMBARI_SERVER_EXECUTABLE" "$AMBARI_SERVER_EXECUTABLE_LINK"
-# remove RESOURCE_MANAGEMENT_DIR if it's a directory
-if [ -d "$RESOURCE_MANAGEMENT_DIR" ]; then # resource_management dir exists
- if [ ! -L "$RESOURCE_MANAGEMENT_DIR" ]; then # resource_management dir is not link
- rm -rf "$RESOURCE_MANAGEMENT_DIR"
- fi
-fi
-# setting resource_management shared resource
-if [ ! -d "$RESOURCE_MANAGEMENT_DIR" ]; then
- ln -s "$RESOURCE_MANAGEMENT_DIR_SERVER" "$RESOURCE_MANAGEMENT_DIR"
-fi
-
-# setting jinja2 shared resource
-if [ ! -d "$JINJA_DIR" ]; then
- ln -s "$JINJA_SERVER_DIR" "$JINJA_DIR"
-fi
-
exit 0
\ No newline at end of file
diff --git a/ambari-server/src/main/python/bootstrap.py b/ambari-server/src/main/python/bootstrap.py
index f1c53ce..e278917 100755
--- a/ambari-server/src/main/python/bootstrap.py
+++ b/ambari-server/src/main/python/bootstrap.py
@@ -19,7 +19,7 @@ limitations under the License.
'''
import sys
-sys.path.append("/usr/lib/python2.6/site-packages/") # this file can be run with python2.7 that why we need this
+sys.path.append("/usr/lib/ambari-server/lib/") # this file can be run with python2.7 that why we need this
# On Linux, the bootstrap process is supposed to run on hosts that may have installed Python 2.4 and above (CentOS 5).
# Hence, the whole bootstrap code needs to comply with Python 2.4 instead of Python 2.6. Most notably, @-decorators and
@@ -403,7 +403,7 @@ class BootstrapWindows(Bootstrap):
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
class BootstrapDefault(Bootstrap):
- ambari_commons="/usr/lib/python2.6/site-packages/ambari_commons"
+ ambari_commons="/usr/lib/ambari-server/lib/ambari_commons"
TEMP_FOLDER = DEFAULT_AGENT_TEMP_FOLDER
OS_CHECK_SCRIPT_FILENAME = "os_check_type.py"
PASSWORD_FILENAME = "host_pass"
diff --git a/ambari-server/src/main/resources/scripts/Ambaripreupload.py b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
index a8665b1..d24bec8 100644
--- a/ambari-server/src/main/resources/scripts/Ambaripreupload.py
+++ b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
@@ -23,7 +23,7 @@ import tarfile
from contextlib import closing
from optparse import OptionParser
os.environ["PATH"] += os.pathsep + "/var/lib/ambari-agent"
-sys.path.append("/usr/lib/python2.6/site-packages")
+sys.path.append("/usr/lib/ambari-server/lib")
import glob
from logging import thread
diff --git a/ambari-server/src/main/resources/scripts/check_ambari_permissions.py b/ambari-server/src/main/resources/scripts/check_ambari_permissions.py
index 21b8a0a..fcb00dc 100644
--- a/ambari-server/src/main/resources/scripts/check_ambari_permissions.py
+++ b/ambari-server/src/main/resources/scripts/check_ambari_permissions.py
@@ -33,16 +33,16 @@ SECURE_FILE_PERMISSIONS = 700
jar_files_to_check = ["/var/lib/ambari-server/", "/usr/lib/ambari-server/", "/var/lib/ambari-agent/"]
# List of directories. For this list we are only checking permissions for directory.
-directories_to_check = ["/etc/ambari-server/conf", "/usr/lib/ambari-server", "/usr/lib/python2.6/site-packages/ambari_server",
- "/var/lib/ambari-server", "/usr/lib/ambari-agent", "/usr/lib/python2.6/site-packages/ambari_agent",
+directories_to_check = ["/etc/ambari-server/conf", "/usr/lib/ambari-server", "/usr/lib/ambari-server/lib/ambari_server",
+ "/var/lib/ambari-server", "/usr/lib/ambari-agent", "/usr/lib/ambari-agent/lib/ambari_agent",
"/var/lib/ambari-agent/cache", "/var/lib/ambari-agent/cred", "/var/lib/ambari-agent/data",
"/var/lib/ambari-agent/tools", "/var/lib/ambari-agent/lib", "/etc/ambari-agent/conf"]
# List of directories/files. If "directory", then we will check all files in it and in all subdirectories. If "file" then we will check only this file.
files_to_check = ["/etc/ambari-server/conf/", "/etc/init/ambari-server.conf", "/etc/init.d/ambari-server",
- "/usr/lib/ambari-server", "/usr/lib/python2.6/site-packages/ambari_server", "/usr/sbin/ambari_server_main.py",
+ "/usr/lib/ambari-server", "/usr/lib/ambari-server/lib/ambari_server", "/usr/sbin/ambari_server_main.py",
"/usr/sbin/ambari-server.py", "/var/lib/ambari-server", "/usr/lib/ambari-agent",
- "/usr/lib/python2.6/site-packages/ambari_agent", "/var/lib/ambari-agent"]
+ "/usr/lib/ambari-agent/lib/ambari_agent", "/var/lib/ambari-agent"]
# List of secure directories. For this list we are only checking permissions for directory.
diff --git a/ambari-server/src/main/resources/scripts/kerberos-setup.sh b/ambari-server/src/main/resources/scripts/kerberos-setup.sh
index 8641616..dd65b45 100644
--- a/ambari-server/src/main/resources/scripts/kerberos-setup.sh
+++ b/ambari-server/src/main/resources/scripts/kerberos-setup.sh
@@ -266,8 +266,8 @@ distributeKeytabs () {
## getEnvironmentCMD () : get linux distribution type and package manager
########################
getEnvironmentCMD () {
- os=`python -c 'import sys; sys.path.append("/usr/lib/python2.6/site-packages/"); from ambari_commons import OSCheck; print OSCheck.get_os_family()'`
- version=`python -c 'import sys; sys.path.append("/usr/lib/python2.6/site-packages/"); from ambari_commons import OSCheck; print OSCheck.get_os_major_version()'`
+ os=`python -c 'import sys; sys.path.append("/usr/lib/ambari-server/lib/"); from ambari_commons import OSCheck; print OSCheck.get_os_family()'`
+ version=`python -c 'import sys; sys.path.append("/usr/lib/ambari-server/lib/"); from ambari_commons import OSCheck; print OSCheck.get_os_major_version()'`
os=$os$version;
case $os in
'ubuntu12' )
--
To stop receiving notification emails like this one, please contact
aonishuk@apache.org.