reduced cpu requirements; added deploy script

samisalkosuo · Jun 8, 2018 · f0357bf · f0357bf
1 parent 012a828
commit f0357bf
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 32 deletions.
diff --git a/DCOS/deploy.sh b/DCOS/deploy.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd manifest && \
+  for i in *.json; do dcos marathon app add $i; done
diff --git a/DCOS/destroy.sh b/DCOS/destroy.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+dcos marathon app remove robotshop/cart     
+dcos marathon app remove robotshop/catalogue
+dcos marathon app remove robotshop/dispatch 
+dcos marathon app remove robotshop/mongodb  
+dcos marathon app remove robotshop/mysql    
+dcos marathon app remove robotshop/payment  
+dcos marathon app remove robotshop/rabbitmq 
+dcos marathon app remove robotshop/redis    
+dcos marathon app remove robotshop/shipping 
+dcos marathon app remove robotshop/user     
+dcos marathon app remove robotshop/web      
diff --git a/DCOS/cart.json → DCOS/manifest/cart.json b/DCOS/cart.json → DCOS/manifest/cart.json
@@ -1,7 +1,7 @@
 {
     "id": "/robotshop/cart",
     "backoffFactor": 1.15,
-    "backoffSeconds": 1,
+    "backoffSeconds": 30,
     "container": {
       "portMappings": [
         {
@@ -21,14 +21,14 @@
         "parameters": []
       }
     },
-    "cpus": 0.5,
+    "cpus": 0.2,
     "disk": 0,
     "env": {
       "REDIS_HOST": "robotshopredis.marathon.l4lb.thisdcos.directory",
       "CATALOGUE_HOST": "robotshopcatalogue.marathon.l4lb.thisdcos.directory"
     },
     "instances": 1,
-    "maxLaunchDelaySeconds": 3600,
+    "maxLaunchDelaySeconds": 900,
     "mem": 128,
     "gpus": 0,
     "networks": [

diff --git a/DCOS/catalogue.json → DCOS/manifest/catalogue.json b/DCOS/catalogue.json → DCOS/manifest/catalogue.json
@@ -1,7 +1,7 @@
 {
     "id": "/robotshop/catalogue",
     "backoffFactor": 1.15,
-    "backoffSeconds": 1,
+    "backoffSeconds": 30,
     "container": {
       "portMappings": [
         {
@@ -21,13 +21,13 @@
         "parameters": []
       }
     },
-    "cpus": 0.5,
+    "cpus": 0.2,
     "disk": 0,
     "env": {
       "MONGO_URL": "mongodb://robotshopmongodb.marathon.l4lb.thisdcos.directory:27017/catalogue"
     },
     "instances": 1,
-    "maxLaunchDelaySeconds": 3600,
+    "maxLaunchDelaySeconds": 900,
     "mem": 256,
     "gpus": 0,
     "networks": [

diff --git a/DCOS/dispatch.json → DCOS/manifest/dispatch.json b/DCOS/dispatch.json → DCOS/manifest/dispatch.json
@@ -1,7 +1,7 @@
 {
     "id": "/robotshop/dispatch",
     "backoffFactor": 1.15,
-    "backoffSeconds": 1,
+    "backoffSeconds": 30,
     "container": {
       "portMappings": [],
       "type": "DOCKER",
@@ -13,13 +13,13 @@
         "parameters": []
       }
     },
-    "cpus": 0.5,
+    "cpus": 0.2,
     "disk": 0,
     "env": {
       "AMQP_HOST": "robotshoprabbitmq.marathon.l4lb.thisdcos.directory"
     },
     "instances": 1,
-    "maxLaunchDelaySeconds": 3600,
+    "maxLaunchDelaySeconds": 900,
     "mem": 128,
     "gpus": 0,
     "networks": [

diff --git a/DCOS/mongodb.json → DCOS/manifest/mongodb.json b/DCOS/mongodb.json → DCOS/manifest/mongodb.json
@@ -1,7 +1,7 @@
 {
     "id": "/robotshop/mongodb",
     "backoffFactor": 1.15,
-    "backoffSeconds": 1,
+    "backoffSeconds": 30,
     "container": {
       "portMappings": [
         {
@@ -21,10 +21,10 @@
         "parameters": []
       }
     },
-    "cpus": 0.5,
+    "cpus": 0.2,
     "disk": 0,
     "instances": 1,
-    "maxLaunchDelaySeconds": 3600,
+    "maxLaunchDelaySeconds": 900,
     "mem": 256,
     "gpus": 0,
     "networks": [

diff --git a/DCOS/mysql.json → DCOS/manifest/mysql.json b/DCOS/mysql.json → DCOS/manifest/mysql.json
@@ -1,7 +1,7 @@
 {
     "id": "/robotshop/mysql",
     "backoffFactor": 1.15,
-    "backoffSeconds": 1,
+    "backoffSeconds": 30,
     "container": {
       "portMappings": [
         {
@@ -21,10 +21,10 @@
         "parameters": []
       }
     },
-    "cpus": 0.5,
+    "cpus": 0.2,
     "disk": 0,
     "instances": 1,
-    "maxLaunchDelaySeconds": 3600,
+    "maxLaunchDelaySeconds": 900,
     "mem": 512,
     "gpus": 0,
     "networks": [

diff --git a/DCOS/payment.json → DCOS/manifest/payment.json b/DCOS/payment.json → DCOS/manifest/payment.json
@@ -1,7 +1,7 @@
 {
     "id": "/robotshop/payment",
     "backoffFactor": 1.15,
-    "backoffSeconds": 1,
+    "backoffSeconds": 30,
     "container": {
       "portMappings": [
         {
@@ -21,13 +21,13 @@
         "parameters": []
       }
     },
-    "cpus": 0.5,
+    "cpus": 0.2,
     "disk": 0,
     "env": {
       "AMQP_HOST": "robotshoprabbitmq.marathon.l4lb.thisdcos.directory"
     },
     "instances": 1,
-    "maxLaunchDelaySeconds": 3600,
+    "maxLaunchDelaySeconds": 900,
     "mem": 128,
     "gpus": 0,
     "networks": [

diff --git a/DCOS/rabbitmq.json → DCOS/manifest/rabbitmq.json b/DCOS/rabbitmq.json → DCOS/manifest/rabbitmq.json
@@ -1,7 +1,7 @@
 {
     "id": "/robotshop/rabbitmq",
     "backoffFactor": 1.15,
-    "backoffSeconds": 1,
+    "backoffSeconds": 30,
     "container": {
       "portMappings": [
         {
@@ -28,10 +28,10 @@
         "parameters": []
       }
     },
-    "cpus": 0.5,
+    "cpus": 0.2,
     "disk": 0,
     "instances": 1,
-    "maxLaunchDelaySeconds": 3600,
+    "maxLaunchDelaySeconds": 900,
     "mem": 256,
     "gpus": 0,
     "networks": [

diff --git a/DCOS/redis.json → DCOS/manifest/redis.json b/DCOS/redis.json → DCOS/manifest/redis.json
@@ -1,7 +1,7 @@
 {
     "id": "/robotshop/redis",
     "backoffFactor": 1.15,
-    "backoffSeconds": 1,
+    "backoffSeconds": 30,
     "container": {
       "portMappings": [
         {
@@ -21,10 +21,10 @@
         "parameters": []
       }
     },
-    "cpus": 0.5,
+    "cpus": 0.2,
     "disk": 0,
     "instances": 1,
-    "maxLaunchDelaySeconds": 3600,
+    "maxLaunchDelaySeconds": 900,
     "mem": 128,
     "gpus": 0,
     "networks": [

diff --git a/DCOS/shipping.json → DCOS/manifest/shipping.json b/DCOS/shipping.json → DCOS/manifest/shipping.json
@@ -1,7 +1,7 @@
 {
     "id": "/robotshop/shipping",
     "backoffFactor": 1.15,
-    "backoffSeconds": 1,
+    "backoffSeconds": 30,
     "container": {
       "portMappings": [
         {
@@ -28,7 +28,7 @@
       "CART_ENDPOINT": "robotshopcart.marathon.l4lb.thisdcos.directory:8080"
     },
     "instances": 1,
-    "maxLaunchDelaySeconds": 3600,
+    "maxLaunchDelaySeconds": 900,
     "mem": 512,
     "gpus": 0,
     "networks": [

diff --git a/DCOS/user.json → DCOS/manifest/user.json b/DCOS/user.json → DCOS/manifest/user.json
@@ -1,7 +1,7 @@
 {
     "id": "/robotshop/user",
     "backoffFactor": 1.15,
-    "backoffSeconds": 1,
+    "backoffSeconds": 30,
     "container": {
       "portMappings": [
         {
@@ -21,14 +21,14 @@
         "parameters": []
       }
     },
-    "cpus": 0.5,
+    "cpus": 0.2,
     "disk": 0,
     "env": {
       "REDIS_HOST": "robotshopredis.marathon.l4lb.thisdcos.directory",
       "MONGO_URL": "mongodb://robotshopmongodb.marathon.l4lb.thisdcos.directory:27017/users"
     },
     "instances": 1,
-    "maxLaunchDelaySeconds": 3600,
+    "maxLaunchDelaySeconds": 900,
     "mem": 128,
     "gpus": 0,
     "networks": [

diff --git a/DCOS/web.json → DCOS/manifest/web.json b/DCOS/web.json → DCOS/manifest/web.json
@@ -1,7 +1,7 @@
 {
     "id": "/robotshop/web",
     "backoffFactor": 1.15,
-    "backoffSeconds": 1,
+    "backoffSeconds": 30,
     "container": {
       "portMappings": [
         {
@@ -21,7 +21,7 @@
         "parameters": []
       }
     },
-    "cpus": 0.5,
+    "cpus": 0.1,
     "disk": 0,
     "env": {
       "PAYMENT_HOST": "robotshoppayment.marathon.l4lb.thisdcos.directory",
@@ -31,7 +31,7 @@
       "SHIPPING_HOST": "robotshopshipping.marathon.l4lb.thisdcos.directory"
     },
     "instances": 1,
-    "maxLaunchDelaySeconds": 3600,
+    "maxLaunchDelaySeconds": 900,
     "mem": 128,
     "gpus": 0,
     "networks": [