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/10/10 16:54:04 UTC
[2/2] bigtop git commit: Update repo URL to repos.bigtop.apache.org
Update repo URL to repos.bigtop.apache.org
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6c38d542
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6c38d542
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6c38d542
Branch: refs/heads/branch-1.2
Commit: 6c38d542a4699694cafa829f2cc139e71add0ca3
Parents: 85be63f
Author: Evans Ye <ev...@apache.org>
Authored: Wed Oct 11 00:53:34 2017 +0800
Committer: Evans Ye <ev...@apache.org>
Committed: Wed Oct 11 00:53:34 2017 +0800
----------------------------------------------------------------------
bigtop-deploy/puppet/README.md | 2 +-
bigtop-deploy/puppet/manifests/bigtop_repo.pp | 4 ++--
docker/pseudo-cluster/config/hieradata/site.yaml | 2 +-
docker/sandbox/build.sh | 2 +-
docker/sandbox/site.yaml.template.centos-6_hadoop | 2 +-
docker/sandbox/site.yaml.template.debian-8_hadoop | 2 +-
provisioner/docker/config_centos-6.yaml | 2 +-
provisioner/docker/config_centos-7.yaml | 2 +-
provisioner/docker/config_debian-8.yaml | 2 +-
provisioner/docker/config_ubuntu-16.04.yaml | 2 +-
provisioner/vagrant/vagrantconfig.yaml | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6c38d542/bigtop-deploy/puppet/README.md
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/README.md b/bigtop-deploy/puppet/README.md
index ddb79a5..201e172 100644
--- a/bigtop-deploy/puppet/README.md
+++ b/bigtop-deploy/puppet/README.md
@@ -136,7 +136,7 @@ hadoop_cluster_node::cluster_components:
- spark
- yarn
- zookeeper
-bigtop::bigtop_repo_uri: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.0/ubuntu/16.04/x86_64"
+bigtop::bigtop_repo_uri: "http://repos.bigtop.apache.org/releases/1.2.1/ubuntu/16.04/x86_64"
```
And finally execute
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6c38d542/bigtop-deploy/puppet/manifests/bigtop_repo.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/manifests/bigtop_repo.pp b/bigtop-deploy/puppet/manifests/bigtop_repo.pp
index 48451cb..ce17858 100644
--- a/bigtop-deploy/puppet/manifests/bigtop_repo.pp
+++ b/bigtop-deploy/puppet/manifests/bigtop_repo.pp
@@ -16,7 +16,7 @@
class bigtop_repo {
case $::operatingsystem {
/(OracleLinux|Amazon|CentOS|Fedora|RedHat)/: {
- $default_repo = "http://bigtop-repos.s3.amazonaws.com/releases/1.2.1/centos/7/x86_64"
+ $default_repo = "http://repos.bigtop.apache.org/releases/1.2.1/centos/7/x86_64"
$baseurls_array = any2array(hiera("bigtop::bigtop_repo_uri", $default_repo))
each ($baseurls_array) |$count, $baseurl| {
yumrepo { "Bigtop_$count":
@@ -36,7 +36,7 @@ class bigtop_repo {
$lower_os = downcase($operatingsystem)
# We use code name such as trusty for Ubuntu instead of release version in bigtop's binary convenience repos
if ($operatingsystem == "Ubuntu") { $release = $lsbdistcodename } else { $release = $operatingsystemmajrelease }
- $default_repo = "http://bigtop-repos.s3.amazonaws.com/releases/1.2.1/${lower_os}/${release}/x86_64"
+ $default_repo = "http://repos.bigtop.apache.org/releases/1.2.1/${lower_os}/${release}/x86_64"
$baseurls_array = any2array(hiera("bigtop::bigtop_repo_uri", $default_repo))
# I couldn't enforce the sequence -> anymore because of this
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6c38d542/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 4c56bf5..45d6172 100644
--- a/docker/pseudo-cluster/config/hieradata/site.yaml
+++ b/docker/pseudo-cluster/config/hieradata/site.yaml
@@ -6,5 +6,5 @@ hadoop_cluster_node::cluster_components:
- hdfs
- yarn
- mapreduce
-bigtop::bigtop_repo_uri: http://bigtop-repos.s3.amazonaws.com/releases/1.2.1/ubuntu/16.04/x86_64
+bigtop::bigtop_repo_uri: http://repos.bigtop.apache.org/releases/1.2.1/ubuntu/16.04/x86_64
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6c38d542/docker/sandbox/build.sh
----------------------------------------------------------------------
diff --git a/docker/sandbox/build.sh b/docker/sandbox/build.sh
index 8910f93..dc67ca3 100755
--- a/docker/sandbox/build.sh
+++ b/docker/sandbox/build.sh
@@ -65,7 +65,7 @@ generate_tag() {
detect_repo() {
OS_SEP_BY_SLASH=${OS/-//}
- REPO=${REPO:-"http://bigtop-repos.s3.amazonaws.com/releases/${BIGTOP_VERSION}/${OS_SEP_BY_SLASH}/x86_64"}
+ REPO=${REPO:-"http://repos.bigtop.apache.org/releases/${BIGTOP_VERSION}/${OS_SEP_BY_SLASH}/x86_64"}
}
image_config_validator() {
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6c38d542/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 1aa2951..6e8caf2 100644
--- a/docker/sandbox/site.yaml.template.centos-6_hadoop
+++ b/docker/sandbox/site.yaml.template.centos-6_hadoop
@@ -15,5 +15,5 @@
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.1/centos/6/x86_64
+bigtop::bigtop_repo_uri: http://repos.bigtop.apache.org/releases/1.2.1/centos/6/x86_64
hadoop_cluster_node::cluster_components: [hdfs, yarn, mapred-app]
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6c38d542/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 a8d7f15..3c32a69 100644
--- a/docker/sandbox/site.yaml.template.debian-8_hadoop
+++ b/docker/sandbox/site.yaml.template.debian-8_hadoop
@@ -15,5 +15,5 @@
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.1/debian/8/x86_64
+bigtop::bigtop_repo_uri: http://repos.bigtop.apache.org/releases/1.2.1/debian/8/x86_64
hadoop_cluster_node::cluster_components: [hdfs, yarn, mapred-app]
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6c38d542/provisioner/docker/config_centos-6.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_centos-6.yaml b/provisioner/docker/config_centos-6.yaml
index c56b4f2..5f78986 100644
--- a/provisioner/docker/config_centos-6.yaml
+++ b/provisioner/docker/config_centos-6.yaml
@@ -17,7 +17,7 @@ docker:
memory_limit: "4g"
image: "bigtop/puppet:centos-6"
-repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.1/centos/6/x86_64"
+repo: "http://repos.bigtop.apache.org/releases/1.2.1/centos/6/x86_64"
distro: centos
components: [hdfs, yarn, mapreduce]
enable_local_repo: false
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6c38d542/provisioner/docker/config_centos-7.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_centos-7.yaml b/provisioner/docker/config_centos-7.yaml
index 238080b..3b1b0e0 100644
--- a/provisioner/docker/config_centos-7.yaml
+++ b/provisioner/docker/config_centos-7.yaml
@@ -17,7 +17,7 @@ docker:
memory_limit: "4g"
image: "bigtop/puppet:centos-7"
-repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.1/centos/7/x86_64"
+repo: "http://repos.bigtop.apache.org/releases/1.2.1/centos/7/x86_64"
distro: centos
components: [hdfs, yarn, mapreduce]
enable_local_repo: false
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6c38d542/provisioner/docker/config_debian-8.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_debian-8.yaml b/provisioner/docker/config_debian-8.yaml
index 467dc77..41a6cbe 100644
--- a/provisioner/docker/config_debian-8.yaml
+++ b/provisioner/docker/config_debian-8.yaml
@@ -17,7 +17,7 @@ docker:
memory_limit: "4g"
image: "bigtop/puppet:debian-8"
-repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.1/debian/8/x86_64"
+repo: "http://repos.bigtop.apache.org/releases/1.2.1/debian/8/x86_64"
distro: debian
components: [hdfs, yarn, mapreduce]
enable_local_repo: false
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6c38d542/provisioner/docker/config_ubuntu-16.04.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config_ubuntu-16.04.yaml b/provisioner/docker/config_ubuntu-16.04.yaml
index 5aab505..2568377 100644
--- a/provisioner/docker/config_ubuntu-16.04.yaml
+++ b/provisioner/docker/config_ubuntu-16.04.yaml
@@ -17,7 +17,7 @@ docker:
memory_limit: "4g"
image: "bigtop/puppet:ubuntu-16.04"
-repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.1/ubuntu/16.04/x86_64"
+repo: "http://repos.bigtop.apache.org/releases/1.2.1/ubuntu/16.04/x86_64"
distro: debian
components: [hdfs, yarn, mapreduce]
enable_local_repo: false
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6c38d542/provisioner/vagrant/vagrantconfig.yaml
----------------------------------------------------------------------
diff --git a/provisioner/vagrant/vagrantconfig.yaml b/provisioner/vagrant/vagrantconfig.yaml
index b1db63c..c5dd644 100644
--- a/provisioner/vagrant/vagrantconfig.yaml
+++ b/provisioner/vagrant/vagrantconfig.yaml
@@ -16,7 +16,7 @@
memory_size: 4096
number_cpus: 1
box: "puppetlabs/centos-7.2-64-nocm"
-repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.2.1/centos/7/x86_64"
+repo: "http://repos.bigtop.apache.org/releases/1.2.1/centos/7/x86_64"
num_instances: 1
distro: centos
components: [hdfs, yarn, mapreduce]