This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new fea47230 BIGTOP-3930. Fix deployment failure on Ubuntu 22.04 due to
unavailable dependency on python. (#1114)
fea47230 is described below
commit fea47230cd6d239b278a9ad278f05edc44ed3c9a
Author: Masatake Iwasaki <[email protected]>
AuthorDate: Tue Jun 27 16:24:17 2023 +0900
BIGTOP-3930. Fix deployment failure on Ubuntu 22.04 due to unavailable
dependency on python. (#1114)
(cherry picked from commit becee0bc81fbad3d41af23669c6e74a6ded91435)
---
.../puppet/manifests/python.pp | 20 ++++++++------------
bigtop-deploy/puppet/manifests/site.pp | 2 ++
bigtop-packages/src/deb/ambari/control | 4 ++--
bigtop-packages/src/deb/bigtop-ambari-mpack/control | 2 +-
bigtop-packages/src/deb/gpdb/control | 2 +-
bigtop-packages/src/deb/hive/control | 4 ++--
bigtop-packages/src/deb/phoenix/control | 2 +-
bigtop-packages/src/deb/spark/control | 2 +-
bigtop-packages/src/deb/ycsb/control | 2 +-
9 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/bigtop-packages/src/deb/bigtop-ambari-mpack/control
b/bigtop-deploy/puppet/manifests/python.pp
similarity index 70%
copy from bigtop-packages/src/deb/bigtop-ambari-mpack/control
copy to bigtop-deploy/puppet/manifests/python.pp
index b610bf2d..65c87bfc 100644
--- a/bigtop-packages/src/deb/bigtop-ambari-mpack/control
+++ b/bigtop-deploy/puppet/manifests/python.pp
@@ -13,15 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Source: bigtop-ambari-mpack
-Section: misc
-Priority: extra
-Maintainer: Bigtop <[email protected]>
-Build-Depends: debhelper (>= 6)
-Standards-Version: 3.8.0
-Homepage: http://ambari.apache.org/
-
-Package: bigtop-ambari-mpack
-Architecture: all
-Depends: openssl, postgresql (>= 8.1), python (>= 2.6), curl
-Description: Ambari Mpack
+class python {
+ if (($operatingsystem == 'Ubuntu' and 0 <=
versioncmp($operatingsystemmajrelease, '22.04'))) {
+ file { '/usr/bin/python':
+ ensure => 'link',
+ target => '/usr/bin/python2',
+ }
+ }
+}
diff --git a/bigtop-deploy/puppet/manifests/site.pp
b/bigtop-deploy/puppet/manifests/site.pp
index 4763db65..a78bb4be 100644
--- a/bigtop-deploy/puppet/manifests/site.pp
+++ b/bigtop-deploy/puppet/manifests/site.pp
@@ -33,6 +33,8 @@ node default {
} else {
include node_with_components
}
+
+ include python
}
if versioncmp($::puppetversion,'3.6.1') >= 0 {
diff --git a/bigtop-packages/src/deb/ambari/control
b/bigtop-packages/src/deb/ambari/control
index 0fdbc047..ae886230 100644
--- a/bigtop-packages/src/deb/ambari/control
+++ b/bigtop-packages/src/deb/ambari/control
@@ -23,10 +23,10 @@ Homepage: http://ambari.apache.org/
Package: ambari-server
Architecture: all
-Depends: openssl, postgresql (>= 8.1), python (>= 2.6), curl
+Depends: openssl, postgresql (>= 8.1), python (>= 2.6) | python2 (>= 2.6), curl
Description: Ambari Server
Package: ambari-agent
Architecture: all
-Depends: openssl, python (>= 2.6), curl
+Depends: openssl, python (>= 2.6) | python2 (>= 2.6), curl
Description: Ambari Agent
diff --git a/bigtop-packages/src/deb/bigtop-ambari-mpack/control
b/bigtop-packages/src/deb/bigtop-ambari-mpack/control
index b610bf2d..590e385a 100644
--- a/bigtop-packages/src/deb/bigtop-ambari-mpack/control
+++ b/bigtop-packages/src/deb/bigtop-ambari-mpack/control
@@ -23,5 +23,5 @@ Homepage: http://ambari.apache.org/
Package: bigtop-ambari-mpack
Architecture: all
-Depends: openssl, postgresql (>= 8.1), python (>= 2.6), curl
+Depends: openssl, postgresql (>= 8.1), python (>= 2.6) | python2 (>= 2.6), curl
Description: Ambari Mpack
diff --git a/bigtop-packages/src/deb/gpdb/control
b/bigtop-packages/src/deb/gpdb/control
index 1d4cc1e2..80c6f338 100644
--- a/bigtop-packages/src/deb/gpdb/control
+++ b/bigtop-packages/src/deb/gpdb/control
@@ -22,6 +22,6 @@ Homepage: https://github.com/greenplum-db/gpdb
Package: gpdb
Architecture: any
-Depends: ${shlibs:Depends}, bigtop-utils (>= 0.7), gcc, libffi-dev,
libssl-dev, make, python-dev (>= 2.6), python-dev (<< 3)
+Depends: ${shlibs:Depends}, bigtop-utils (>= 0.7), gcc, libffi-dev,
libssl-dev, make, python-dev (>= 2.6) | python2-dev (>= 2.6), python-dev (<< 3)
| python2-dev
Description: Greenplum MPP database engine
Provides the Greenplum MPP database engine
diff --git a/bigtop-packages/src/deb/hive/control
b/bigtop-packages/src/deb/hive/control
index 9a83ae56..da0e7000 100644
--- a/bigtop-packages/src/deb/hive/control
+++ b/bigtop-packages/src/deb/hive/control
@@ -25,7 +25,7 @@ Homepage: http://hive.apache.org/
Package: hive
Architecture: all
Depends: adduser, hadoop-client, bigtop-utils (>= 0.7), zookeeper,
- hive-jdbc (= ${source:Version}), python
+ hive-jdbc (= ${source:Version}), python | python2
Description: Data warehouse infrastructure built on top of Hadoop
Hive is a data warehouse infrastructure built on top of Hadoop that provides
tools to enable easy data summarization, adhoc querying and analysis of large
@@ -66,7 +66,7 @@ Description: Provides libraries necessary to connect to
Apache Hive via JDBC
Package: hive-hcatalog
Architecture: all
-Depends: hadoop, hive, bigtop-utils (>= 0.6), python
+Depends: hadoop, hive, bigtop-utils (>= 0.6), python | python2
Description: Table and storage management service for Apache Hadoop.
This includes:
* Providing a shared schema and data type mechanism.
diff --git a/bigtop-packages/src/deb/phoenix/control
b/bigtop-packages/src/deb/phoenix/control
index ab0ea63f..6b01c07f 100644
--- a/bigtop-packages/src/deb/phoenix/control
+++ b/bigtop-packages/src/deb/phoenix/control
@@ -23,7 +23,7 @@ Homepage: http://phoenix.apache.org
Package: phoenix
Architecture: all
-Depends: bigtop-utils (>= 0.7), python (>= 2.6)
+Depends: bigtop-utils (>= 0.7), python (>= 2.6) | python2 (>= 2.6)
Description: Phoenix is a SQL skin over HBase and client-embedded JDBC driver.
Phoenix is a SQL skin over HBase, delivered as a client-embedded JDBC driver.
The Phoenix query engine transforms an SQL query into one or more HBase scans,
diff --git a/bigtop-packages/src/deb/spark/control
b/bigtop-packages/src/deb/spark/control
index b566f442..a8f49e71 100644
--- a/bigtop-packages/src/deb/spark/control
+++ b/bigtop-packages/src/deb/spark/control
@@ -45,7 +45,7 @@ Description: Server for Spark worker
Package: spark-python
Architecture: all
-Depends: spark-core (= ${source:Version}), python
+Depends: spark-core (= ${source:Version}), python | python2
Description: Python client for Spark
Includes PySpark, an interactive Python shell for Spark, and related libraries
diff --git a/bigtop-packages/src/deb/ycsb/control
b/bigtop-packages/src/deb/ycsb/control
index eea06447..df4232be 100644
--- a/bigtop-packages/src/deb/ycsb/control
+++ b/bigtop-packages/src/deb/ycsb/control
@@ -23,7 +23,7 @@ Homepage:
http://labs.yahoo.com/news/yahoo-cloud-serving-benchmark
Package: ycsb
Architecture: all
-Depends: python
+Depends: python | python2
Description: The Yahoo! Cloud Serving Benchmark (YCSB) is an open-source
specification and program suite for evaluating retrieval and
maintenance capabilities of computer programs. It is often used to
