bin/vcap_dev_setup & chefsolo_launch.rb take a -D flag to override th…

…e domain (instead of vcap.me) Change-Id: If6b6cc63e21f9cbd20c3787ec0e2d159932ec477
cloudfoundry-attic · Dec 19, 2011 · d45b8ae · d45b8ae
1 parent ae8a71a
commit d45b8ae
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/dev_setup/bin/vcap_dev_setup b/dev_setup/bin/vcap_dev_setup
@@ -12,6 +12,7 @@ OPTIONS:
   -p           http proxy i.e. -p http://username:password@host:port/
   -c           deployment config
   -d           cloudfoundry home
+  -D           cloudfoundry domain (default: vcap.me)
   -r           cloud foundry repo
   -b           cloud foundry repo branch/tag/SHA
 EOF
@@ -43,6 +44,9 @@ do
     d)
       CLOUDFOUNDRY_HOME=$OPTARG
       ;;
+    D)
+      CLOUDFOUNDRY_DOMAIN=$OPTARG
+      ;;
     r)
       VCAP_REPO=$OPTARG
       ;;
@@ -60,6 +64,10 @@ if [ -z "$CLOUDFOUNDRY_HOME" ]; then
   CLOUDFOUNDRY_HOME=~/cloudfoundry
 fi
 
+if [ -z "$CLOUDFOUNDRY_DOMAIN" ]; then
+  CLOUDFOUNDRY_DOMAIN=vcap.me
+fi
+
 if [ -z "$VCAP_REPO" ]; then
   VCAP_REPO=https://github.com/cloudfoundry/vcap.git
 fi
@@ -130,8 +138,12 @@ if [ -n "$CLOUDFOUNDRY_HOME" ]; then
   ARGS="-d $CLOUDFOUNDRY_HOME"
 fi
 
+if [ -n "$CLOUDFOUNDRY_DOMAIN" ]; then
+  ARGS="$ARGS -D $CLOUDFOUNDRY_DOMAIN"
+fi
+
 if [ -n "$CONFIG_FILE" ]; then
   ARGS="$ARGS -c $CONFIG_FILE"
 fi
 
-$CLOUDFOUNDRY_HOME/vcap/dev_setup/lib/chefsolo_launch.rb $ARGS
+$CLOUDFOUNDRY_HOME/vcap/dev_setup/lib/chefsolo_launch.rb $ARGS
diff --git a/dev_setup/lib/chefsolo_launch.rb b/dev_setup/lib/chefsolo_launch.rb
@@ -15,12 +15,14 @@
 
 script_dir = File.expand_path(File.dirname(__FILE__))
 cloudfoundry_home = Deployment.get_cloudfoundry_home
+cloudfoundry_domain = Deployment.get_cloudfoundry_domain
 deployment_spec = File.expand_path(File.join(script_dir, "..", DEPLOYMENT_DEFAULT_SPEC))
 
 args = ARGV.dup
 opts_parser = OptionParser.new do |opts|
   opts.on('--config CONFIG_FILE', '-c CONFIG_FILE') { |file| deployment_spec = File.expand_path(file.to_s) }
   opts.on('--dir CLOUDFOUNDRY_HOME', '-d CLOUDFOUNDRY_HOME') { |dir| cloudfoundry_home = File.expand_path(dir.to_s) }
+  opts.on('--domain CLOUDFOUNDRY_DOMAIN', '-D CLOUDFOUNDRY_DOMAIN') { |domain| cloudfoundry_domain = domain }
 end
 args = opts_parser.parse!(args)
 
@@ -37,6 +39,7 @@
 spec["deployment"]["name"] ||= DEPLOYMENT_DEFAULT_NAME
 spec["deployment"]["user"] ||= ENV["USER"]
 spec["deployment"]["group"] ||= `id -g`.strip
+spec["deployment"]["domain"] ||= cloudfoundry_domain
 spec["cloudfoundry"] ||= {}
 spec["cloudfoundry"]["home"] ||= cloudfoundry_home
 spec["cloudfoundry"]["home"] = File.expand_path(spec["cloudfoundry"]["home"])

diff --git a/dev_setup/lib/vcap_defs.rb b/dev_setup/lib/vcap_defs.rb
@@ -34,6 +34,7 @@ class String
 
 DEPLOYMENT_DEFAULT_SPEC = File.join("deployments", "devbox.yml")
 DEPLOYMENT_DEFAULT_NAME = "devbox"
+DEPLOYMENT_DEFAULT_DOMAIN = "vcap.me"
 DEPLOYMENT_CONFIG_DIR_NAME = "config"
 DEPLOYMENT_CONFIG_FILE_NAME = "deploy.json"
 DEPLOYMENT_VCAP_CONFIG_FILE_NAME = "vcap_components.json"
@@ -48,6 +49,10 @@ def get_cloudfoundry_home
       File.expand_path(File.join(ENV["HOME"], "cloudfoundry"))
     end
 
+    def get_cloudfoundry_domain
+      DEPLOYMENT_DEFAULT_DOMAIN
+    end
+
     def get_config_path(name, cloudfoundry_home=nil)
       cloudfoundry_home ||= get_cloudfoundry_home
       File.expand_path(File.join(cloudfoundry_home, ".deployments", name, DEPLOYMENT_CONFIG_DIR_NAME))