From 7ada64e16cb47dfadfe9d601a584367ca149f397 Mon Sep 17 00:00:00 2001
From: Sebastian Haderecker <sebastian.haderecker@gmail.com>
Date: Fri, 5 Apr 2019 06:15:31 +0000
Subject: [PATCH] Reorganized ECS settings

- Reordered settings to match API call
- Moved disksize to .ecs_settings.sh
---
 cloud/.ecs_settings.sh            | 11 ++++++-----
 cloud/deploy_ansible_otc_t-pot.sh |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cloud/.ecs_settings.sh b/cloud/.ecs_settings.sh
index a3d6fe2b..48091e7a 100644
--- a/cloud/.ecs_settings.sh
+++ b/cloud/.ecs_settings.sh
@@ -2,9 +2,10 @@
 linuxpass=LiNuXuSeRPaSs#
 
 # Set ECS related stuff
-vpcname=your-vpc
-subnet=your-subnet
-keyname=your-KeyPair
-az=eu-de-03
-secgroup=your-sg
 instance=s2.medium.8
+subnet=your-subnet
+vpcname=your-vpc
+secgroup=your-sg
+keyname=your-KeyPair
+disksize=128
+az=eu-de-03
diff --git a/cloud/deploy_ansible_otc_t-pot.sh b/cloud/deploy_ansible_otc_t-pot.sh
index 6b2dfa1d..90d4fc1a 100755
--- a/cloud/deploy_ansible_otc_t-pot.sh
+++ b/cloud/deploy_ansible_otc_t-pot.sh
@@ -34,11 +34,11 @@ echo "### Creating new ECS host via OTC API..."
     --admin-pass          $linuxpass\
     --key-name            $keyname\
     --public              true\
-    --disksize            128\
+    --disksize            $disksize\
     --disktype            SATA\
     --az	          $az\
     --wait \
-2> /dev/null
+#2> /dev/null
 
 if [ "$(uname)" == "Darwin" ]; then
    PUBIP=$(./otc-tools/otc.sh ecs list 2>/dev/null | grep $HPNAME|cut -d "," -f2 |cut -d "\"" -f 2)
@@ -50,7 +50,7 @@ echo "[TPOT]" > ./hosts/$HPNAME
 echo $PUBIP  HPNAME=$HPNAME>> ./hosts/$HPNAME
 echo "### NEW HOST $HPNAME ON IP $PUBIP"
 
-ansible-playbook -i ./hosts/$HPNAME ./ansible/install.yaml
+#ansible-playbook -i ./hosts/$HPNAME ./ansible/install.yaml
 echo "***********************************************"
 echo "*****        SSH TO TARGET: "
 echo "*****        ssh linux@$PUBIP -p 64295"