BIGTOP-3139. Failed to deploy Ambari on CentOS/Fedora cause no service command availa...

diff --git a/bigtop-packages/src/deb/ambari/ambari-agent.posttrm b/bigtop-packages/src/deb/ambari/ambari-agent.posttrm
deleted file mode 100644 (file)
index 21a01fa..0000000
--- a/bigtop-packages/src/deb/ambari/ambari-agent.posttrm
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License

diff --git a/bigtop-packages/src/deb/ambari/ambari-agent.preinst b/bigtop-packages/src/deb/ambari/ambari-agent.preinst
index 7265c55..9a806cb 100755 (executable)
--- a/bigtop-packages/src/deb/ambari/ambari-agent.preinst
+++ b/bigtop-packages/src/deb/ambari/ambari-agent.preinst
@@ -20,9 +20,6 @@ STACKS_FOLDER_OLD=/var/lib/ambari-agent/cache/stacks_$(date '+%d_%m_%y_%H_%M').o
 COMMON_SERVICES_FOLDER="/var/lib/ambari-agent/cache/common-services"
 COMMON_SERVICES_FOLDER_OLD=/var/lib/ambari-agent/cache/common-services_$(date '+%d_%m_%y_%H_%M').old
 
-AMBARI_ENV="/var/lib/ambari-agent/ambari-env.sh"
-AMBARI_ENV_OLD="$AMBARI_ENV.rpmsave"
-
 if [ -d "/etc/ambari-agent/conf.save" ]
 then
     mv /etc/ambari-agent/conf.save /etc/ambari-agent/conf_$(date '+%d_%m_%y_%H_%M').save
@@ -47,9 +44,4 @@ then
     mv -f "$COMMON_SERVICES_FOLDER" "$COMMON_SERVICES_FOLDER_OLD"
 fi
 
-if [ -f "$AMBARI_ENV" ]
-then
-    mv -f "$AMBARI_ENV" "$AMBARI_ENV_OLD"
-fi
-
 exit 0

diff --git a/bigtop-packages/src/deb/ambari/ambari-server.posttrm b/bigtop-packages/src/deb/ambari/ambari-server.posttrm
deleted file mode 100644 (file)
index 21a01fa..0000000
--- a/bigtop-packages/src/deb/ambari/ambari-server.posttrm
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License

diff --git a/bigtop-packages/src/deb/ambari/ambari-server.preinst b/bigtop-packages/src/deb/ambari/ambari-server.preinst
index 34af1c8..75aec59 100644 (file)
--- a/bigtop-packages/src/deb/ambari/ambari-server.preinst
+++ b/bigtop-packages/src/deb/ambari/ambari-server.preinst
@@ -22,15 +22,6 @@ STACKS_FOLDER_OLD=${ROOT}/var/lib/ambari-server/resources/stacks_$(date '+%d_%m_
 COMMON_SERVICES_FOLDER="${ROOT}/var/lib/ambari-server/resources/common-services"
 COMMON_SERVICES_FOLDER_OLD=${ROOT}/var/lib/ambari-server/resources/common-services_$(date '+%d_%m_%y_%H_%M').old
 
-AMBARI_PROPERTIES="${ROOT}/etc/ambari-server/conf/ambari.properties"
-AMBARI_PROPERTIES_OLD="$AMBARI_PROPERTIES.rpmsave"
-
-AMBARI_ENV="${ROOT}/var/lib/ambari-server/ambari-env.sh"
-AMBARI_ENV_OLD="$AMBARI_ENV.rpmsave"
-
-AMBARI_KRB_JAAS_LOGIN_FILE="${ROOT}/etc/ambari-server/conf/krb5JAASLogin.conf"
-AMBARI_KRB_JAAS_LOGIN_FILE_OLD="$AMBARI_KRB_JAAS_LOGIN_FILE.rpmsave"
-
 AMBARI_VIEWS_FOLDER="${ROOT}/var/lib/ambari-server/resources/views"
 AMBARI_VIEWS_BACKUP_FOLDER="$AMBARI_VIEWS_FOLDER/backups"
 
@@ -44,21 +35,6 @@ then
     mv "$SERVER_CONF_SAVE" "$SERVER_CONF_SAVE_BACKUP"
 fi
 
-if [ -f "$AMBARI_PROPERTIES" ]
-then
-    mv -f "$AMBARI_PROPERTIES" "$AMBARI_PROPERTIES_OLD"
-fi
-
-if [ -f "$AMBARI_ENV" ]
-then
-    mv -f "$AMBARI_ENV" "$AMBARI_ENV_OLD"
-fi
-
-if [ -f "$AMBARI_KRB_JAAS_LOGIN_FILE" ]
-then
-    mv -f "$AMBARI_KRB_JAAS_LOGIN_FILE" "$AMBARI_KRB_JAAS_LOGIN_FILE_OLD"
-fi
-
 if [ -d "$STACKS_FOLDER" ]
 then
     mv -f "$STACKS_FOLDER" "$STACKS_FOLDER_OLD"

diff --git a/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec b/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec
index 09af44b..9b58f06 100644 (file)
--- a/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec
+++ b/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec
@@ -70,7 +70,8 @@ AMBARI_VERSION=%{ambari_version} bash $RPM_SOURCE_DIR/install_ambari.sh \
 %package server
 Summary: Ambari Server
 Group: Development/Libraries
-Requires: openssl, postgresql-server >= 8.1, python >= 2.6, curl
+# BIGTOP-3139: install initscripts to workaround service command not available issue
+Requires: openssl, postgresql-server >= 8.1, python >= 2.6, curl, initscripts
 AutoProv: no
 AutoReqProv: no
 %description server