You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2014/11/01 23:38:48 UTC
[1/2] git commit: Added mac support for docker provision
Repository: bigtop
Updated Branches:
refs/heads/master f76a845ed -> 928c1d550
Added mac support for docker provision
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/872fad02
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/872fad02
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/872fad02
Branch: refs/heads/master
Commit: 872fad020254d72500ba3addddbd64c7d081858e
Parents: f76a845
Author: David Capwell <dc...@gmail.com>
Authored: Tue Oct 28 13:56:22 2014 -0700
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Sat Nov 1 15:35:46 2014 -0700
----------------------------------------------------------------------
bigtop-deploy/vm/docker-puppet/README.md | 6 +++---
bigtop-deploy/vm/docker-puppet/docker-hadoop.sh | 21 ++++++++++----------
2 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/872fad02/bigtop-deploy/vm/docker-puppet/README.md
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/docker-puppet/README.md b/bigtop-deploy/vm/docker-puppet/README.md
index 70f347e..2e8e1e2 100644
--- a/bigtop-deploy/vm/docker-puppet/README.md
+++ b/bigtop-deploy/vm/docker-puppet/README.md
@@ -35,7 +35,7 @@ This has been verified on docker client 1.2.0, with api version 1.15, and vagran
* Install [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
-* Install [Vagrant](http://www.vagrantup.com/downloads.html)
+* Install [Vagrant](http://www.vagrantup.com/downloads.html). Need version 1.6.5 or higher.
### Linux
@@ -57,10 +57,10 @@ ssh into a docker container!
```
service docker restart
-docker pull bigtop/seed
+docker pull bigtop/seed:centos-6.4
```
-No, you can start your cluster:
+Now, you can start your cluster:
```
cd bigtop/bigtop-deploy/vm/docker-puppet
http://git-wip-us.apache.org/repos/asf/bigtop/blob/872fad02/bigtop-deploy/vm/docker-puppet/docker-hadoop.sh
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/docker-puppet/docker-hadoop.sh b/bigtop-deploy/vm/docker-puppet/docker-hadoop.sh
index 3650c9c..d48815c 100755
--- a/bigtop-deploy/vm/docker-puppet/docker-hadoop.sh
+++ b/bigtop-deploy/vm/docker-puppet/docker-hadoop.sh
@@ -63,20 +63,21 @@ bigtop-puppet() {
}
PROG=`basename $0`
-ARGS=`getopt -o "bc:psdh" -l "build-image,create:,provision,smoke-tests,destroy,help" -n $PROG -- "$@"`
-if [ $? -ne 0 ]; then
+if [ $# -eq 0 ]; then
usage
fi
-eval set -- "$ARGS"
-
-while true; do
+while [ $# -gt 0 ]; do
case "$1" in
-b|--build-image)
- build-image
+ build-image
shift;;
-c|--create)
+ if [ $# -lt 2 ]; then
+ echo "Create requires a number" 1>&2
+ usage
+ fi
create $2
shift 2;;
-p|--provision)
@@ -86,13 +87,13 @@ while true; do
smoke-tests
shift;;
-d|--destroy)
- destroy
+ destroy
shift;;
-h|--help)
usage
shift;;
- --)
- shift
- break;;
+ *)
+ echo "Unknown argument: '$1'" 1>&2
+ usage;;
esac
done
[2/2] git commit: BIGTOP-1194. redhat-lsb-core is sufficient in spec
files (Newton Alex via rvs)
Posted by rv...@apache.org.
BIGTOP-1194. redhat-lsb-core is sufficient in spec files (Newton Alex via rvs)
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/928c1d55
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/928c1d55
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/928c1d55
Branch: refs/heads/master
Commit: 928c1d550c93f0a1b0b3327f36d648e6e8505d46
Parents: 872fad0
Author: Roman Shaposhnik <rv...@apache.org>
Authored: Sat Nov 1 15:38:06 2014 -0700
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Sat Nov 1 15:38:32 2014 -0700
----------------------------------------------------------------------
bigtop-packages/src/rpm/flume/SPECS/flume.spec | 2 +-
bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec | 2 +-
bigtop-packages/src/rpm/hbase/SPECS/hbase.spec | 10 +++++-----
bigtop-packages/src/rpm/hive/SPECS/hive.spec | 10 +++++-----
bigtop-packages/src/rpm/hue/SPECS/hue.spec | 2 +-
bigtop-packages/src/rpm/solr/SPECS/solr.spec | 2 +-
bigtop-packages/src/rpm/spark/SPECS/spark.spec | 2 +-
bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec | 2 +-
bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/928c1d55/bigtop-packages/src/rpm/flume/SPECS/flume.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/flume/SPECS/flume.spec b/bigtop-packages/src/rpm/flume/SPECS/flume.spec
index cb94f00..a76132d 100644
--- a/bigtop-packages/src/rpm/flume/SPECS/flume.spec
+++ b/bigtop-packages/src/rpm/flume/SPECS/flume.spec
@@ -105,7 +105,7 @@ Requires: initscripts
# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
%description agent
http://git-wip-us.apache.org/repos/asf/bigtop/blob/928c1d55/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
index e96d33b..5300a8b 100644
--- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
+++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
@@ -188,7 +188,7 @@ Requires: sh-utils, insserv
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
BuildRequires: pkgconfig, fuse-libs, redhat-rpm-config, lzo-devel, openssl-devel
# Required for init scripts
-Requires: sh-utils, redhat-lsb
+Requires: sh-utils, /lib/lsb/init-functions
%endif
%if 0%{?mgaversion}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/928c1d55/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
index 1935972..59dcf1d 100644
--- a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
+++ b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
@@ -134,7 +134,7 @@ Requires: initscripts
# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
%description master
@@ -160,7 +160,7 @@ Requires: initscripts
# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
@@ -187,7 +187,7 @@ Requires: initscripts
# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
@@ -215,7 +215,7 @@ Requires: initscripts
# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
@@ -252,7 +252,7 @@ Requires: initscripts
# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
http://git-wip-us.apache.org/repos/asf/bigtop/blob/928c1d55/bigtop-packages/src/rpm/hive/SPECS/hive.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hive/SPECS/hive.spec b/bigtop-packages/src/rpm/hive/SPECS/hive.spec
index 4d2a91c..5e4541d 100644
--- a/bigtop-packages/src/rpm/hive/SPECS/hive.spec
+++ b/bigtop-packages/src/rpm/hive/SPECS/hive.spec
@@ -101,7 +101,7 @@ Requires(pre): %{name} = %{version}-%{release}
Requires: insserv
%else
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
%package server2
@@ -115,7 +115,7 @@ Requires(pre): %{name} = %{version}-%{release}
Requires: insserv
%else
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
@@ -135,7 +135,7 @@ Requires(pre): %{name} = %{version}-%{release}
Requires: insserv
%else
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
@@ -199,7 +199,7 @@ Requires: initscripts
# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
%description hcatalog-server
@@ -231,7 +231,7 @@ Requires: initscripts
/usr/lib/rpm/brp-python-bytecompile ; \
%{nil}
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
%description webhcat-server
http://git-wip-us.apache.org/repos/asf/bigtop/blob/928c1d55/bigtop-packages/src/rpm/hue/SPECS/hue.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hue/SPECS/hue.spec b/bigtop-packages/src/rpm/hue/SPECS/hue.spec
index 6db01fe..7c3eed1 100644
--- a/bigtop-packages/src/rpm/hue/SPECS/hue.spec
+++ b/bigtop-packages/src/rpm/hue/SPECS/hue.spec
@@ -188,7 +188,7 @@ Requires: insserv, python-xml
%else
BuildRequires: /sbin/runuser, sqlite-devel, openldap-devel, mysql-devel, openssl-devel
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
# Disable automatic Provides generation - otherwise we will claim to provide all of the
http://git-wip-us.apache.org/repos/asf/bigtop/blob/928c1d55/bigtop-packages/src/rpm/solr/SPECS/solr.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/solr/SPECS/solr.spec b/bigtop-packages/src/rpm/solr/SPECS/solr.spec
index d82184d..621cfdd 100644
--- a/bigtop-packages/src/rpm/solr/SPECS/solr.spec
+++ b/bigtop-packages/src/rpm/solr/SPECS/solr.spec
@@ -68,7 +68,7 @@ Requires: bigtop-utils >= 0.7, bigtop-tomcat
# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
%description
http://git-wip-us.apache.org/repos/asf/bigtop/blob/928c1d55/bigtop-packages/src/rpm/spark/SPECS/spark.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/spark/SPECS/spark.spec b/bigtop-packages/src/rpm/spark/SPECS/spark.spec
index ea12557..91da770 100644
--- a/bigtop-packages/src/rpm/spark/SPECS/spark.spec
+++ b/bigtop-packages/src/rpm/spark/SPECS/spark.spec
@@ -64,7 +64,7 @@ Requires: insserv
%else
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%global initd_dir %{_sysconfdir}/rc.d/init.d
http://git-wip-us.apache.org/repos/asf/bigtop/blob/928c1d55/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
index c8b1acd..875acbd 100644
--- a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
+++ b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
@@ -100,7 +100,7 @@ Requires: initscripts
# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif
%description client
http://git-wip-us.apache.org/repos/asf/bigtop/blob/928c1d55/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec b/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
index 3ba6dd7..1a05ecd 100644
--- a/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
+++ b/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
@@ -119,7 +119,7 @@ Requires: initscripts
# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
# Required for init scripts
-Requires: redhat-lsb
+Requires: /lib/lsb/init-functions
%endif