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/03/18 17:12:57 UTC
bigtop git commit: BIGTOP-1733. fix local_yum implementation
Repository: bigtop
Updated Branches:
refs/heads/master 6356e70fa -> 2e30cf68e
BIGTOP-1733. fix local_yum implementation
Signed-off-by: Evans Ye <ev...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/2e30cf68
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/2e30cf68
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/2e30cf68
Branch: refs/heads/master
Commit: 2e30cf68ea967014772fe605593ad55f80c623b8
Parents: 6356e70
Author: jayunit100 <ja...@apache.org>
Authored: Wed Mar 18 16:09:25 2015 +0000
Committer: Evans Ye <ev...@apache.org>
Committed: Wed Mar 18 16:12:23 2015 +0000
----------------------------------------------------------------------
bigtop-deploy/vm/utils/setup-env-centos.sh | 4 ++++
bigtop-deploy/vm/utils/setup-env-debian.sh | 2 ++
bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile | 6 +++---
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2e30cf68/bigtop-deploy/vm/utils/setup-env-centos.sh
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/utils/setup-env-centos.sh b/bigtop-deploy/vm/utils/setup-env-centos.sh
index b0ab379..e149dad 100755
--- a/bigtop-deploy/vm/utils/setup-env-centos.sh
+++ b/bigtop-deploy/vm/utils/setup-env-centos.sh
@@ -16,6 +16,7 @@
# limitations under the License.
enable_local_repo=${1:-false}
+echo "$enable_local_repo"
# Install puppet agent
yum -y install http://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm
@@ -34,7 +35,10 @@ service rngd start
yum -y install unzip
if [ $enable_local_repo == "true" ]; then
+ echo "Enabling local yum."
yum -y install yum-utils
sudo echo "gpgcheck=0" >> /etc/yum.conf
sudo yum-config-manager --add-repo file:///bigtop-home/output
+else
+ echo "local yum = $enable_local_repo ; NOT Enabling local yum. Packages will be pulled from remote..."
fi
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2e30cf68/bigtop-deploy/vm/utils/setup-env-debian.sh
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/utils/setup-env-debian.sh b/bigtop-deploy/vm/utils/setup-env-debian.sh
index 56e1517..0528203 100755
--- a/bigtop-deploy/vm/utils/setup-env-debian.sh
+++ b/bigtop-deploy/vm/utils/setup-env-debian.sh
@@ -32,4 +32,6 @@ service rng-tools start
if [ $enable_local_repo == "true" ]; then
echo "deb file:///bigtop-home/output/apt bigtop contrib" > /etc/apt/sources.list.d/bigtop-home_output.list
apt-get update
+else
+ echo "local yum = $enable_local_repo ; NOT Enabling local yum. Packages will be pulled from remote..."
fi
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2e30cf68/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 1fa1693..2f5413c 100755
--- a/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile
+++ b/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile
@@ -41,7 +41,7 @@ run_smoke_tests = CONF['run_smoke_tests']
# This is a update to allow dev packages
# Force success - not worried if this step fails, since we generally only use it for development.
enable_local_repo = CONF['enable_local_repo']
-
+puts "vagrant conf local repo enabled: #{enable_local_repo}"
# master node hostname
bigtop_master = "bigtop1.vagrant"
@@ -95,12 +95,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
bigtop.vm.synced_folder "../../../", "/bigtop-home"
# We also add the bigtop-home output/ dir, so that locally built rpms will be available.
- puts "Adding rpms from /output/ for local testing."
+ puts "Adding output/ repo ? #{enable_local_repo}"
# carry on w/ installation
bigtop.vm.provision :shell do |shell|
shell.path = "../utils/setup-env-" + distro + ".sh"
- shell.args = ["$enable_local_repo"]
+ shell.args = ["#{enable_local_repo}"]
end
bigtop.vm.provision "shell", inline: $script
bigtop.vm.provision :hostmanager