You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ev...@apache.org on 2017/07/01 07:44:56 UTC
bigtop git commit: BIGTOP-2828. Since BIGTOP-2775 JDK version has
been specified by Bigtop Puppet
Repository: bigtop
Updated Branches:
refs/heads/master 38002e9da -> a86f588ce
BIGTOP-2828. Since BIGTOP-2775 JDK version has been specified by Bigtop Puppet
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/a86f588c
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/a86f588c
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/a86f588c
Branch: refs/heads/master
Commit: a86f588cedbc4e7a8e55bdead3f324790ae99456
Parents: 38002e9
Author: Evans Ye <ev...@apache.org>
Authored: Sat Jul 1 15:30:04 2017 +0800
Committer: Evans Ye <ev...@apache.org>
Committed: Sat Jul 1 15:44:52 2017 +0800
----------------------------------------------------------------------
bigtop-deploy/puppet/README.md | 1 -
docker/pseudo-cluster/config/hieradata/site.yaml | 1 -
docker/sandbox/build.sh | 16 ----------------
docker/sandbox/sandbox-env.sh | 3 ---
docker/sandbox/site.yaml.template.centos-6_hadoop | 1 -
docker/sandbox/site.yaml.template.debian-8_hadoop | 1 -
6 files changed, 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a86f588c/bigtop-deploy/puppet/README.md
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/README.md b/bigtop-deploy/puppet/README.md
index a2f7fb1..ddb79a5 100644
--- a/bigtop-deploy/puppet/README.md
+++ b/bigtop-deploy/puppet/README.md
@@ -136,7 +136,6 @@ hadoop_cluster_node::cluster_components:
- spark
- yarn
- zookeeper
-bigtop::jdk_package_name: "openjdk-7-jre-headless"
bigtop::bigtop_repo_uri: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/ubuntu/16.04/x86_64"
```
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a86f588c/docker/pseudo-cluster/config/hieradata/site.yaml
----------------------------------------------------------------------
diff --git a/docker/pseudo-cluster/config/hieradata/site.yaml b/docker/pseudo-cluster/config/hieradata/site.yaml
index 3e9ebc4..eb33840 100644
--- a/docker/pseudo-cluster/config/hieradata/site.yaml
+++ b/docker/pseudo-cluster/config/hieradata/site.yaml
@@ -7,5 +7,4 @@ hadoop_cluster_node::cluster_components:
- yarn
- mapreduce
bigtop::bigtop_repo_uri: http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/ubuntu/16.04/x86_64
-bigtop::jdk_package_name: openjdk-8-jdk
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a86f588c/docker/sandbox/build.sh
----------------------------------------------------------------------
diff --git a/docker/sandbox/build.sh b/docker/sandbox/build.sh
index 58a76e7..8910f93 100755
--- a/docker/sandbox/build.sh
+++ b/docker/sandbox/build.sh
@@ -41,7 +41,6 @@ bigtop::hadoop_head_node: ${HEAD_NODE:-"head.node.fqdn"}
hadoop::hadoop_storage_dirs: [/data/1, /data/2]
bigtop::bigtop_repo_uri: ${REPO}
hadoop_cluster_node::cluster_components: [${COMPONENTS}]
-bigtop::jdk_package_name: ${JDK}
EOF
}
@@ -64,15 +63,6 @@ generate_tag() {
fi
}
-detect_jdk() {
- for RPM in ${RPMS[*]}; do
- [[ $OS == $RPM ]] && JDK=$RPM_JDK
- done
- for DEB in ${DEBS[*]}; do
- [[ $OS == $DEB ]] && JDK=$DEB_JDK
- done
-}
-
detect_repo() {
OS_SEP_BY_SLASH=${OS/-//}
REPO=${REPO:-"http://bigtop-repos.s3.amazonaws.com/releases/${BIGTOP_VERSION}/${OS_SEP_BY_SLASH}/x86_64"}
@@ -103,10 +93,6 @@ deploy_config_validator() {
echo "repository unset!"
invalid=0
fi
- if [ -z "$JDK" ]; then
- echo "jdk unset!"
- invalid=0
- fi
if [ -z "$COMPONENTS" ]; then
echo "components unset!"
invalid=0
@@ -131,7 +117,6 @@ show_deploy_configs() {
echo "DEPLOY CONFIGS:"
echo "REPOSITORY $REPO"
echo "COMPONENTS $COMPONENTS"
- echo "JDK $JDK"
echo "-------------------------------------------------"
}
@@ -202,7 +187,6 @@ image_config_validator
show_image_configs
if [ -z "$FILE" ]; then
- detect_jdk
detect_repo
deploy_config_validator
generate_config
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a86f588c/docker/sandbox/sandbox-env.sh
----------------------------------------------------------------------
diff --git a/docker/sandbox/sandbox-env.sh b/docker/sandbox/sandbox-env.sh
index 7e367e1..e1599d5 100644
--- a/docker/sandbox/sandbox-env.sh
+++ b/docker/sandbox/sandbox-env.sh
@@ -24,10 +24,7 @@ RPMS=( \
fedora-25 \
opensuse-42.1 \
)
-RPM_JDK=java-1.8.0-openjdk-devel.x86_64
-
DEBS=( \
debian-8 \
ubuntu-16.04 \
)
-DEB_JDK=openjdk-8-jdk
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a86f588c/docker/sandbox/site.yaml.template.centos-6_hadoop
----------------------------------------------------------------------
diff --git a/docker/sandbox/site.yaml.template.centos-6_hadoop b/docker/sandbox/site.yaml.template.centos-6_hadoop
index 51fd682..db49e48 100644
--- a/docker/sandbox/site.yaml.template.centos-6_hadoop
+++ b/docker/sandbox/site.yaml.template.centos-6_hadoop
@@ -17,4 +17,3 @@ bigtop::hadoop_head_node: "head.node.fqdn"
hadoop::hadoop_storage_dirs: [/data/1, /data/2]
bigtop::bigtop_repo_uri: http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/centos/6/x86_64
hadoop_cluster_node::cluster_components: [hdfs, yarn, mapred-app]
-bigtop::jdk_package_name: java-1.8.0-openjdk-devel.x86_64
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a86f588c/docker/sandbox/site.yaml.template.debian-8_hadoop
----------------------------------------------------------------------
diff --git a/docker/sandbox/site.yaml.template.debian-8_hadoop b/docker/sandbox/site.yaml.template.debian-8_hadoop
index 21c5d9d..1bbae6c 100644
--- a/docker/sandbox/site.yaml.template.debian-8_hadoop
+++ b/docker/sandbox/site.yaml.template.debian-8_hadoop
@@ -17,4 +17,3 @@ bigtop::hadoop_head_node: "head.node.fqdn"
hadoop::hadoop_storage_dirs: [/data/1, /data/2]
bigtop::bigtop_repo_uri: http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/debian/8/x86_64
hadoop_cluster_node::cluster_components: [hdfs, yarn, mapred-app]
-bigtop::jdk_package_name: openjdk-8-jdk