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/07 18:08:01 UTC
bigtop git commit: BIGTOP-1627. Move enable_local_yum implementation
to bigtop-deploy/utils/setup-env.sh to share with Docker provisioner
Repository: bigtop
Updated Branches:
refs/heads/master d14b95638 -> 0147785e0
BIGTOP-1627. Move enable_local_yum implementation to bigtop-deploy/utils/setup-env.sh to share with Docker provisioner
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/0147785e
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/0147785e
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/0147785e
Branch: refs/heads/master
Commit: 0147785e0cf87728f42fc8df1d550f3a5a6ff023
Parents: d14b956
Author: Evans Ye <ev...@apache.org>
Authored: Tue Feb 10 14:39:40 2015 +0000
Committer: Evans Ye <ev...@apache.org>
Committed: Sat Mar 7 17:05:47 2015 +0000
----------------------------------------------------------------------
bigtop-deploy/vm/utils/setup-env-centos.sh | 12 ++++++++++--
bigtop-deploy/vm/utils/setup-env-debian.sh | 8 ++++++--
.../vm/vagrant-puppet-docker/docker-hadoop.sh | 3 ++-
bigtop-deploy/vm/vagrant-puppet-docker/provision.sh | 2 +-
.../vm/vagrant-puppet-docker/vagrantconfig.yaml | 1 +
.../vagrant-puppet-docker/vagrantconfig_debian.yaml | 1 +
bigtop-deploy/vm/vagrant-puppet-vm/README.md | 2 +-
bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile | 16 ++++++++--------
.../vm/vagrant-puppet-vm/vagrantconfig.yaml | 2 +-
9 files changed, 31 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/0147785e/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 97a1922..b0ab379 100755
--- a/bigtop-deploy/vm/utils/setup-env-centos.sh
+++ b/bigtop-deploy/vm/utils/setup-env-centos.sh
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+enable_local_repo=${1:-false}
+
# Install puppet agent
yum -y install http://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm
yum -y install puppet
@@ -28,5 +30,11 @@ yum -y install rng-tools
sed -i.bak 's/EXTRAOPTIONS=\"\"/EXTRAOPTIONS=\"-r \/dev\/urandom\"/' /etc/sysconfig/rngd
service rngd start
-echo "Now installing gradle"
-cd /bigtop-home && puppet apply --modulepath=./ -e "include bigtop_toolchain::gradle" # alias gradle=/usr/local/gradle/bin/gradle
+# Install packages for smoke-tests
+yum -y install unzip
+
+if [ $enable_local_repo == "true" ]; then
+ yum -y install yum-utils
+ sudo echo "gpgcheck=0" >> /etc/yum.conf
+ sudo yum-config-manager --add-repo file:///bigtop-home/output
+fi
http://git-wip-us.apache.org/repos/asf/bigtop/blob/0147785e/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 55483c4..56e1517 100755
--- a/bigtop-deploy/vm/utils/setup-env-debian.sh
+++ b/bigtop-deploy/vm/utils/setup-env-debian.sh
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+enable_local_repo=${1:-false}
+
apt-get update
# Install puppet agent
apt-get -y install puppet puppet-module-puppetlabs-stdlib puppet-module-puppetlabs-apt curl
@@ -27,5 +29,7 @@ apt-get -y install rng-tools
sed -i.bak 's@#HRNGDEVICE=/dev/null@HRNGDEVICE=/dev/urandom@' /etc/default/rng-tools
service rng-tools start
-echo "Now installing gradle"
-cd /bigtop-home && puppet apply --modulepath=./ -e "include bigtop_toolchain::gradle" # alias gradle=/usr/local/gradle/bin/gradle
+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
+fi
http://git-wip-us.apache.org/repos/asf/bigtop/blob/0147785e/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh b/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh
index 6459e85..2661861 100755
--- a/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh
@@ -34,11 +34,12 @@ create() {
repo=$(get-yaml-config repo)
components="[`echo $(get-yaml-config components) | sed 's/ /, /g'`]"
distro=$(get-yaml-config distro)
+ enable_local_repo=$(get-yaml-config enable_local_repo)
# setup environment before running bigtop puppet deployment
for node in ${nodes[*]}; do
(
- echo "/bigtop-home/bigtop-deploy/vm/utils/setup-env-$distro.sh" |vagrant ssh $node
+ echo "/bigtop-home/bigtop-deploy/vm/utils/setup-env-$distro.sh $enable_local_repo" |vagrant ssh $node
echo "/vagrant/provision.sh $hadoop_head_node $repo \"$components\"" |vagrant ssh $node
) &
done
http://git-wip-us.apache.org/repos/asf/bigtop/blob/0147785e/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 b9f1cfb..7ffd9d0 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_yumrepo_uri: $2
bigtop::jdk_package_name: $jdk
hadoop_cluster_node::cluster_components: $3
EOF
http://git-wip-us.apache.org/repos/asf/bigtop/blob/0147785e/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 c5b75b4..312bb96 100644
--- a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml
@@ -12,3 +12,4 @@ components: [hadoop, yarn]
namenode_ui_port: "50070"
yarn_ui_port: "8088"
hbase_ui_port: "60010"
+enable_local_repo: false
http://git-wip-us.apache.org/repos/asf/bigtop/blob/0147785e/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 3dc5a75..10a1740 100644
--- a/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig_debian.yaml
@@ -12,3 +12,4 @@ components: [hadoop, yarn]
namenode_ui_port: "50070"
yarn_ui_port: "8088"
hbase_ui_port: "60010"
+enable_local_repo: false
http://git-wip-us.apache.org/repos/asf/bigtop/blob/0147785e/bigtop-deploy/vm/vagrant-puppet-vm/README.md
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/vagrant-puppet-vm/README.md b/bigtop-deploy/vm/vagrant-puppet-vm/README.md
index e1e3d48..1de9089 100644
--- a/bigtop-deploy/vm/vagrant-puppet-vm/README.md
+++ b/bigtop-deploy/vm/vagrant-puppet-vm/README.md
@@ -65,7 +65,7 @@ cd bigtop; ./gradlew tachyon-yum
and then enable local yum in vagrantconfig.yaml
```
-enable_local_yum: true
+enable_local_repo: true
```
finally, spin up the cluster
http://git-wip-us.apache.org/repos/asf/bigtop/blob/0147785e/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 8b49f09..5bc0d47 100755
--- a/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile
+++ b/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile
@@ -38,6 +38,10 @@ components = CONF['components']
# Whether to run smoke tests
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']
+
# master node hostname
bigtop_master = "bigtop1.vagrant"
@@ -93,15 +97,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# We also add the bigtop-home output/ dir, so that locally built rpms will be available.
puts "Adding rpms from /output/ for local testing."
- # This is a update to allow dev packages
- # Force success - not worried if this step fails, since we generally only use it for development.
- if CONF['enable_local_yum'] then
- bigtop.vm.provision "shell", inline: "sudo echo \"gpgcheck=0\" >> /etc/yum.conf"
- bigtop.vm.provision "shell", inline: "sudo yum-config-manager --add-repo file:///bigtop-home/output ; true"
- end
-
# carry on w/ installation
- bigtop.vm.provision "shell", path: "../utils/setup-env-" + distro + ".sh"
+ bigtop.vm.provision :shell do |shell|
+ shell.path = "../utils/setup-env-" + distro + ".sh"
+ shell.args = ["$enable_local_repo"]
+ end
bigtop.vm.provision "shell", inline: $script
bigtop.vm.provision :hostmanager
http://git-wip-us.apache.org/repos/asf/bigtop/blob/0147785e/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 390a3b1..9d56e20 100644
--- a/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml
+++ b/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml
@@ -4,6 +4,6 @@ box: "puppetlabs/centos-6.5-64-nocm"
repo: "http://bigtop01.cloudera.org:8080/view/Releases/job/Bigtop-0.8.0/label=centos6/6/artifact/output/"
num_instances: 1
components: [hadoop, yarn]
-enable_local_yum: false
+enable_local_repo: false
run_smoke_tests: false
distro: centos