Merge branch 'dev'

1 files changed, 4 insertions, 3 deletions

diff --git a/bin/install_script.sh b/bin/install_script.sh
index bd7f38b..36cc594 100755
--- a/bin/install_script.sh
+++ b/bin/install_script.sh
@@ -5,6 +5,9 @@ cat <<EOF
 $(basename $0) [options]
   --help,-h               This help
 
+  Please chose environment:
+  --environment env       Environment to use for the install
+
   One of the following options is necessary:
   --instance-id id        Id of the cloud instance
   --vps-id id             Id of the vps
@@ -17,14 +20,12 @@ $(basename $0) [options]
   --no-reboot-start       Don't reboot to rescue at the beginning
   --no-reboot-end         Don't reboot to normal at the end
   --git-branch branch     Use another puppet branch (default: master)
-  --environment env       Environment to use for the install (default: production)
 EOF
 }
 
 set -e
 
 git_branch=master
-environment=production
 host_user=""
 password=""
 T=""
@@ -89,7 +90,7 @@ while [ -n "$1" ]; do
   shift
 done
 
-if [ -z "$T" -o -z "$host_id" ]; then
+if [ -z "$T" -o -z "$host_id" -o -z "$environment" ]; then
   usage
   exit 1
 fi