Skip to content

BIGTOP-3568: Fix Ambari-2.7.5 RPM installation issues #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iwasakims merged 2 commits into from
Jul 10, 2021
Merged

BIGTOP-3568: Fix Ambari-2.7.5 RPM installation issues #796

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec089af
BIGTOP-3568: Fix Ambari-2.7.5 RPM installation issues
guyuqi Jul 8, 2021
32c2d1a
Sort 'find' result.
guyuqi Jul 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions bigtop-packages/src/rpm/ambari/SPECS/ambari.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,11 @@ exit 0
# See the License for the specific language governing permissions and
# limitations under the License


RESOURCE_MANAGEMENT_DIR="/usr/lib/python2.6/site-packages/resource_management"
PYPATH=`find /usr/lib -maxdepth 1 -name 'python*' | sort`
PYLIB_DIR=`echo ${PYPATH} | awk '{print $1}'`
RESOURCE_MANAGEMENT_DIR= "${PYLIB_DIR}/site-packages/resource_management"
RESOURCE_MANAGEMENT_DIR_SERVER="/usr/lib/ambari-server/lib/resource_management"
JINJA_DIR="/usr/lib/python2.6/site-packages/ambari_jinja2"
JINJA_DIR="${PYLIB_DIR}/site-packages/ambari_jinja2"
JINJA_SERVER_DIR="/usr/lib/ambari-server/lib/ambari_jinja2"
AMBARI_SERVER_EXECUTABLE_LINK="/usr/sbin/ambari-server"
AMBARI_SERVER_EXECUTABLE="/etc/init.d/ambari-server"
Expand All @@ -247,12 +248,12 @@ if [ -d "$RESOURCE_MANAGEMENT_DIR" ]; then # resource_management dir exists
fi
# setting resource_management shared resource
if [ ! -d "$RESOURCE_MANAGEMENT_DIR" ]; then
ln -s "$RESOURCE_MANAGEMENT_DIR_SERVER" "$RESOURCE_MANAGEMENT_DIR"
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"
ln -s ${JINJA_SERVER_DIR} ${JINJA_DIR}
fi

exit 0
Expand Down Expand Up @@ -417,10 +418,11 @@ exit 0
# See the License for the specific language governing permissions and
# limitations under the License


RESOURCE_MANAGEMENT_DIR="/usr/lib/python2.6/site-packages/resource_management"
PYPATH=`find /usr/lib -maxdepth 1 -name 'python*' | sort`
PYLIB_DIR=`echo $PYPATH | awk '{print $1}'`
RESOURCE_MANAGEMENT_DIR="$PYLIB_DIR/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_DIR="$PYLIB_DIR/site-packages/ambari_jinja2"
JINJA_AGENT_DIR="/usr/lib/ambari-agent/lib/ambari_jinja2"

# remove RESOURCE_MANAGEMENT_DIR if it's a directory
Expand Down