BIGTOP-3329. Bump ambari to v2.7.5. (#780)
* BIGTOP-3329. Bump ambari to v2.7.5.
* removed contents related to ambari-client and ambari-shell.
* addressed build failure on Ubuntu.
diff --git a/bigtop-packages/src/common/ambari/install_ambari.sh b/bigtop-packages/src/common/ambari/install_ambari.sh
index 603169f..bcc323d 100755
--- a/bigtop-packages/src/common/ambari/install_ambari.sh
+++ b/bigtop-packages/src/common/ambari/install_ambari.sh
@@ -77,7 +77,6 @@
#Ambari Server
LIB_DIR=${LIB_DIR:-/usr/lib/ambari-server}
-LIB_DIR_CLIENT=${LIB_DIR_CLIENT:-/usr/lib/ambari-client}
ETC_DIR=${ETC_DIR:-/etc/ambari-server}
CONF_DIR=${CONF_DIR:-${ETC_DIR}/conf}
@@ -99,60 +98,8 @@
VAR_LIB_DIR=/var/lib/ambari-agent
CONF_DIR=${ETC_DIR}/conf
-AGENT_BUILD_DIR=${BUILD_DIR}/ambari-agent/target/ambari-agent-*
-AGENT_DEST_DIR=/usr/lib/python2.6/site-packages/ambari_agent
+AGENT_BUILD_DIR=$(find ${BUILD_DIR}/ambari-agent/target -type d -name 'ambari-agent-*')
cp -ra $AGENT_BUILD_DIR/* ${PREFIX}/
cp -a $SOURCE_DIR/ambari-common/src/main/unix/ambari-python-wrap ${PREFIX}/${VAR_LIB_DIR}
rm -rf ${PREFIX}/var/lib/ambari-agent/cache/stacks/HDP*
-
-#Ambari Groovy Client
-
-
-PREFIX_AMBARI_CLIENT=${PREFIX}/${LIB_DIR_CLIENT}
-CLIENT_BUILD_DIR=${BUILD_DIR}/ambari-client/groovy-client
-SHELL_BUILD_DIR=${BUILD_DIR}/ambari-shell/ambari-groovy-shell/
-
-install -d -m 0755 ${PREFIX_AMBARI_CLIENT}/lib
-cp -a ${CLIENT_BUILD_DIR}/target/groovy-client*.jar ${PREFIX_AMBARI_CLIENT}/lib
-cp -a ${SHELL_BUILD_DIR}/target/ambari-groovy-shell-*.jar ${PREFIX_AMBARI_CLIENT}/lib
-
-install -d -m 0755 ${PREFIX}/usr/bin
-cat > ${PREFIX}/usr/bin/ambari-shell <<'__EOT__'
-#!/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.
-
-# Autodetect JAVA_HOME if not defined
-source /usr/lib/bigtop-utils/bigtop-detect-javahome 2>/dev/null || :
-
-JAVA=${JAVA:-java}
-[ -n "$JAVA_HOME" ] && JAVA=${JAVA:-$JAVA_HOME/bin/java}
-
-$JAVA -jar /usr/lib/ambari-client/lib/ambari-groovy-shell-*.jar --ambari.server=${AMBARI_SERVER:-localhost} \
- --ambari.port=${AMBARI_PORT:-8080} \
- --ambari.user=${AMBARI_USER:-admin} \
- --ambari.password=${AMBARI_PASSWD:-admin}
-__EOT__
-chmod 755 ${PREFIX}/usr/bin/ambari-shell
-
-#Ambari Python Client
-
-LIB_DIR=/usr/lib
-CLIENT_BUILD_DIR=${SOURCE_DIR}/ambari-client/python-client
-
-#install -d -m 0755 ${PREFIX_GROOVY_CLIENT}/${LIB_DIR}
-#cp -a ${CLIENT_BUILD_DIR}/src/main/python-client ${PREFIX_GROOVY_CLIENT}/${LIB_DIR}
diff --git a/bigtop-packages/src/common/ambari/patch1-AMBARI-storm.diff b/bigtop-packages/src/common/ambari/patch1-AMBARI-storm.diff
deleted file mode 100644
index 5780885..0000000
--- a/bigtop-packages/src/common/ambari/patch1-AMBARI-storm.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruaN apache-ambari-2.5.0-src.orig/ambari-metrics/ambari-metrics-storm-sink/pom.xml apache-ambari-2.5.0-src/ambari-metrics/ambari-metrics-storm-sink/pom.xml
---- apache-ambari-2.5.0-src.orig/ambari-metrics/ambari-metrics-storm-sink/pom.xml 2017-03-28 02:46:34.000000000 +0200
-+++ apache-ambari-2.5.0-src/ambari-metrics/ambari-metrics-storm-sink/pom.xml 2017-04-10 22:05:35.679219116 +0200
-@@ -31,7 +31,7 @@
- <packaging>jar</packaging>
-
- <properties>
-- <storm.version>1.1.0-SNAPSHOT</storm.version>
-+ <storm.version>1.1.0</storm.version>
- </properties>
-
- <build>
diff --git a/bigtop-packages/src/common/ambari/patch2-AMBARI-phantomjs.diff b/bigtop-packages/src/common/ambari/patch2-AMBARI-phantomjs.diff
index 43fab8e..372fda1 100644
--- a/bigtop-packages/src/common/ambari/patch2-AMBARI-phantomjs.diff
+++ b/bigtop-packages/src/common/ambari/patch2-AMBARI-phantomjs.diff
@@ -1,5 +1,5 @@
diff --git a/ambari-admin/src/main/resources/ui/admin-web/package.json b/ambari-admin/src/main/resources/ui/admin-web/package.json
-index efcd9d4..785e674 100644
+index 24cb68af32..2b4009d5f7 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/package.json
+++ b/ambari-admin/src/main/resources/ui/admin-web/package.json
@@ -23,8 +23,6 @@
@@ -7,30 +7,24 @@
"karma-jasmine": "0.1.5",
"karma-ng-html2js-preprocessor": "^0.1.0",
- "karma-phantomjs-launcher": "0.1",
-- "phantomjs": "1.9.20",
+- "phantomjs": "^2.1.7",
"protractor": "1.0.0"
},
"scripts": {
diff --git a/ambari-web/package.json b/ambari-web/package.json
-index 92ac968..7dd43f4 100644
+index 785925e80b..9cc8d76666 100644
--- a/ambari-web/package.json
+++ b/ambari-web/package.json
-@@ -19,10 +19,7 @@
- "cssstyle": "0.2.3"
- },
- "devDependencies": {
-- "phantomjs": "~2.1.0",
- "mocha":"2.5.3",
+@@ -33,12 +33,8 @@
+ "karma-coverage": "~0.2.0",
+ "karma-ember-precompiler-brunch": "^1.0.0",
+ "karma-mocha": "0.1.1",
+- "karma-phantomjs-launcher": "1.0.2",
+ "karma-sinon": "~1.0.2",
+ "mocha": "2.5.3",
- "mocha-phantomjs": "~4.1.0",
- "mocha-phantomjs-core": "~2.1.0",
- "chai":"~3.5.0",
- "sinon":"=1.7.3",
- "sinon-chai":"~2.8.0",
-@@ -31,7 +28,6 @@
- "karma-mocha": "0.1.1",
- "karma-chai": "~0.1.0",
- "karma-sinon": "~1.0.2",
-- "karma-phantomjs-launcher": "1.0.2",
- "karma-coverage": "~0.2.0",
- "karma-commonjs-require": "~0.0.1",
- "karma-ember-precompile-brunch": "^0.0.1"
+- "phantomjs": "~2.1.0",
+ "sinon": "=1.7.3",
+ "sinon-chai": "~2.8.0"
+ },
diff --git a/bigtop-packages/src/common/ambari/patch3-AMBARI-25499.diff b/bigtop-packages/src/common/ambari/patch3-AMBARI-25499.diff
index 82b1e01..07fb7b2 100644
--- a/bigtop-packages/src/common/ambari/patch3-AMBARI-25499.diff
+++ b/bigtop-packages/src/common/ambari/patch3-AMBARI-25499.diff
@@ -1,5 +1,5 @@
diff --git a/ambari-admin/src/main/resources/ui/admin-web/package.json b/ambari-admin/src/main/resources/ui/admin-web/package.json
-index efcd9d4be6..b37054184d 100644
+index 2b4009d5f7..1526510dc0 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/package.json
+++ b/ambari-admin/src/main/resources/ui/admin-web/package.json
@@ -3,7 +3,7 @@
@@ -9,5 +9,5 @@
- "bower": "1.3.8",
+ "bower": "1.8.8",
"gulp": "^3.8.8",
+ "gulp-add-src": "^0.2.0",
"gulp-autoprefixer": "0.0.7",
- "gulp-bower-files": "0.2.1",
diff --git a/bigtop-packages/src/common/ambari/patch4-AMBARI-CentOS8.diff b/bigtop-packages/src/common/ambari/patch4-AMBARI-CentOS8.diff
index 83b0b47..83546a5 100644
--- a/bigtop-packages/src/common/ambari/patch4-AMBARI-CentOS8.diff
+++ b/bigtop-packages/src/common/ambari/patch4-AMBARI-CentOS8.diff
@@ -1,5 +1,5 @@
diff --git a/ambari-agent/src/main/package/dependencies.properties b/ambari-agent/src/main/package/dependencies.properties
-index 07b0b68319..9cfc2daeb5 100644
+index ec64264df4..0d4c64734f 100644
--- a/ambari-agent/src/main/package/dependencies.properties
+++ b/ambari-agent/src/main/package/dependencies.properties
@@ -28,5 +28,5 @@
@@ -7,16 +7,28 @@
# however should be encouraged manually in pom.xml.
-rpm.dependency.list=openssl,\nRequires: rpm-python,\nRequires: zlib,\nRequires: python >= 2.6
--deb.dependency.list=openssl, zlibc, python (>= 2.6)
+-deb.dependency.list=openssl, python (>= 2.6)
\ No newline at end of file
+rpm.dependency.list=openssl,\nRequires: zlib,\nRequires: python2 >= 2.6
-+deb.dependency.list=openssl, zlibc, python (>= 2.6)
-diff --git a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py b/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
-index 799cf3eed0..bc066e6318 100644
---- a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
-+++ b/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
-@@ -359,17 +359,13 @@ class RPMBasedPackageProvider(PackageProvider):
- INSTALLED_PACKAGE_VERSION_COMMAND = "rpm -q --queryformat '%{{version}}-%{{release}}' \"{0}\""
++deb.dependency.list=openssl, python (>= 2.6)
+diff --git a/ambari-common/src/main/python/ambari_commons/repo_manager/yum_manager.py b/ambari-common/src/main/python/ambari_commons/repo_manager/yum_manager.py
+index e3df80ecea..392871c83f 100644
+--- a/ambari-common/src/main/python/ambari_commons/repo_manager/yum_manager.py
++++ b/ambari-common/src/main/python/ambari_commons/repo_manager/yum_manager.py
+@@ -274,10 +274,7 @@ class YumManager(GenericManager):
+ we should not rely on that.
+ """
+
+- if os.geteuid() == 0:
+- return self.yum_check_package_available(name)
+- else:
+- return self.rpm_check_package_available(name)
++ return self.rpm_check_package_available(name)
+
+ def yum_check_package_available(self, name):
+ """
+@@ -342,17 +339,13 @@ class YumManager(GenericManager):
+ return set(repo_ids)
def rpm_check_package_available(self, name):
- import rpm # this is faster then calling 'rpm'-binary externally.
@@ -36,22 +48,6 @@
def get_installed_package_version(self, package_name):
version = None
-diff --git a/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py b/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py
-index da2a3b1de1..503644137c 100644
---- a/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py
-+++ b/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py
-@@ -305,10 +305,7 @@ class YumProvider(RPMBasedPackageProvider):
- yum in inconsistant state (locked, used, having invalid repo). Once packages are installed
- we should not rely on that.
- """
-- if os.geteuid() == 0:
-- return self.yum_check_package_available(name)
-- else:
-- return self.rpm_check_package_available(name)
-+ return self.rpm_check_package_available(name)
-
- def yum_check_package_available(self, name):
- """
diff --git a/ambari-server/src/main/package/dependencies.properties b/ambari-server/src/main/package/dependencies.properties
index 01244a8375..70205d5dc6 100644
--- a/ambari-server/src/main/package/dependencies.properties
diff --git a/bigtop-packages/src/common/ambari/patch5-AMBARI-25599.diff b/bigtop-packages/src/common/ambari/patch5-AMBARI-25599.diff
new file mode 100644
index 0000000..8d723cf
--- /dev/null
+++ b/bigtop-packages/src/common/ambari/patch5-AMBARI-25599.diff
@@ -0,0 +1,71 @@
+commit 4beb51d38a3361d9d2e7d349b8b3dd203772d7ce
+Author: Szilárd Antal <santal@cloudera.com>
+Date: Wed Feb 17 11:09:21 2021 +0100
+
+ AMBARI-25599 Consider to eliminate HDP public binary references (santal) (#3283)
+
+ Change-Id: I7a560a7c2d6ff6c3681fc384d51c23bbb36330c8
+ (cherry picked from commit 2e60a76ced3e4ecf1c4356c9727821fe66e8986c)
+
+ Conflicts:
+ ambari-metrics/ambari-metrics-timelineservice/pom.xml
+ ambari-metrics/pom.xml
+
+diff --git a/ambari-infra/ambari-infra-assembly/pom.xml b/ambari-infra/ambari-infra-assembly/pom.xml
+index 65a630069e..ef4a062960 100644
+--- a/ambari-infra/ambari-infra-assembly/pom.xml
++++ b/ambari-infra/ambari-infra-assembly/pom.xml
+@@ -29,8 +29,7 @@
+
+ <properties>
+ <mapping.base.path>/usr/lib</mapping.base.path>
+- <!-- original url: <solr.tar>http://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.tgz</solr.tar> -->
+- <solr.tar>https://public-repo-1.hortonworks.com/ARTIFACTS/dist/lucene/solr/${solr.version}/solr-${solr.version}.tgz</solr.tar>
++ <solr.tar>http://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.tgz</solr.tar>
+ <solr.mapping.path>${mapping.base.path}/ambari-infra-solr</solr.mapping.path>
+ <solr.package.name>ambari-infra-solr</solr.package.name>
+ <solr.client.package.name>ambari-infra-solr-client</solr.client.package.name>
+diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+index f8423b3806..95f9cac688 100644
+--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
++++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+@@ -34,9 +34,9 @@
+ <!-- Needed for generating FindBugs warnings using parent pom -->
+ <!--<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>-->
+ <protobuf.version>2.5.0</protobuf.version>
+- <hadoop.version>3.1.1.3.1.4.0-315</hadoop.version>
+- <phoenix.version>5.0.0.3.1.4.0-315</phoenix.version>
+- <hbase.version>2.0.2.3.1.4.0-315</hbase.version>
++ <hadoop.version>3.1.1</hadoop.version>
++ <phoenix.version>5.0.0-HBase-2.0</phoenix.version>
++ <hbase.version>2.0.2</hbase.version>
+ </properties>
+
+ <build>
+diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
+index a0a11b8e6e..282041fab6 100644
+--- a/ambari-metrics/pom.xml
++++ b/ambari-metrics/pom.xml
+@@ -40,14 +40,14 @@
+ <python.ver>python >= 2.6</python.ver>
+ <deb.python.ver>python (>= 2.6)</deb.python.ver>
+ <!--TODO change to HDP URL-->
+- <hbase.tar>https://s3.amazonaws.com/dev.hortonworks.com/HDP/centos7/3.x/BUILDS/3.1.4.0-315/tars/hbase/hbase-2.0.2.3.1.4.0-315-bin.tar.gz</hbase.tar>
+- <hbase.folder>hbase-2.0.2.3.1.4.0-315</hbase.folder>
+- <hadoop.tar>https://s3.amazonaws.com/dev.hortonworks.com/HDP/centos7/3.x/BUILDS/3.1.4.0-315/tars/hadoop/hadoop-3.1.1.3.1.4.0-315.tar.gz</hadoop.tar>
+- <hadoop.folder>hadoop-3.1.1.3.1.4.0-315</hadoop.folder>
+- <grafana.folder>grafana-6.4.2</grafana.folder>
+- <grafana.tar>https://dl.grafana.com/oss/release/grafana-6.4.2.linux-amd64.tar.gz</grafana.tar>
+- <phoenix.tar>https://s3.amazonaws.com/dev.hortonworks.com/HDP/centos7/3.x/BUILDS/3.1.4.0-315/tars/phoenix/phoenix-5.0.0.3.1.4.0-315.tar.gz</phoenix.tar>
+- <phoenix.folder>phoenix-5.0.0.3.1.4.0-315</phoenix.folder>
++ <hbase.tar>https://archive.apache.org/dist/hbase/2.0.2/hbase-2.0.2-bin.tar.gz</hbase.tar>
++ <hbase.folder>hbase-2.0.2</hbase.folder>
++ <hadoop.tar>https://archive.apache.org/dist/hadoop/common/hadoop-3.1.1/hadoop-3.1.1.tar.gz</hadoop.tar>
++ <hadoop.folder>hadoop-3.1.1</hadoop.folder>
++ <grafana.folder>grafana-6.7.4</grafana.folder>
++ <grafana.tar>https://dl.grafana.com/oss/release/grafana-6.7.4.linux-amd64.tar.gz</grafana.tar>
++ <phoenix.tar>https://downloads.apache.org/phoenix/apache-phoenix-5.0.0-HBase-2.0/bin/apache-phoenix-5.0.0-HBase-2.0-bin.tar.gz</phoenix.tar>
++ <phoenix.folder>apache-phoenix-5.0.0-HBase-2.0-bin</phoenix.folder>
+ <resmonitor.install.dir>/usr/lib/python2.6/site-packages/resource_monitoring</resmonitor.install.dir>
+ <powermock.version>1.6.2</powermock.version>
+ <distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId>
diff --git a/bigtop-packages/src/common/ambari/patch5-AMBARI-spring-boot-maven-plugin.diff b/bigtop-packages/src/common/ambari/patch5-AMBARI-spring-boot-maven-plugin.diff
deleted file mode 100644
index f40b7d4..0000000
--- a/bigtop-packages/src/common/ambari/patch5-AMBARI-spring-boot-maven-plugin.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/ambari-shell/ambari-groovy-shell/pom.xml b/ambari-shell/ambari-groovy-shell/pom.xml
-index 34dfce1585..8d1e1a8530 100644
---- a/ambari-shell/ambari-groovy-shell/pom.xml
-+++ b/ambari-shell/ambari-groovy-shell/pom.xml
-@@ -114,7 +114,8 @@
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
-- <version>1.0.2.RELEASE</version>
-+ <!-- Upgrade to avoid build error on fedora-31-aarch64 -->
-+ <version>2.3.0.RELEASE</version>
- <executions>
- <execution>
- <goals>
diff --git a/bigtop-packages/src/deb/ambari/ambari-agent.install b/bigtop-packages/src/deb/ambari/ambari-agent.install
index ff2d7cd..92af798 100644
--- a/bigtop-packages/src/deb/ambari/ambari-agent.install
+++ b/bigtop-packages/src/deb/ambari/ambari-agent.install
@@ -2,7 +2,6 @@
/etc/init.d/ambari-agent
/var/lib/ambari-agent/bin/ambari-agent
/usr/lib/ambari-agent
-/usr/lib/python2.6/site-packages/ambari_agent
/var/run/
/var/lib/ambari-agent
/var/log/
diff --git a/bigtop-packages/src/deb/ambari/ambari-client.install b/bigtop-packages/src/deb/ambari/ambari-client.install
deleted file mode 100644
index 0b76f70..0000000
--- a/bigtop-packages/src/deb/ambari/ambari-client.install
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/ambari-client
-/usr/bin/ambari-shell
diff --git a/bigtop-packages/src/deb/ambari/ambari-server.install b/bigtop-packages/src/deb/ambari/ambari-server.install
index da52c38..a4b0344 100644
--- a/bigtop-packages/src/deb/ambari/ambari-server.install
+++ b/bigtop-packages/src/deb/ambari/ambari-server.install
@@ -3,7 +3,6 @@
/etc/ambari-server
/usr/sbin/ambari-server.py
/usr/sbin/ambari_server_main.py
-/usr/lib/python2.6/site-packages/ambari_server
/usr/lib/ambari-server
/var/run/ambari-server
/var/lib/ambari-server
diff --git a/bigtop-packages/src/deb/ambari/control b/bigtop-packages/src/deb/ambari/control
index 2ca1fe5..0fdbc04 100644
--- a/bigtop-packages/src/deb/ambari/control
+++ b/bigtop-packages/src/deb/ambari/control
@@ -30,8 +30,3 @@
Architecture: all
Depends: openssl, python (>= 2.6), curl
Description: Ambari Agent
-
-Package: ambari-client
-Architecture: all
-Depends: bigtop-utils (>= 0.7)
-Description: Ambari Client
diff --git a/bigtop-packages/src/deb/ambari/rules b/bigtop-packages/src/deb/ambari/rules
index 3943347..06876cf 100644
--- a/bigtop-packages/src/deb/ambari/rules
+++ b/bigtop-packages/src/deb/ambari/rules
@@ -40,3 +40,5 @@
--distro-dir=debian \
--source-dir=`pwd` \
--prefix=debian/tmp
+
+override_dh_strip_nondeterminism:
diff --git a/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec b/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec
index 9d82422..80b6f78 100644
--- a/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec
+++ b/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec
@@ -441,13 +441,6 @@
exit 0
-%package client
-Summary: Ambari Client
-Group: Development/Libraries
-Requires: bigtop-utils >= 0.7
-%description client
-Ambari Client
-
%files server
%attr(644,root,root) /etc/init/ambari-server.conf
%defattr(644,root,root,755)
@@ -465,7 +458,6 @@
%attr(755,root,root) /var/lib/ambari-server/resources/stacks/stack_advisor.py
%dir %attr(755,root,root) /var/lib/ambari-server/data/tmp
%dir %attr(700,root,root) /var/lib/ambari-server/data/cache
-%attr(755,root,root) /var/lib/ambari-server/resources/apps
%attr(755,root,root) /var/lib/ambari-server/resources/scripts
%attr(755,root,root) /var/lib/ambari-server/resources/views
%attr(755,root,root) /var/lib/ambari-server/resources/custom_actions
@@ -475,11 +467,9 @@
%dir /var/run/ambari-server/bootstrap
%dir /var/run/ambari-server/stack-recommendations
%dir /var/log/ambari-server
-%attr(755,root,root) /usr/lib/python2.6/site-packages/ambari_server
%files agent
%attr(644,root,root) /etc/init/ambari-agent.conf
-%attr(-,root,root) /usr/lib/python2.6/site-packages/ambari_agent
%attr(755,root,root) /var/lib/ambari-agent/ambari-python-wrap
%attr(755,root,root) /var/lib/ambari-agent/ambari-sudo.sh
%attr(-,root,root) /usr/lib/ambari-agent/lib/ambari_commons
@@ -503,8 +493,3 @@
%attr(755,root,root) /var/lib/ambari-agent/cache
%attr(755,root,root) /var/lib/ambari-agent/cred
%attr(755,root,root) /var/lib/ambari-agent/tools
-
-%files client
-%defattr(644,root,root,755)
-/usr/lib/ambari-client
-%attr(755,root,root) /usr/bin/ambari-shell
diff --git a/bigtop.bom b/bigtop.bom
index 1076f42..9659aea 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -329,7 +329,7 @@
'ambari' {
name = 'ambari'
relNotes = 'Apache Ambari'
- version { base = '2.6.1'; pkg = '2.6.1.0'; release = 1 }
+ version { base = '2.7.5'; pkg = '2.7.5.0'; release = 1 }
tarball { destination = "apache-$name-${version.base}-src.tar.gz"
source = destination }
url { download_path = "/$name/$name-${version.base}/"
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index f25e79f..d97cc17 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -207,6 +207,7 @@
"bison",
"flex",
"python-dev",
+ "python-setuptools",
"libffi-dev"
]
file { '/etc/apt/apt.conf.d/01retries':
