From 7a14bb31e0ca2899c3b4ffda065e86dbb0ab266b Mon Sep 17 00:00:00 2001 From: sanmiguel Date: Mon, 24 Oct 2016 21:02:22 +0200 Subject: [PATCH 01/12] riak-mesos-executor@1.7.1 Brings in fixes to erlpmd-patches-rel packages --- framework/riak-mesos-executor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/riak-mesos-executor b/framework/riak-mesos-executor index 8be1d6c..7017e05 160000 --- a/framework/riak-mesos-executor +++ b/framework/riak-mesos-executor @@ -1 +1 @@ -Subproject commit 8be1d6c4359bdd1f4bf538950627b566c935eb32 +Subproject commit 7017e05f221204bd3142f8eba788d42bdd4c7c1e From a313e030fbbed6c728187939b10bd65bbf0df5cb Mon Sep 17 00:00:00 2001 From: sanmiguel Date: Thu, 24 Nov 2016 16:57:51 +0100 Subject: [PATCH 02/12] Update docs to reflect new Riak versions --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 73e0686..d547a73 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ Preview available at [basho-labs.github.io/riak-mesos](http://basho-labs.github. The Riak Mesos Framework supports the following environments: - - Riak KV v2.1.4 (See [here](https://github.com/basho-labs/riak-mesos/releases) for supported packages) - - Riak TS v1.3.1 (See [here](https://github.com/basho-labs/riak-mesos/releases) for supported packages) + - Riak KV v2.2.0 (See [here](https://github.com/basho-labs/riak-mesos/releases) for supported packages) + - Riak TS v1.4.0 (See [here](https://github.com/basho-labs/riak-mesos/releases) for supported packages) - Mesos version: - v0.28 - v1.0 From e36a6a716d7dff460816be983a4f97721ce2613d Mon Sep 17 00:00:00 2001 From: sanmiguel Date: Thu, 24 Nov 2016 17:20:01 +0100 Subject: [PATCH 03/12] Upgrade vagrant env to mesos-1.0 --- vagrant/provision.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/vagrant/provision.sh b/vagrant/provision.sh index fc43286..7bc8ac9 100755 --- a/vagrant/provision.sh +++ b/vagrant/provision.sh @@ -18,10 +18,15 @@ apt-get -y install python-dev libcppunit-dev libunwind8-dev autoconf autotools-d apt-get -y install openjdk-8-jdk default-jre python-setuptools python-protobuf update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64 apt-get -y install libprotobuf-dev protobuf-compiler + +# tools +apt-get -y install jq ngrep apt-show-versions + +# framework apt-get -y install zookeeper=3.4.5+dfsg-1 -apt-get -y install marathon=1.1.2-1.0.482.ubuntu1404 +apt-get -y install marathon=1.3.6-1.0.540.ubuntu1404 #apt-get -y install mesos=0.26.0-0.2.145.ubuntu1404 -apt-get -y install mesos=0.28.2-2.0.27.ubuntu1404 +apt-get -y install mesos=1.0.1-2.0.93.ubuntu1404 # apt-get -y install mesos # 1.0.0 @@ -52,6 +57,10 @@ service marathon restart apt-get -y install git s3cmd zip python-pip pip install jsonschema pip install virtualenv +pip install mesos.cli +# NB there's a transitive dep of protobuf and mesos.cli that causes issues if you install +# protobuf==2.6.1 first... +pip install protobuf==2.6.1 # Install kerl, Erlang apt-get -y install libncurses5-dev libpam0g-dev From c4fe3e67d8e9d7f6ace6ff3cdd29325852546652 Mon Sep 17 00:00:00 2001 From: sanmiguel Date: Thu, 24 Nov 2016 17:20:28 +0100 Subject: [PATCH 04/12] riak-mesos-scheduler@2.0.1 --- framework/riak-mesos-scheduler | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/riak-mesos-scheduler b/framework/riak-mesos-scheduler index 0de61a8..31fda3d 160000 --- a/framework/riak-mesos-scheduler +++ b/framework/riak-mesos-scheduler @@ -1 +1 @@ -Subproject commit 0de61a8781f758524833ddcd9a612b187d5cf0d9 +Subproject commit 31fda3d284af92917d7604fd17057f27b1999ffd From 59482f5bf69c2ff5472a27a683b08d63f80ce352 Mon Sep 17 00:00:00 2001 From: sanmiguel Date: Thu, 24 Nov 2016 17:20:56 +0100 Subject: [PATCH 05/12] riak_explorer@1.2.3 --- framework/riak_explorer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/riak_explorer b/framework/riak_explorer index b7be28c..9d82de9 160000 --- a/framework/riak_explorer +++ b/framework/riak_explorer @@ -1 +1 @@ -Subproject commit b7be28c7e0a4522de36d440c0a178ac7f0a075a1 +Subproject commit 9d82de9da50622fd8990438c949a00c991c3eb43 From e8f87fc1fdb19fa9e5c09b4626aa9e4779a42a87 Mon Sep 17 00:00:00 2001 From: Dmitry Platon Date: Tue, 29 Nov 2016 16:19:43 +0300 Subject: [PATCH 06/12] Remove riak dir --- .gitmodules | 6 ------ riak/Makefile | 47 ----------------------------------------------- riak/riak | 1 - riak/riak_ee | 1 - riak/upload.sh | 37 ------------------------------------- 5 files changed, 92 deletions(-) delete mode 100644 riak/Makefile delete mode 160000 riak/riak delete mode 160000 riak/riak_ee delete mode 100755 riak/upload.sh diff --git a/.gitmodules b/.gitmodules index ed8b4d9..10fa6c6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,12 +10,6 @@ [submodule "framework/riak_explorer"] path = framework/riak_explorer url = https://github.com/basho-labs/riak_explorer.git -[submodule "riak/riak"] - path = riak/riak - url = https://github.com/basho/riak -[submodule "riak/riak_ee"] - path = riak/riak_ee - url = git@github.com:basho/riak_ee.git [submodule "tools/riak-mesos-tools"] path = tools/riak-mesos-tools url = https://github.com/basho-labs/riak-mesos-tools diff --git a/riak/Makefile b/riak/Makefile deleted file mode 100644 index 462e8cc..0000000 --- a/riak/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -BASE_DIR = $(PWD) -RIAK_SOURCE_DIR ?= riak -RIAK_TAG ?= $(shell cd $(RIAK_SOURCE_DIR) && git describe --tags) -RIAK_REPO ?= $(shell echo $(RIAK_TAG) | cut -d'-' -f1) -RIAK_PKG_VERSION ?= $(shell echo $(RIAK_TAG) | cut -d'-' -f2) -OS_FAMILY ?= ubuntu -OS_VERSION ?= 14.04 -PKGNAME ?= $(RIAK_REPO)-$(RIAK_PKG_VERSION)-$(OS_FAMILY)-$(OS_VERSION).tar.gz -RIAK_BASE ?= root -OAUTH_TOKEN ?= $(shell cat oauth.txt) -RIAK_MESOS_TAG ?= $(shell git describe --tags --abbrev=0) -RELEASE_ID ?= $(shell curl -sS https://api.github.com/repos/basho-labs/riak-mesos/releases/tags/$(RIAK_MESOS_TAG)?access_token=$(OAUTH_TOKEN) | python -c 'import sys, json; print json.load(sys.stdin)["id"]') -DEPLOY_BASE ?="https://uploads.github.com/repos/basho-labs/riak-mesos/releases/$(RELEASE_ID)/assets?access_token=$(OAUTH_TOKEN)&name=$(RIAK_PKGNAME)" -DOWNLOAD_BASE ?=https://github.com/basho-labs/riak-mesos/releases/download/$(RIAK_MESOS_TAG)/$(PKGNAME) - -.PHONY: all tarball clean sync - -all: tarball - -ifneq (,$(shell whereis sha256sum | awk '{print $2}';)) -SHASUM = sha256sum -else -SHASUM = shasum -a 256 -endif - -tarball: - echo "Creating packages/"$(PKGNAME) - cd $(RIAK_SOURCE_DIR) && $(MAKE) rel - mkdir -p packages - -rm -rf $(RIAK_BASE) - mkdir -p $(RIAK_BASE) - cp -R $(RIAK_SOURCE_DIR)/rel/riak $(RIAK_BASE)/ - tar -czf $(PKGNAME) $(RIAK_BASE) || rm -rf $(PKGNAME) - mv $(PKGNAME) packages/ - cd packages && $(SHASUM) $(PKGNAME) > $(PKGNAME).sha - cd packages && echo "$(DOWNLOAD_BASE)" > remote.txt - cd packages && echo "$(BASE_DIR)/packages/$(PKGNAME)" > local.txt - -clean: - -rm -rf $(RIAK_BASE) - -rm -rf packages - -sync: - echo "Uploading to "$(DOWNLOAD_BASE) - @cd packages && \ - curl -sS -XPOST -H 'Content-Type: application/gzip' "$(DEPLOY_BASE)" --data-binary @$(PKGNAME) && \ - curl -sS -XPOST -H 'Content-Type: application/octet-stream' "$(DEPLOY_BASE).sha" --data-binary @$(PKGNAME).sha diff --git a/riak/riak b/riak/riak deleted file mode 160000 index 155ccb3..0000000 --- a/riak/riak +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 155ccb33b4f83f5a06ebe9a69e303c8e299d84df diff --git a/riak/riak_ee b/riak/riak_ee deleted file mode 160000 index 960aebc..0000000 --- a/riak/riak_ee +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 960aebc41259bfd79a39fbab6e912fe52c98f748 diff --git a/riak/upload.sh b/riak/upload.sh deleted file mode 100755 index ffe5deb..0000000 --- a/riak/upload.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -if [ -z "$OAUTH_TOKEN" ]; then - export OAUTH_TOKEN=$(cat oauth.txt) -fi -if [ -z "$RIAK_MESOS_TAG" ]; then - export RIAK_MESOS_TAG=$(git describe --tags --abbrev=0) - # export RIAK_MESOS_TAG=1.0.0 -fi -if [ -z "$RELEASE_ID" ]; then - export RELEASE_ID=$(curl -sS https://api.github.com/repos/basho-labs/riak-mesos/releases/tags/$RIAK_MESOS_TAG?access_token=$OAUTH_TOKEN | python -c 'import sys, json; print json.load(sys.stdin)["id"]') -fi -if [ -z "$OS_FAMILY" ]; then - export OS_FAMILY="ubuntu" -fi -if [ -z "$OS_VERSION" ]; then - export OS_VERSION="14.04" -fi -if [ -z "$RIAK_TYPE" ]; then - export RIAK_TYPE="riak" -fi -if [ -z "$RIAK_VERSION" ]; then - export RIAK_VERSION="2.1.4" -fi -if [ -z "$RIAK_PKGNAME" ]; then - export RIAK_PKGNAME="$RIAK_TYPE-$RIAK_VERSION-$OS_FAMILY-$OS_VERSION.tar.gz" -fi -if [ -z "$DEPLOY_BASE" ]; then - export DEPLOY_BASE="https://uploads.github.com/repos/basho-labs/riak-mesos/releases/$RELEASE_ID/assets?access_token=$OAUTH_TOKEN&name=$RIAK_PKGNAME" -fi -if [ -z "$DOWNLOAD_BASE" ]; then - export DOWNLOAD_BASE="https://github.com/basho-labs/riak-mesos/releases/download/$RIAK_MESOS_TAG/$RIAK_PKGNAME" -fi - -echo "Uploading to "$DOWNLOAD_BASE -curl -sS -XPOST -H 'Content-Type: application/gzip' "$DEPLOY_BASE" --data-binary @$RIAK_PKGNAME -curl -sS -XPOST -H 'Content-Type: application/octet-stream' "$DEPLOY_BASE.sha" --data-binary @$RIAK_PKGNAME.sha From 000ab1a74df5dafc13ae2e936f9ed8b2a79d0f37 Mon Sep 17 00:00:00 2001 From: Dmitry Platon Date: Tue, 29 Nov 2016 16:30:35 +0300 Subject: [PATCH 07/12] Remove riak dir --- Makefile | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index cd8a973..e4491df 100644 --- a/Makefile +++ b/Makefile @@ -29,10 +29,6 @@ dev: deps tarball config sed -i "s,{{executor_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/local.txt),g" $(TOOLS_LOCAL) && \ sed -i "s,{{executor_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/remote.txt),g" $(REPO_REMOTE) && \ sed -i "s,{{executor_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/remote.txt),g" $(DCOS_REMOTE) && \ - sed -i "s,{{node_url}},$(shell cat $(BASE_DIR)/riak/packages/remote.txt),g" $(TOOLS_REMOTE) && \ - sed -i "s,{{node_url}},$(shell cat $(BASE_DIR)/riak/packages/local.txt),g" $(TOOLS_LOCAL) && \ - sed -i "s,{{node_url}},$(shell cat $(BASE_DIR)/riak/packages/remote.txt),g" $(REPO_REMOTE) && \ - sed -i "s,{{node_url}},$(shell cat $(BASE_DIR)/riak/packages/remote.txt),g" $(DCOS_REMOTE) && \ sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/remote.txt),g" $(TOOLS_REMOTE) && \ sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/local.txt),g" $(TOOLS_LOCAL) && \ sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/remote.txt),g" $(REPO_REMOTE) && \ @@ -49,8 +45,6 @@ dev: deps tarball config sed -i "s,{{patches_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_local.txt)),g" $(DCOS_REMOTE) && \ sed -i "s,{{explorer_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak_explorer/packages/local.txt)),g" $(REPO_REMOTE) && \ sed -i "s,{{explorer_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak_explorer/packages/local.txt)),g" $(DCOS_REMOTE) && \ - sed -i "s,{{node_package}},$(shell basename $(shell cat $(BASE_DIR)/riak/packages/local.txt)),g" $(REPO_REMOTE) && \ - sed -i "s,{{node_package}},$(shell basename $(shell cat $(BASE_DIR)/riak/packages/local.txt)),g" $(DCOS_REMOTE) && \ sed -i "s,{{executor_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/local.txt)),g" $(REPO_REMOTE) && \ sed -i "s,{{executor_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/local.txt)),g" $(DCOS_REMOTE) && \ sed -i "s,{{scheduler_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-scheduler/packages/local.txt)),g" $(REPO_REMOTE) && \ @@ -80,10 +74,7 @@ config: .config.packages .config.version cd $(BASE_DIR)/framework/riak_explorer && $(MAKE) tarball && \ touch ../../.tarball.riak_explorer .tarball.framework: .tarball.riak-mesos-scheduler .tarball.riak-mesos-executor .tarball.riak-mesos-director .tarball.riak_explorer -.tarball.riak: - cd $(BASE_DIR)/riak && $(MAKE) tarball && \ - touch ../.tarball.riak -tarball: .tarball.framework .tarball.riak +tarball: .tarball.framework deps: @if [ -z "$$(git submodule foreach ls)" ]; then \ @@ -95,10 +86,6 @@ clean-framework: $(foreach dep,$(shell ls framework), \ cd $(BASE_DIR)/framework/$(dep) && \ $(MAKE) clean && rm -rf deps/* && rm -rf ebin/*.beam && git reset --hard HEAD;) -clean-riak: - -rm .tarball.riak - -rm -rf riak/$(RIAK_SOURCE_DIR)/deps/* - cd riak && $(MAKE) clean clean: clean-framework update-head: @@ -107,4 +94,4 @@ update-head: sync: $(foreach dep,$(shell ls framework), \ cd $(BASE_DIR)/framework/$(dep) && $(MAKE) sync;) - cd $(BASE_DIR)/riak && make sync + From d6e559e4a412e31214cad34bf391bf6f30dab063 Mon Sep 17 00:00:00 2001 From: Dmitry Platon Date: Thu, 8 Dec 2016 14:37:02 +0300 Subject: [PATCH 08/12] Update dcos submoduler --- tools/riak-mesos-dcos-repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/riak-mesos-dcos-repo b/tools/riak-mesos-dcos-repo index abe9b0d..308ff05 160000 --- a/tools/riak-mesos-dcos-repo +++ b/tools/riak-mesos-dcos-repo @@ -1 +1 @@ -Subproject commit abe9b0d416c71283963f6d7721047df658267706 +Subproject commit 308ff05303ea7be46bfec77aea824cea29885f76 From ee966fd08330a38a251275c4361f3e55e6fa5a19 Mon Sep 17 00:00:00 2001 From: Dmitry Platon Date: Thu, 8 Dec 2016 14:41:29 +0300 Subject: [PATCH 09/12] riak-mesos-tools@2.0.0-rc1 --- tools/riak-mesos-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/riak-mesos-tools b/tools/riak-mesos-tools index f009cd2..1735e42 160000 --- a/tools/riak-mesos-tools +++ b/tools/riak-mesos-tools @@ -1 +1 @@ -Subproject commit f009cd2f322f78dd284be017f92c420c94b6d97c +Subproject commit 1735e42b4db20326c395810ff2433e34e8c000d7 From 1d1fe1573bd6e3d82e347430f47c2fd35cd93880 Mon Sep 17 00:00:00 2001 From: platon Date: Fri, 9 Dec 2016 19:06:55 +0300 Subject: [PATCH 10/12] Remove old configs --- config/command.template.json | 5 - config/config.template.json | 261 ------------------------------ config/config.vagrant.github.json | 45 ------ 3 files changed, 311 deletions(-) delete mode 100644 config/command.template.json delete mode 100644 config/config.template.json delete mode 100644 config/config.vagrant.github.json diff --git a/config/command.template.json b/config/command.template.json deleted file mode 100644 index 4aa966f..0000000 --- a/config/command.template.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "pip": [ - "git+https://github.com/basho-labs/riak-mesos-tools.git@{{tools_version}}#egg=riak_mesos" - ] -} diff --git a/config/config.template.json b/config/config.template.json deleted file mode 100644 index b35ebaa..0000000 --- a/config/config.template.json +++ /dev/null @@ -1,261 +0,0 @@ -{ - "type": "object", - "properties": { - "riak": { - "type": "object", - "description": "Riak Mesos Framework specific properties", - "properties": { - "framework-name": { - "type": "string", - "description": "Framework Instance Name.", - "default": "riak" - }, - "hostname": { - "default": "riak.marathon.mesos", - "type": "string", - "description": "Framework HTTP API hostname." - }, - "marathon": { - "type": "string", - "description": "The Marathon URL.", - "default": "marathon.mesos:8080" - }, - "master": { - "type": "string", - "description": "The URL of the Mesos master.", - "default": "leader.mesos:5050" - }, - "zk": { - "type": "string", - "description": "Zookeeper address. Specify in the format host:port.", - "default": "leader.mesos:2181" - }, - "user": { - "type": "string", - "description": "Framework User.", - "default": "root" - }, - "role": { - "type": "string", - "description": "Framework Role.", - "default": "riak" - }, - "auth-principal": { - "type": "string", - "description": "Mesos authentication principal.", - "default": "" - }, - "auth-provider": { - "type": "string", - "description": "Mesos authentication provider.", - "default": "" - }, - "auth-secret-file": { - "type": "string", - "description": "Mesos authentication secret file.", - "default": "" - }, - "instances": { - "type": "number", - "description": "Number of framework instances", - "default": 1 - }, - "healthcheck-grace-period-seconds": { - "type": "number", - "description": "Memory requirements", - "default": 300 - }, - "healthcheck-interval-seconds": { - "type": "number", - "description": "Memory requirements", - "default": 60 - }, - "healthcheck-timeout-seconds": { - "type": "number", - "description": "Memory requirements", - "default": 20 - }, - "healthcheck-max-consecutive-failures": { - "type": "number", - "description": "Memory requirements", - "default": 5 - }, - "constraints": { - "type": "array", - "items": { - "type": "array", - "items": [ - { - "type": "string" - }, - { - "type": "string", - "enum": ["UNIQUE", "CLUSTER", "GROUP_BY", "LIKE", "UNLIKE"] - }, - { - "type": "string" - } - ], - "minItems": 2, - "additionalItems": false - }, - "description": "Marathon constraints for the framework/scheduler instance. Valid constraint operators are one of UNIQUE, CLUSTER, GROUP_BY, LIKE, UNLIKE.", - "default": [] - }, - "scheduler": { - "type": "object", - "description": "Requirements for Riak Mesos Scheduler", - "properties": { - "url": { - "type": "string", - "description": "Package location for Riak Mesos Scheduler tarball.", - "default": "{{scheduler_url}}" - }, - "package": { - "type": "string", - "description": "Package name for Riak Mesos Scheduler tarball.", - "default": "{{scheduler_package}}" - }, - "cpus": { - "type": "number", - "description": "Riak Mesos Scheduler CPU requirements", - "default": 0.5 - }, - "mem": { - "type": "number", - "description": "Riak Mesos Scheduler Memory requirements", - "default": 2048.0 - }, - "constraints": { - "type": "string", - "default": "[]", - "description": "Scheduler constraints for Riak node tasks. Valid constraint operators are one of UNIQUE, CLUSTER, GROUP_BY, LIKE, UNLIKE." - } - } - }, - "executor": { - "type": "object", - "description": "Requirements for Riak Mesos Executor", - "properties": { - "url": { - "type": "string", - "description": "Package location for Riak Mesos Executor tarball.", - "default": "{{executor_url}}" - }, - "package": { - "type": "string", - "description": "Package name for Riak Mesos Executor tarball.", - "default": "{{executor_package}}" - }, - "cpus": { - "type": "number", - "description": "Riak Mesos Executor CPU requirements", - "default": 0.1 - }, - "mem": { - "type": "number", - "description": "Riak Mesos Executor Memory requirements", - "default": 512.0 - } - } - }, - "node": { - "type": "object", - "description": "Requirements for Riak", - "properties": { - "url": { - "type": "string", - "description": "Package location for Riak tarball.", - "default": "{{node_url}}" - }, - "package": { - "type": "string", - "description": "Package name for Riak tarball.", - "default": "{{node_package}}" - }, - "patches-url": { - "type": "string", - "description": "Package location for Riak patches tarball.", - "default": "{{patches_url}}" - }, - "patches-package": { - "type": "string", - "description": "Package name for Riak patches tarball.", - "default": "{{patches_package}}" - }, - "explorer-url": { - "type": "string", - "description": "Package location for Riak Explorer tarball.", - "default": "{{explorer_url}}" - }, - "explorer-package": { - "type": "string", - "description": "Package name for Riak Explorer tarball.", - "default": "{{explorer_package}}" - }, - "cpus": { - "type": "number", - "description": "Riak CPU requirements", - "default": 1.0 - }, - "mem": { - "type": "number", - "description": "Riak Memory requirements", - "default": 8000.0 - }, - "disk": { - "type": "number", - "description": "Riak Disk requirements", - "default": 20000.0 - } - } - }, - "director": { - "type": "object", - "description": "Requirements for Riak Mesos Director", - "properties": { - "url": { - "type": "string", - "description": "Package location for Riak Mesos Director tarball.", - "default": "{{director_url}}" - }, - "use-public": { - "type": "boolean", - "description": "When true, only deploys director on public agents.", - "default": false - }, - "cpus": { - "type": "number", - "description": "Riak Mesos Director CPU requirements", - "default": 0.5 - }, - "mem": { - "type": "number", - "description": "Riak Director Memory requirements", - "default": 1024.0 - } - } - } - }, - "required": [ - "framework-name", - "hostname", - "marathon", - "master", - "zk", - "user", - "role", - "auth-principal", - "instances", - "healthcheck-grace-period-seconds", - "healthcheck-interval-seconds", - "healthcheck-timeout-seconds", - "healthcheck-max-consecutive-failures", - "scheduler", - "executor", - "node", - "director" - ] - } - } -} diff --git a/config/config.vagrant.github.json b/config/config.vagrant.github.json deleted file mode 100644 index a80ddc5..0000000 --- a/config/config.vagrant.github.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "riak": { - "framework-name": "riak", - "marathon": "marathon.mesos:8080", - "master": "leader.mesos:5050", - "zk": "leader.mesos:2181", - "user": "root", - "auth-principal": "riak", - "auth-provider": "", - "auth-secret-file": "", - "instances": 1, - "failover-timeout": 10000.0, - "healthcheck-grace-period-seconds": 300, - "healthcheck-interval-seconds": 60, - "healthcheck-timeout-seconds": 20, - "healthcheck-max-consecutive-failures": 5, - "constraints": [], - "scheduler": { - "url": "/home/vagrant/packages/riak_mesos_scheduler-1.8.1-mesos-1.0.0-ubuntu-14.04.tar.gz", - "cpus": 0.5, - "mem": 256.0, - "constraints": [["hostname", "UNIQUE"]] - }, - "executor": { - "url": "/home/vagrant/packages/riak_mesos_executor-1.7.0-mesos-1.0.0-ubuntu-14.04.tar.gz", - "cpus": 0.1, - "mem": 512.0 - }, - "node": { - - "url": "/home/vagrant/packages/riak_ts-1.3.1-ubuntu-14.04.tar.gz", - "patches-url": "/home/vagrant/packages/riak_erlpmd_patches-1.7.0-mesos-1.0.0-ubuntu-14.04.tar.gz", - "explorer-url": "/home/vagrant/packages/riak_explorer-1.2.1.patch-ubuntu-14.04.tar.gz", - "cpus": 0.25, - "mem": 512.0, - "disk": 1000.0 - }, - "director": { - "url": "/home/vagrant/packages/riak_mesos_director-1.0.1-ubuntu-14.04.tar.gz", - "use-public": false, - "cpus": 0.5, - "mem": 256.0 - } - } -} From ba3d37b791a50baacf2beb5d2d593763adf1bbce Mon Sep 17 00:00:00 2001 From: platon Date: Fri, 9 Dec 2016 21:25:24 +0300 Subject: [PATCH 11/12] update .config.packages --- Makefile | 48 ++++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index e4491df..db2a384 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ BASE_DIR = $(PWD) -DCOS_TEMPLATE ?= $(BASE_DIR)/tools/riak-mesos-tools/config/config.dcos.template.json -DCOS_REMOTE ?= $(BASE_DIR)/tools/riak-mesos-tools/config/config.dcos.json TOOLS_TEMPLATE ?= $(BASE_DIR)/tools/riak-mesos-tools/config/config.template.json TOOLS_REMOTE ?= $(BASE_DIR)/tools/riak-mesos-tools/config/config.example.json TOOLS_LOCAL ?= $(BASE_DIR)/tools/riak-mesos-tools/config/config.local.json -REPO_TEMPLATE ?= $(BASE_DIR)/config/config.template.json -REPO_REMOTE ?= $(BASE_DIR)/tools/riak-mesos-dcos-repo/repo/packages/R/riak/0/config.json -TOOLS_VERSION_FILE ?= $(BASE_DIR)/tools/riak-mesos-tools/riak_mesos/constants.py -REPO_VERSION_FILE ?= $(BASE_DIR)/tools/riak-mesos-dcos-repo/repo/packages/R/riak/0/package.json -REPO_CMD_TEMPLATE ?= $(BASE_DIR)/config/command.template.json -REPO_CMD_FILE ?= $(BASE_DIR)/tools/riak-mesos-dcos-repo/repo/packages/R/riak/0/command.json +RIAK_KV_REMOTE ?= "https://github.com/basho-labs/riak-mesos/releases/download/2.0.0-rc1/riak-2.2.0-ubuntu-14.04.tar.gz" +RIAK_TS_REMOTE ?= "https://github.com/basho-labs/riak-mesos/releases/download/2.0.0-rc1/riak_ts-1.4.0-ubuntu-14.04.tar.gz" +# REPO_TEMPLATE ?= $(BASE_DIR)/config/config.template.json +# REPO_REMOTE ?= $(BASE_DIR)/tools/riak-mesos-dcos-repo/repo/packages/R/riak/0/config.json +# TOOLS_VERSION_FILE ?= $(BASE_DIR)/tools/riak-mesos-tools/riak_mesos/constants.py +# REPO_VERSION_FILE ?= $(BASE_DIR)/tools/riak-mesos-dcos-repo/repo/packages/R/riak/0/package.json +# REPO_CMD_TEMPLATE ?= $(BASE_DIR)/config/command.template.json +# REPO_CMD_FILE ?= $(BASE_DIR)/tools/riak-mesos-dcos-repo/repo/packages/R/riak/0/command.json .PHONY: all deps clean update-head @@ -19,36 +19,20 @@ dev: deps tarball config .config.packages: cp $(TOOLS_TEMPLATE) $(TOOLS_REMOTE) && \ cp $(TOOLS_TEMPLATE) $(TOOLS_LOCAL) && \ - cp $(REPO_TEMPLATE) $(REPO_REMOTE) && \ - cp $(DCOS_TEMPLATE) $(DCOS_REMOTE) && \ sed -i "s,{{scheduler_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-scheduler/packages/remote.txt),g" $(TOOLS_REMOTE) && \ sed -i "s,{{scheduler_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-scheduler/packages/local.txt),g" $(TOOLS_LOCAL) && \ - sed -i "s,{{scheduler_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-scheduler/packages/remote.txt),g" $(REPO_REMOTE) && \ - sed -i "s,{{scheduler_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-scheduler/packages/remote.txt),g" $(DCOS_REMOTE) && \ sed -i "s,{{executor_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/remote.txt),g" $(TOOLS_REMOTE) && \ sed -i "s,{{executor_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/local.txt),g" $(TOOLS_LOCAL) && \ - sed -i "s,{{executor_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/remote.txt),g" $(REPO_REMOTE) && \ - sed -i "s,{{executor_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/remote.txt),g" $(DCOS_REMOTE) && \ - sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/remote.txt),g" $(TOOLS_REMOTE) && \ - sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/local.txt),g" $(TOOLS_LOCAL) && \ - sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/remote.txt),g" $(REPO_REMOTE) && \ - sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/remote.txt),g" $(DCOS_REMOTE) && \ + sed -i "s,{{patches_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_remote.txt),g" $(TOOLS_REMOTE) && \ + sed -i "s,{{patches_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_local.txt),g" $(TOOLS_LOCAL) sed -i "s,{{explorer_url}},$(shell cat $(BASE_DIR)/framework/riak_explorer/packages/remote.txt),g" $(TOOLS_REMOTE) && \ sed -i "s,{{explorer_url}},$(shell cat $(BASE_DIR)/framework/riak_explorer/packages/local.txt),g" $(TOOLS_LOCAL) && \ - sed -i "s,{{explorer_url}},$(shell cat $(BASE_DIR)/framework/riak_explorer/packages/remote.txt),g" $(REPO_REMOTE) && \ - sed -i "s,{{explorer_url}},$(shell cat $(BASE_DIR)/framework/riak_explorer/packages/remote.txt),g" $(DCOS_REMOTE) && \ - sed -i "s,{{patches_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_remote.txt),g" $(TOOLS_REMOTE) && \ - sed -i "s,{{patches_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_local.txt),g" $(TOOLS_LOCAL) && \ - sed -i "s,{{patches_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_remote.txt),g" $(REPO_REMOTE) && \ - sed -i "s,{{patches_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_remote.txt),g" $(DCOS_REMOTE) && \ - sed -i "s,{{patches_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_local.txt)),g" $(REPO_REMOTE) && \ - sed -i "s,{{patches_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_local.txt)),g" $(DCOS_REMOTE) && \ - sed -i "s,{{explorer_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak_explorer/packages/local.txt)),g" $(REPO_REMOTE) && \ - sed -i "s,{{explorer_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak_explorer/packages/local.txt)),g" $(DCOS_REMOTE) && \ - sed -i "s,{{executor_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/local.txt)),g" $(REPO_REMOTE) && \ - sed -i "s,{{executor_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/local.txt)),g" $(DCOS_REMOTE) && \ - sed -i "s,{{scheduler_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-scheduler/packages/local.txt)),g" $(REPO_REMOTE) && \ - sed -i "s,{{scheduler_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-scheduler/packages/local.txt)),g" $(DCOS_REMOTE) + sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/remote.txt),g" $(TOOLS_REMOTE) && \ + sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/local.txt),g" $(TOOLS_LOCAL) && \ + sed -i "s,{{riak_kv_2_2_url}},$(RIAK_KV_REMOTE),g" $(TOOLS_REMOTE) && \ + sed -i "s,{{riak_kv_2_2_url}},$(RIAK_KV_REMOTE),g" $(TOOLS_LOCAL) && \ + sed -i "s,{{riak_ts_1_4_url}},$(RIAK_TS_REMOTE),g" $(TOOLS_REMOTE) && \ + sed -i "s,{{riak_ts_1_4_url}},$(RIAK_TS_REMOTE),g" $(TOOLS_LOCAL) .config.version: cp $(REPO_CMD_TEMPLATE) $(REPO_CMD_FILE) && \ sed -i "s,^version = .*$$,version = '$(shell git describe --tags --abbrev=0 | tr - .)',g" $(TOOLS_VERSION_FILE) && \ From de6c21bb991124940bcce18fbff18d3b391380ca Mon Sep 17 00:00:00 2001 From: platon Date: Fri, 9 Dec 2016 21:39:50 +0300 Subject: [PATCH 12/12] update .config.version --- Makefile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/Makefile b/Makefile index db2a384..44a860c 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,6 @@ TOOLS_REMOTE ?= $(BASE_DIR)/tools/riak-mesos-tools/config/confi TOOLS_LOCAL ?= $(BASE_DIR)/tools/riak-mesos-tools/config/config.local.json RIAK_KV_REMOTE ?= "https://github.com/basho-labs/riak-mesos/releases/download/2.0.0-rc1/riak-2.2.0-ubuntu-14.04.tar.gz" RIAK_TS_REMOTE ?= "https://github.com/basho-labs/riak-mesos/releases/download/2.0.0-rc1/riak_ts-1.4.0-ubuntu-14.04.tar.gz" -# REPO_TEMPLATE ?= $(BASE_DIR)/config/config.template.json -# REPO_REMOTE ?= $(BASE_DIR)/tools/riak-mesos-dcos-repo/repo/packages/R/riak/0/config.json -# TOOLS_VERSION_FILE ?= $(BASE_DIR)/tools/riak-mesos-tools/riak_mesos/constants.py -# REPO_VERSION_FILE ?= $(BASE_DIR)/tools/riak-mesos-dcos-repo/repo/packages/R/riak/0/package.json -# REPO_CMD_TEMPLATE ?= $(BASE_DIR)/config/command.template.json -# REPO_CMD_FILE ?= $(BASE_DIR)/tools/riak-mesos-dcos-repo/repo/packages/R/riak/0/command.json .PHONY: all deps clean update-head @@ -34,15 +28,7 @@ dev: deps tarball config sed -i "s,{{riak_ts_1_4_url}},$(RIAK_TS_REMOTE),g" $(TOOLS_REMOTE) && \ sed -i "s,{{riak_ts_1_4_url}},$(RIAK_TS_REMOTE),g" $(TOOLS_LOCAL) .config.version: - cp $(REPO_CMD_TEMPLATE) $(REPO_CMD_FILE) && \ - sed -i "s,^version = .*$$,version = '$(shell git describe --tags --abbrev=0 | tr - .)',g" $(TOOLS_VERSION_FILE) && \ - sed -i "s,\"version\": \".*\",\"version\": \"$(shell git describe --tags --abbrev=0 | tr - .)\",g" $(REPO_VERSION_FILE) && \ - sed -i "s,{{tools_version}},$(shell cd tools/riak-mesos-tools && git rev-parse --abbrev-ref HEAD),g" $(REPO_CMD_FILE) && \ - cd tools/riak-mesos-dcos-repo/scripts && \ - ./0-validate-version.sh && \ - ./1-validate-packages.sh && \ - ./2-build-index.sh && \ - ./3-validate-index.sh + cd tools/riak-mesos-dcos-repo/scripts && ./build.sh config: .config.packages .config.version .tarball.riak-mesos-scheduler: