From 178a67d048a8a5b5ca3a2e549ea6ed74382cf9cd Mon Sep 17 00:00:00 2001
From: Mate Lakat <mate.lakat@citrix.com>
Date: Thu, 6 Feb 2014 12:29:21 +0000
Subject: [PATCH 1/2] Use standard flavors

---
 launch-node.sh       | 4 +++-
 update-node-image.sh | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/launch-node.sh b/launch-node.sh
index d8b7fc7..ed11f24 100755
--- a/launch-node.sh
+++ b/launch-node.sh
@@ -7,6 +7,8 @@ KEY_NAME="$1"
 KEY_PATH="$2"
 IMAGE="node"
 INSTANCE_NAME="$3"
+FLAVOR="8GB Standard Instance"
+#FLAVOR="performance1-8"
 
 . $THISDIR/functions
 
@@ -17,7 +19,7 @@ nova delete "$INSTANCE_NAME" || true
 nova boot \
     --poll \
     --image "$IMAGE" \
-    --flavor "performance1-8" \
+    --flavor "$FLAVOR" \
     --key-name $KEY_NAME $INSTANCE_NAME
 
 IP=$(xitc-get-ip-address-of-instance $INSTANCE_NAME)
diff --git a/update-node-image.sh b/update-node-image.sh
index 8ed350c..92fdeab 100755
--- a/update-node-image.sh
+++ b/update-node-image.sh
@@ -10,6 +10,8 @@ KEY_NAME="$1"
 KEY_PATH="$2"
 INSTANCE_NAME="$3"
 NODE_IMAGE="node"
+FLAVOR="8GB Standard Instance"
+#FLAVOR="performance1-8"
 
 # Use this configuration to start with a cloud image
 IMAGE="62df001e-87ee-407c-b042-6f4e13f5d7e1"
@@ -26,7 +28,7 @@ nova image-delete "$NODE_IMAGE" || true
 nova boot \
     --poll \
     --image "$IMAGE" \
-    --flavor "performance1-8" \
+    --flavor "$FLAVOR" \
     --key-name $KEY_NAME $INSTANCE_NAME
 
 IP=$(xitc-get-ip-address-of-instance $INSTANCE_NAME)

From 5d20c4c6baa292c6b78b697bedba6107848fe86d Mon Sep 17 00:00:00 2001
From: Mate Lakat <mate.lakat@citrix.com>
Date: Thu, 6 Feb 2014 12:30:40 +0000
Subject: [PATCH 2/2] Expect flavor as a command line parameter

---
 launch-node.sh       | 3 +--
 update-node-image.sh | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/launch-node.sh b/launch-node.sh
index ed11f24..51b3dc6 100755
--- a/launch-node.sh
+++ b/launch-node.sh
@@ -7,8 +7,7 @@ KEY_NAME="$1"
 KEY_PATH="$2"
 IMAGE="node"
 INSTANCE_NAME="$3"
-FLAVOR="8GB Standard Instance"
-#FLAVOR="performance1-8"
+FLAVOR="$4"
 
 . $THISDIR/functions
 
diff --git a/update-node-image.sh b/update-node-image.sh
index 92fdeab..140c635 100755
--- a/update-node-image.sh
+++ b/update-node-image.sh
@@ -10,8 +10,7 @@ KEY_NAME="$1"
 KEY_PATH="$2"
 INSTANCE_NAME="$3"
 NODE_IMAGE="node"
-FLAVOR="8GB Standard Instance"
-#FLAVOR="performance1-8"
+FLAVOR="$4"
 
 # Use this configuration to start with a cloud image
 IMAGE="62df001e-87ee-407c-b042-6f4e13f5d7e1"