From f929f3f94c7c89e40f9c8e2b85293f496101aebe Mon Sep 17 00:00:00 2001
From: Akram Ben Aissi <akram@free.fr>
Date: Thu, 11 Dec 2014 13:52:16 +0100
Subject: Adding AWS support to openshift-ansible module - Update documentation
 to say that ssh configuration need to point to the private key file -
 Removing the -p argument when calling time .... because it is misintrepreted
 by ruby - Turning the cluster.sh to agnostic in its help/error message by
 replacing explicit reference to GCE by a a variable - Fixing a bug within the
 playbooks that incorrectly references the minions and master fact group. -
 Adding playbooks for AWS, which are almost of copy/paste for those of GCE -
 Added environment variable OO_PROVIDER to allow definition of the provider.
 Defaults is gce - TODO implement the terminate.yml cookbook

---
 cluster.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'cluster.sh')

diff --git a/cluster.sh b/cluster.sh
index 035602620..73c87eb95 100755
--- a/cluster.sh
+++ b/cluster.sh
@@ -2,7 +2,16 @@
 
 MINIONS=3
 MASTERS=1
-PROVIDER=gce
+
+# If the environment variable OO_PROVDER is defined, it used for the provider
+PROVIDER=$OO_PROVIDER
+# Otherwise, default is gce (Google Compute Engine)
+if [ "x$PROVIDER" == "x" ];then
+   PROVIDER=gce
+fi
+
+UPPER_CASE_PROVIDER=$(echo $PROVIDER | tr '[:lower:]' '[:upper:]')
+
 
 # FIXME: Add options
 MASTER_PLAYBOOK=openshift-master
@@ -12,10 +21,10 @@ MINION_PLAYBOOK=openshift-minion
 # @formatter:off
 function usage {
     cat 1>&2 <<-EOT
-        ${0} : [create|terminate|update|list] {GCE environment tag}
+        ${0} : [create|terminate|update|list] { ${UPPER_CASE_PROVIDER} environment tag}
 
         Supported environment tags:
-        $(grep 'SUPPORTED_ENVS.*=' ./lib/gce_command.rb)
+        $(grep 'SUPPORTED_ENVS.*=' ./lib/${PROVIDER}_command.rb)
 EOT
 }
 # @formatter:on
-- 
cgit v1.2.3