Repository: bigtop Updated Branches: refs/heads/master 0dea64ac8 -> 8aac1b774
BIGTOP-1751. Puppet deployment ignores bigtop_repo_uri variable Signed-off-by: Konstantin Boudnik <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8aac1b77 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8aac1b77 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8aac1b77 Branch: refs/heads/master Commit: 8aac1b774379367d9b1d3f0e9f4d11dbe1476d25 Parents: 0dea64a Author: Evans Ye <[email protected]> Authored: Fri Mar 13 08:37:54 2015 +0000 Committer: Konstantin Boudnik <[email protected]> Committed: Fri Mar 13 13:08:35 2015 -0700 ---------------------------------------------------------------------- bigtop-deploy/puppet/README.md | 2 +- bigtop-deploy/puppet/manifests/site.pp | 4 ++-- bigtop-deploy/vm/vagrant-puppet-docker/provision.sh | 2 +- bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/8aac1b77/bigtop-deploy/puppet/README.md ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/README.md b/bigtop-deploy/puppet/README.md index 050e6ea..dd8bf94 100644 --- a/bigtop-deploy/puppet/README.md +++ b/bigtop-deploy/puppet/README.md @@ -71,7 +71,7 @@ following exceptions (which are required): * bigtop::hadoop\_head\_node: must be set to the FQDN of the name node of your cluster (which will also become its job tracker and gateway) -* bigtop::bigtop\_yumrepo\_uri: uri of a repository containing packages for +* bigtop::bigtop\_repo\_uri: uri of a repository containing packages for hadoop as built by Bigtop. $confdir is the directory that puppet will look into for its configuration. On most systems, http://git-wip-us.apache.org/repos/asf/bigtop/blob/8aac1b77/bigtop-deploy/puppet/manifests/site.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/manifests/site.pp b/bigtop-deploy/puppet/manifests/site.pp index 6570123..04ccb1d 100644 --- a/bigtop-deploy/puppet/manifests/site.pp +++ b/bigtop-deploy/puppet/manifests/site.pp @@ -22,7 +22,7 @@ stage {"pre": before => Stage["main"]} case $operatingsystem { /(OracleLinux|Amazon|CentOS|Fedora|RedHat)/: { yumrepo { "Bigtop": - baseurl => hiera("hiera::bigtop_repo_uri", $default_yumrepo), + baseurl => hiera("bigtop::bigtop_repo_uri", $default_yumrepo), descr => "Bigtop packages", enabled => 1, gpgcheck => 0, @@ -32,7 +32,7 @@ case $operatingsystem { /(Ubuntu|Debian)/: { class { "apt": disable_keys => true } apt::source { "Bigtop": - location => hiera("hiera::bigtop_repo_uri", $default_debrepo), + location => hiera("bigtop::bigtop_repo_uri", $default_debrepo), release => "bigtop", repos => "contrib", ensure => present, http://git-wip-us.apache.org/repos/asf/bigtop/blob/8aac1b77/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh ---------------------------------------------------------------------- diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh b/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh index 7ffd9d0..9dbaa56 100755 --- a/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh +++ b/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh @@ -38,7 +38,7 @@ cp -r /bigtop-home/bigtop-deploy/puppet/hieradata/bigtop/ /etc/puppet/hieradata/ cat > /etc/puppet/hieradata/site.yaml << EOF bigtop::hadoop_head_node: $1 hadoop::hadoop_storage_dirs: [/data/1, /data/2] -bigtop::bigtop_yumrepo_uri: $2 +bigtop::bigtop_repo_uri: $2 bigtop::jdk_package_name: $jdk hadoop_cluster_node::cluster_components: $3 EOF http://git-wip-us.apache.org/repos/asf/bigtop/blob/8aac1b77/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile ---------------------------------------------------------------------- diff --git a/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile b/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile index 5bc0d47..1fa1693 100755 --- a/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile +++ b/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile @@ -57,7 +57,7 @@ cp -r /bigtop-home/bigtop-deploy/puppet/hieradata/bigtop/ /etc/puppet/hieradata/ cat > /etc/puppet/hieradata/site.yaml << EOF bigtop::hadoop_head_node: #{bigtop_master} hadoop::hadoop_storage_dirs: [/data/1, /data/2] -Bigtop::bigtop_yumrepo_uri: #{repo} +bigtop::bigtop_repo_uri: #{repo} bigtop::jdk_package_name: java-1.7.0-openjdk-devel.x86_64 hadoop_cluster_node::cluster_components: #{components} EOF
