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 2015/11/16 19:19:28 UTC
[1/2] bigtop git commit: BIGTOP-2143. [Puppet] Automatically generate
default repo
Repository: bigtop
Updated Branches:
refs/heads/master 1156139d9 -> c26bc08ea
BIGTOP-2143. [Puppet] Automatically generate default repo
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/2887b1b2
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/2887b1b2
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/2887b1b2
Branch: refs/heads/master
Commit: 2887b1b2d6baed93893d65dedd222a53ee9b4dfd
Parents: 1156139
Author: Evans Ye <ev...@apache.org>
Authored: Sat Nov 14 06:02:56 2015 +0000
Committer: Evans Ye <ev...@apache.org>
Committed: Tue Nov 17 02:18:35 2015 +0800
----------------------------------------------------------------------
bigtop-deploy/puppet/manifests/site.pp | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2887b1b2/bigtop-deploy/puppet/manifests/site.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/manifests/site.pp b/bigtop-deploy/puppet/manifests/site.pp
index 728b310..0619964 100644
--- a/bigtop-deploy/puppet/manifests/site.pp
+++ b/bigtop-deploy/puppet/manifests/site.pp
@@ -13,8 +13,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$default_yumrepo = "http://bigtop-repos.s3.amazonaws.com/releases/1.0.0/centos/7/x86_64"
-$default_debrepo = "http://bigtop-repos.s3.amazonaws.com/releases/1.0.0/ubuntu/trusty/x86_64"
+# Prepare default repo by detecting the environment automatically
+case $operatingsystem {
+ # Use CentOS 7 repo for other CentOS compatible OSs
+ /(OracleLinux|Amazon|RedHat)/: {
+ $default_repo = "http://bigtop-repos.s3.amazonaws.com/releases/1.0.0/centos/7/x86_64"
+ }
+ # Detect env to pick up default repo for other Bigtop supported OSs
+ default: {
+ $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.0.0/${lower_os}/${release}/x86_64"
+ }
+}
+
$jdk_package_name = hiera("bigtop::jdk_package_name", "jdk")
stage {"pre": before => Stage["main"]}
@@ -22,7 +35,7 @@ stage {"pre": before => Stage["main"]}
case $operatingsystem {
/(OracleLinux|Amazon|CentOS|Fedora|RedHat)/: {
yumrepo { "Bigtop":
- baseurl => hiera("bigtop::bigtop_repo_uri", $default_yumrepo),
+ baseurl => hiera("bigtop::bigtop_repo_uri", $default_repo),
descr => "Bigtop packages",
enabled => 1,
gpgcheck => 0,
@@ -36,7 +49,7 @@ case $operatingsystem {
ensure => present
}
apt::source { "Bigtop":
- location => hiera("bigtop::bigtop_repo_uri", $default_debrepo),
+ location => hiera("bigtop::bigtop_repo_uri", $default_repo),
release => "bigtop",
repos => "contrib",
ensure => present,
[2/2] bigtop git commit: BIGTOP-2144. Update default repos in Bigtop
Provisioner
Posted by ev...@apache.org.
BIGTOP-2144. Update default repos in Bigtop Provisioner
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/c26bc08e
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/c26bc08e
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/c26bc08e
Branch: refs/heads/master
Commit: c26bc08ea1eba3a5485058e0083d20da18c7507d
Parents: 2887b1b
Author: Evans Ye <ev...@apache.org>
Authored: Sat Nov 14 06:55:10 2015 +0000
Committer: Evans Ye <ev...@apache.org>
Committed: Tue Nov 17 02:19:09 2015 +0800
----------------------------------------------------------------------
bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml | 2 +-
bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml | 2 +-
bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c26bc08e/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml
index 12743b9..86f35e7 100644
--- a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml
@@ -21,7 +21,7 @@ boot2docker:
memory_size: "4096"
number_cpus: "1"
-repo: "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-1.0.0-rpm/BUILD_ENVIRONMENTS=centos-6%2clabel=docker-slave-06/lastSuccessfulBuild/artifact/output/"
+repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.0.0/centos/6/x86_64"
distro: centos
components: [hadoop, yarn]
namenode_ui_port: "50070"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c26bc08e/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml
index 5454551..f6b11ae 100644
--- a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml
@@ -21,7 +21,7 @@ boot2docker:
memory_size: "4096"
number_cpus: "1"
-repo: "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-1.0.0-deb/BUILD_ENVIRONMENTS=debian-8%2clabel=docker-slave-07/lastSuccessfulBuild/artifact/output/apt/"
+repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.0.0/debian/8/x86_64"
distro: debian
components: [hadoop, yarn]
namenode_ui_port: "50070"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c26bc08e/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml b/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml
index 8bd2b2d..9b73615 100644
--- a/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml
+++ b/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml
@@ -15,8 +15,8 @@
memory_size: 4096
number_cpus: 1
-box: "puppetlabs/centos-6.6-64-nocm"
-repo: "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-1.0.0-rpm/BUILD_ENVIRONMENTS=centos-6%2clabel=docker-slave-06/lastSuccessfulBuild/artifact/output/"
+box: "puppetlabs/centos-7.0-64-nocm"
+repo: "http://bigtop-repos.s3.amazonaws.com/releases/1.0.0/centos/7/x86_64"
num_instances: 1
distro: centos
components: [hadoop, yarn]