bosh-bootstrap 0.8.2 → 0.9.0

data/lib/bosh-bootstrap/cli.rb

@@ -18,26 +18,29 @@ module Bosh::Bootstrap
     include Bosh::Bootstrap::Helpers::SettingsSetter
     include FileUtils
 
+    AWS_JENKINS_BUCKET = "bosh-jenkins-artifacts"
+
     attr_reader :fog_credentials
     attr_reader :server
 
     desc "deploy", "Bootstrap Micro BOSH, and optionally an Inception VM"
+    method_option :"edge-prebuilt", :type => :boolean, :desc => "Use AWS us-east-1 gems & prebuilt AMIs"
+    method_option :"edge", :type => :boolean, :desc => "Use pre-built gems; create microbosh from source [temporary default]"
     method_option :fog, :type => :string, :desc => "fog config file (default: ~/.fog)"
     method_option :"upgrade-deps", :type => :boolean, :desc => "Force upgrade dependencies, packages & gems"
-    method_option :"edge-deployer", :type => :boolean, :desc => "Install bosh deployer from git instead of rubygems"
-    method_option :"stable-stemcell", :type => :boolean, :desc => "Use recent stable microbosh stemcell"
-    method_option :"latest-stemcell", :type => :boolean, :desc => "Use latest microbosh stemcell; possibly not tagged stable [default]"
-    method_option :"edge-stemcell", :type => :boolean, :desc => "Create custom stemcell from BOSH git source"
     def deploy
       migrate_old_settings
       load_deploy_options # from method_options above
 
       deploy_stage_1_choose_infrastructure_provider
+      load_provider_specific_options
+
       deploy_stage_2_bosh_configuration
       deploy_stage_3_create_allocate_inception_vm
       deploy_stage_4_prepare_inception_vm
-      deploy_stage_5_deploy_micro_bosh
-      deploy_stage_6_setup_new_bosh
+      deploy_stage_5_salted_password
+      deploy_stage_6_deploy_micro_bosh
+      deploy_stage_7_setup_new_bosh
     end
 
     desc "upgrade-inception", "Upgrade inception VM with latest packages, gems, security group ports"
@@ -96,6 +99,7 @@ module Bosh::Bootstrap
 
     no_tasks do
       DEFAULT_INCEPTION_VOLUME_SIZE = 32 # Gb
+      DEFAULT_MICROBOSH_VOLUME_SIZE = 16 # Gb
 
       def deploy_stage_1_choose_infrastructure_provider
         header "Stage 1: Choose infrastructure"
@@ -161,13 +165,17 @@ module Bosh::Bootstrap
         confirm "Micro BOSH instance type will be #{settings[:bosh_resources_cloud_properties]["instance_type"]}"
 
         unless settings[:bosh]
-          say "Defaulting to 16Gb persistent disk for BOSH"
           password        = settings.bosh_password # FIXME dual use of password?
           settings[:bosh] = {}
           settings[:bosh][:password] = password
-          settings[:bosh][:persistent_disk] = 16384
+          if openstack?
+            settings[:bosh][:persistent_disk] = prompt_for_disk_space("Micro BOSH VM", DEFAULT_MICROBOSH_VOLUME_SIZE) * 1024
+          else
+            settings[:bosh][:persistent_disk] = DEFAULT_MICROBOSH_VOLUME_SIZE * 1024
+          end
           save_settings!
         end
+        confirm "Micro BOSH persistent disk size will be #{settings.bosh.persistent_disk} Mb"
 
         unless settings[:bosh]["ip_address"]
           if vpc?
@@ -242,6 +250,8 @@ module Bosh::Bootstrap
             create_inception_key_pair
           end
           recreate_local_ssh_keys_for_inception_vm
+          create_security_group_for_inception_vm
+          
           aws? ? boot_aws_inception_vm : boot_openstack_inception_vm
         end
         # If successfully validate inception VM, then save those settings.
@@ -267,9 +277,6 @@ module Bosh::Bootstrap
           unless run_server(Bosh::Bootstrap::Stages::StagePrepareInceptionVm.new(settings).commands)
             error "Failed to complete Stage 4: Preparing the Inception VM"
           end
-          # Settings are updated by this stage
-          # it generates a salted password from settings.bosh.password
-          # and stores it in settings.bosh.salted_password
           settings["inception"]["prepared"] = true
           save_settings!
         else
@@ -277,23 +284,42 @@ module Bosh::Bootstrap
         end
       end
 
-      def deploy_stage_5_deploy_micro_bosh
-        header "Stage 5: Deploying micro BOSH"
+      def deploy_stage_5_salted_password
+        unless settings["bosh"] && settings["bosh"]["salted_password"]
+          header "Stage 5: Generate salted password"
+          recreate_local_ssh_keys_for_inception_vm
+
+          unless run_server(Bosh::Bootstrap::Stages::SaltedPassword.new(settings).commands)
+            error "Failed to complete Stage 5: Generate salted password"
+          end
+          save_settings!
+        else
+          header "Stage 5: Generate salted password", skipping: "Already generated salted password"
+        end
+      end
+
+      def deploy_stage_6_deploy_micro_bosh
+        header "Stage 6: Deploying micro BOSH"
         recreate_local_ssh_keys_for_inception_vm
+        switch_to_prebuilt_microbosh_ami_if_available
 
         unless run_server(Bosh::Bootstrap::Stages::MicroBoshDeploy.new(settings).commands)
-          error "Failed to complete Stage 5: Deploying micro BOSH"
+          error "Failed to complete Stage 6: Deploying micro BOSH"
         end
+        # Settings are updated by this stage
+        # it generates a salted password from settings.bosh.password
+        # and stores it in settings.bosh.salted_password
+        save_settings!
 
         confirm "Successfully built micro BOSH"
       end
 
-      def deploy_stage_6_setup_new_bosh
+      def deploy_stage_7_setup_new_bosh
         # TODO change to a polling test of director being available
         say "Pausing to wait for BOSH Director..."
         sleep 5
 
-        header "Stage 6: Setup bosh"
+        header "Stage 7: Setup bosh"
         unless run_server(Bosh::Bootstrap::Stages::SetupNewBosh.new(settings).commands)
           error "Failed to complete Stage 6: Setup bosh"
         end
@@ -380,13 +406,13 @@ module Bosh::Bootstrap
       end
 
       def ensure_inception_vm
-        unless settings[:inception]
+        unless settings["inception"]
           say "No inception VM being used", :yellow
           exit 0
         end
       end
       def ensure_inception_vm_has_launched
-        unless settings.inception[:host]
+        unless settings.inception["host"]
           exit "Inception VM has not finished launching; run to complete: #{self.class.banner_base} deploy"
         end
       end
@@ -458,29 +484,7 @@ module Bosh::Bootstrap
       def load_deploy_options
         settings["fog_path"] = File.expand_path(options[:fog] || "~/.fog")
 
-        settings["git"] ||= {}
-        settings["git"]["name"] ||= `git config user.name`.strip
-        settings["git"]["email"] ||= `git config user.email`.strip
-        if settings["git"]["name"].empty? || settings["git"]["email"].empty?
-          error "Cannot find your git identity. Please set git user.name and user.email before proceeding"
-        end
-
-        settings["bosh_git_source"] = options[:"edge-deployer"] # use bosh git repo instead of rubygems
-
-        # determine which micro-bosh stemcell to download/create
-        if options[:"stable-stemcell"]
-          settings["micro_bosh_stemcell_type"] = "stable"
-          settings["micro_bosh_stemcell_name"] = nil # force name to be refetched
-        elsif options[:"latest-stemcell"]
-          settings["micro_bosh_stemcell_type"] = "latest"
-          settings["micro_bosh_stemcell_name"] = nil # force name to be refetched
-        elsif options[:"edge-stemcell"]
-          settings["micro_bosh_stemcell_type"] = "custom"
-          settings["micro_bosh_stemcell_name"] = "custom"
-        end
-        # may have already been set from previous deploy run
-        # default to "latest" for both AWS and OpenStack at the moment (no useful stable stemcells)
-        settings["micro_bosh_stemcell_type"] ||= "latest"
+        prompt_git_user_information
 
         # once a stemcell is downloaded or created; these fields above should
         # be uploaded with values such as:
@@ -494,6 +498,42 @@ module Bosh::Bootstrap
         save_settings!
       end
 
+      def load_provider_specific_options
+        # before deploy stage - need to change type => ami if AWS us-east-1?
+        if options[:"edge-prebuilt"] || settings.delete("edge-prebuilt")
+          if aws?
+            settings["micro_bosh_stemcell_type"] = "edge-prebuilt"
+            settings["micro_bosh_stemcell_name"] = "edge-prebuilt"
+          else
+            error "Currently --edge-prebuilt is not available for #{bosh_provider} :("
+          end
+        elsif options[:"edge"] || settings.delete("edge")
+          settings["micro_bosh_stemcell_type"] = "custom"
+          settings["micro_bosh_stemcell_name"] = "custom"
+        else
+          if settings["fog_credentials"] && aws?
+            # currently defaulting to latest prebuilt stemcells/amis until 1.5.0 is released
+            settings["micro_bosh_stemcell_type"] = "edge-prebuilt"
+            settings["micro_bosh_stemcell_name"] = "edge-prebuilt"
+          else
+            settings["micro_bosh_stemcell_type"] = "custom"
+            settings["micro_bosh_stemcell_name"] = "custom"
+          end
+        end
+      end
+
+      def prompt_git_user_information
+        settings["git"] ||= {}
+        settings["git"]["name"] ||= `git config user.name`.strip
+        while settings["git"]["name"].empty?
+          settings["git"]["name"] = hl.ask("What is your name? (to setup git on inception VM) ")
+        end
+        settings["git"]["email"] ||= `git config user.email`.strip
+        while settings["git"]["email"].empty?
+          settings["git"]["email"] = hl.ask("What is your email? (to setup git on inception VM) ")
+        end
+      end
+
       # Displays a prompt for known IaaS that are configured
       # within .fog config file.
       #
@@ -752,13 +792,11 @@ module Bosh::Bootstrap
           nats_server: 4222,
           message_bus: 6868,
           blobstore: 25250,
-          bosh_director: 25555
+          bosh_director: 25555,
+          bosh_registry: 25777
         }
-        if aws?
-          ports[:aws_registry] = 25777
-        elsif openstack?
-          ports[:openstack_registry] = 25889
-        end
+        # TODO: New stemcells to be released will use 25777, so this can be deleted
+        ports[:openstack_registry] = 25889 if openstack?
 
         provider.create_security_group(security_group_name, "microbosh", ports)
 
@@ -770,6 +808,27 @@ module Bosh::Bootstrap
         save_settings!
       end
 
+      # Creates a security group for the inception VM allowing SSH access & ICMP traffic
+      #
+      # Adds settings:
+      # * inception.security_group
+      def create_security_group_for_inception_vm
+        
+        return if settings["inception"]["security_group"] 
+
+        ports = {
+          ssh_access: 22,
+          ping: { protocol: "icmp", ports: (-1..-1) } 
+        }
+        security_group_name = "#{settings.bosh_name}-inception-vm"
+
+        provider.create_security_group(security_group_name, "inception-vm", ports)
+
+        settings["inception"] ||= {}
+        settings["inception"]["security_group"] = security_group_name
+        save_settings!
+      end
+
       # Creates a key pair, and stores the private key in settings manifest.
       # Also sets up the bosh_cloud_properties for the remote server
       # to have the .pem key installed.
@@ -868,6 +927,7 @@ module Bosh::Bootstrap
           key_name = settings["inception"]["key_pair"]["name"]
           say "Provisioning #{size} for inception VM..."
           inception_vm_attributes = {
+            :groups => [settings["inception"]["security_group"]],
             :key_name => key_name,
             :private_key_path => inception_vm_private_key_path,
             :flavor_id => size,
@@ -979,15 +1039,18 @@ module Bosh::Bootstrap
           server = fog_compute.servers.create(
             :name => "Inception VM",
             :key_name => key_name,
+            :private_key_path => inception_vm_private_key_path,
             :flavor_ref => inception_flavor.id,
             :image_ref => inception_image.id,
+            :security_groups => [settings["inception"]["security_group"]],
             :username => username
           )
+          server.wait_for { ready? }
           unless server
             error "Something mysteriously cloudy happened and fog could not provision a VM. Please check your limits."
           end
-          server.wait_for { ready? }
 
+          settings["inception"].delete("create_new")
           settings["inception"]["server_id"] = server.id
           settings["inception"]["username"] = username
           save_settings!
@@ -1008,17 +1071,14 @@ module Bosh::Bootstrap
         unless server.public_ip_address
           server.addresses["public"] = [settings["inception"]["ip_address"]]
         end
-        unless server.public_key_path
-          server.public_key_path = public_key_path
-        end
         unless server.private_key_path
-          server.private_key_path = private_key_path
+          server.private_key_path = inception_vm_private_key_path
         end
         server.username = settings["inception"]["username"]
         Fog.wait_for(60) { server.sshable? }
 
         unless settings["inception"]["disk_size"]
-          disk_size = DEFAULT_INCEPTION_VOLUME_SIZE # Gb
+          disk_size = prompt_for_disk_space("Inception VM", DEFAULT_INCEPTION_VOLUME_SIZE)
           device = "/dev/vdc"
           provision_and_mount_volume(server, disk_size, device)
 
@@ -1057,6 +1117,13 @@ module Bosh::Bootstrap
         server.reload
       end
 
+      def prompt_for_disk_space(disk_for, default_size = nil)
+        hl.ask("Size of disk for #{disk_for} (in Gb): ", Integer) do |q|
+          q.default = default_size if default_size
+          q.in = 1..1024
+        end
+      end
+
       # Provision a volume for a specific device (unless already provisioned)
       # Request that the +server+ mount the volume at the +device+ location.
       #
@@ -1068,10 +1135,15 @@ module Bosh::Bootstrap
         end
 
         # Format and mount the volume
-        say "Mounting persistent disk as volume on inception VM..."
-        run_ssh_command_until_successful server, "sudo mkfs.ext4 #{device} -F"
-        run_ssh_command_until_successful server, "sudo mkdir -p /var/vcap/store"
-        run_ssh_command_until_successful server, "sudo mount #{device} /var/vcap/store"
+        if aws?
+          say "Skipping volume mounting on AWS 12.10 inception VM until its fixed", [:yellow, :bold]
+          run_ssh_command_until_successful server, "sudo mkdir -p /var/vcap/store"
+        else
+          say "Mounting persistent disk as volume on inception VM..."
+          run_ssh_command_until_successful server, "sudo mkfs.ext4 #{device} -F"
+          run_ssh_command_until_successful server, "sudo mkdir -p /var/vcap/store"
+          run_ssh_command_until_successful server, "sudo mount #{device} /var/vcap/store"
+        end
       end
 
       def run_ssh_command_until_successful(server, cmd)
@@ -1130,7 +1202,8 @@ module Bosh::Bootstrap
       end
 
       def aws?
-        settings.fog_credentials.provider == "AWS"
+        (settings["fog_credentials"] && settings["fog_credentials"]["provider"] == "AWS") ||
+        (settings["bosh_provider"] == "aws")
       end
 
       def vpc?
@@ -1138,14 +1211,28 @@ module Bosh::Bootstrap
       end
 
       def openstack?
-        settings.fog_credentials.provider == "OpenStack"
+        (settings["fog_credentials"] && settings["fog_credentials"]["provider"] == "OpenStack") ||
+        (settings["bosh_provider"] == "openstack")
       end
 
       def prompt_for_bosh_credentials
-        prompt = hl
         say "Please enter a user/password for the BOSH that will be created."
+        prompt = hl
+        password_confirmation = nil
         settings[:bosh_username] = prompt.ask("BOSH username: ") { |q| q.default = `whoami`.strip }
-        settings[:bosh_password] = prompt.ask("BOSH password: ") { |q| q.echo = "x" }
+        while password_confirmation.nil? || settings[:bosh_password] == "" || settings[:bosh_password] != password_confirmation
+          settings[:bosh_password] = prompt.ask("BOSH password: ") { |q| q.echo = "x" }
+          if settings[:bosh_password] == ""
+            say "Please enter a password"
+            next
+          end
+          password_confirmation = prompt.ask("Confirm BOSH password: ") { |q| q.echo = "x" }
+          unless settings[:bosh_password] == password_confirmation
+            say "Password do not match. Try Again"
+            password_confirmation = nil
+          end
+        end
+
         save_settings!
       end
 
@@ -1161,6 +1248,24 @@ module Bosh::Bootstrap
         "0.8.1"
       end
 
+      def switch_to_prebuilt_microbosh_ami_if_available
+        if ami = latest_prebuilt_microbosh_ami
+          say "Switching to using prebuilt AMI for bonus speed!", :green
+          settings["micro_bosh_stemcell_type"] = "ami"
+          settings["micro_bosh_stemcell_name"] = ami
+          save_settings!
+        end
+      end
+
+      # return the latest prebuilt microbosh AMI if it is available for target region
+      def latest_prebuilt_microbosh_ami
+        if aws? && settings["region_code"] == "us-east-1"
+          Net::HTTP.get("#{AWS_JENKINS_BUCKET}.s3.amazonaws.com", "/last_successful_micro-bosh-stemcell_ami").strip
+        else
+          nil
+        end
+      end
+
       def latest_micro_bosh_stemcell_name
         stemcell_filter_tags = ['micro', provider_name]
         if settings["micro_bosh_stemcell_type"] == "stable"

data/lib/bosh-bootstrap/commander/remote_script_command.rb

@@ -11,22 +11,25 @@ module Bosh::Bootstrap::Commander
     attr_reader :full_past_tense    # e.g. "installed packages"
 
     # Optional:
-    attr_reader :specific_run_as_user # e.g. ubuntu
+    attr_reader :ssh_username # e.g. ubuntu or vcap
+    attr_reader :run_as_root
     attr_reader :settings             # settings manifest (result of script might get stored back)
     attr_reader :save_output_to_settings_key # e.g. bosh.salted_password
 
     def initialize(command, description, script, full_present_tense=nil, full_past_tense=nil, options={})
       super(command, description, full_present_tense, full_past_tense)
       @script = script
-      @specific_run_as_user = options[:user]
+      @ssh_username = options[:ssh_username]
+      @run_as_root = options[:run_as_root]
       @settings = options[:settings]
       @save_output_to_settings_key = options[:save_output_to_settings_key]
     end
 
     # Invoke this command to call back upon +server.run_script+ 
     def perform(server)
-      server.run_script(self, script, :user => specific_run_as_user,
-        :settings => settings, :save_output_to_settings_key => save_output_to_settings_key)
+      server.run_script(self, script,
+        ssh_username: ssh_username, run_as_root: run_as_root,
+        settings: settings, save_output_to_settings_key: save_output_to_settings_key)
     end
 
     # Provide a filename that represents this Command

data/lib/bosh-bootstrap/commander/remote_server.rb

@@ -5,12 +5,12 @@ class Bosh::Bootstrap::Commander::RemoteServer
 
   attr_reader :host
   attr_reader :private_key_path
-  attr_reader :default_username
+  attr_reader :default_ssh_username
   attr_reader :logfile
 
   def initialize(host, private_key_path, logfile=STDERR)
     @host, @private_key_path, @logfile = host, private_key_path, logfile
-    @default_username = "vcap" # unless overridden by a Command (before vcap exists)
+    @default_ssh_username = "vcap" # unless overridden by a Command (before vcap exists)
   end
 
   # Execute the +Command+ objects, in sequential order
@@ -42,13 +42,14 @@ class Bosh::Bootstrap::Commander::RemoteServer
   # Stores the last line of stripped STDOUT/STDERR into a settings field, 
   #   if :settings & :save_output_to_settings_key => "x.y.z" provided
   def run_script(command, script, options={})
-    run_as_user  = options[:user] || default_username
+    ssh_username = options[:ssh_username] || default_ssh_username
+    run_as_root  = options[:run_as_root]
     settings     = options[:settings]
     settings_key = options[:save_output_to_settings_key]
 
     remote_path = remote_tmp_script_path(command)
-    upload_file(command, remote_path, script, run_as_user)
-    output, status = run_remote_script(remote_path, run_as_user)
+    upload_file(command, remote_path, script, ssh_username)
+    output, status = run_remote_script(remote_path, ssh_username, run_as_root)
     output =~ /^(.*)\Z/
     last_line = $1
     # store output into a settings field, if requested
@@ -70,8 +71,8 @@ class Bosh::Bootstrap::Commander::RemoteServer
   end
 
   # Upload a file (put a file into the remote server's filesystem)
-  def upload_file(command, remote_path, contents, upload_as_user=nil)
-    upload_as_user ||= default_username
+  def upload_file(command, remote_path, contents, ssh_username=nil)
+    upload_as_user = ssh_username || default_ssh_username
     run_remote_command("mkdir -p #{File.dirname(remote_path)}", upload_as_user)
     Tempfile.open("remote_script") do |file|
       file << contents
@@ -98,13 +99,14 @@ class Bosh::Bootstrap::Commander::RemoteServer
   # * status (true = success)
   #
   # TODO catch exceptions http://learnonthejob.blogspot.com/2010/08/exception-handling-for-netssh.html
-  def run_remote_script(remote_path, username)
+  def run_remote_script(remote_path, ssh_username, run_as_root)
+    sudo = run_as_root ? "sudo " : ""
     commands = [
       "chmod +x #{remote_path}",
-      "bash -lc 'sudo /usr/bin/env PATH=$PATH #{remote_path}'"
+      "bash -lc '#{sudo}/usr/bin/env PATH=$PATH #{remote_path}'"
     ]
     script_output = ""
-    results = Fog::SSH.new(host, username, keys: private_keys).run(commands) do |stdout, stderr|
+    results = Fog::SSH.new(host, ssh_username, keys: private_keys).run(commands) do |stdout, stderr|
       [stdout, stderr].flatten.each do |data|
         logfile << data
         script_output << data

data/lib/bosh-bootstrap/stages/stage_micro_bosh_deploy/bosh_micro_deploy

@@ -7,6 +7,7 @@
 #   (thus /var/vcap/store/microboshes/deployments/$BOSH_NAME/micro_bosh.yml exists)
 # * $MICRO_BOSH_STEMCELL_NAME - public stemcell name at
 #   /var/vcap/store/stemcells/$MICRO_BOSH_STEMCELL_NAME
+# * $MICRO_BOSH_STEMCELL_TYPE - what type of stemcell (ami vs tgz)
 
 set -e # exit immediately if a simple command exits with a non-zero status
 set -u # report the usage of uninitialized variables
@@ -22,6 +23,9 @@ bosh -n micro deployment $BOSH_NAME
 if [[ "${MICRO_BOSH_STEMCELL_NAME}" == "custom" ]]; then
   MICRO_BOSH_STEMCELL_PATH=$(ls -t /var/tmp/bosh/bosh_agent-*/work/work/*.tgz | sort | tail -n 1)
   echo "Custom stemcell path $MICRO_BOSH_STEMCELL_PATH"
+elif [[ "${MICRO_BOSH_STEMCELL_TYPE}" == "ami" ]]; then
+  echo "Using AMI ${MICRO_BOSH_STEMCELL_NAME}"
+  MICRO_BOSH_STEMCELL_PATH=${MICRO_BOSH_STEMCELL_NAME}
 else
   echo "Downloaded stemcell path $MICRO_BOSH_STEMCELL_PATH"
 fi
@@ -56,7 +60,7 @@ else
   # determine if re-deploy, update, or delete&deploy
 
   stemcell_cid=$(echo $deployment | jazor stemcell_cid)
-  vm_cid=$(echo $deployment | jazor vm_id)
+  vm_cid=$(echo $deployment | jazor vm_cid)
   disk_cid=$(echo $deployment | jazor disk_cid)
 
   if [[ $stemcell_cid == "" && $vm_cid == "" && $disk_cid == "" ]]; then

data/lib/bosh-bootstrap/stages/stage_micro_bosh_deploy/download_micro_bosh_stemcell

@@ -5,6 +5,7 @@
 # Required:
 # * $MICRO_BOSH_STEMCELL_NAME - public stemcell name to be downloaded
 #                             - if 'custom' the create stemcell from BOSH source
+# * $MICRO_BOSH_STEMCELL_TYPE - what type of stemcell (ami vs tgz)
 #
 # Optional:
 # * $PROVIDER - required for 'custom' $MICRO_BOSH_STEMCELL_NAME; e.g. aws, openstack
@@ -13,17 +14,13 @@
 set -e # exit immediately if a simple command exits with a non-zero status
 set -u # report the usage of uninitialized variables
 
-if [[ $EUID -ne 0 ]]; then
-  echo "ERROR: This script must be run as root" 1>&2
-  exit 1
-fi
-
 if [[ "${MICRO_BOSH_STEMCELL_NAME}X" == "X" ]]; then
   echo 'INTERNAL ERROR: Missing $MICRO_BOSH_STEMCELL_NAME environment variable'
   exit 1
 fi
 
 STEMCELLS_DIR=/var/vcap/store/stemcells
+LAST_SUCCESSFUL_MICROBOSH_STEMCELL_URL=http://bosh-jenkins-artifacts.s3.amazonaws.com/last_successful_micro-bosh-stemcell.tgz
 
 if [[ "${MICRO_BOSH_STEMCELL_NAME}" == "custom" ]]; then
 
@@ -63,9 +60,18 @@ if [[ "${MICRO_BOSH_STEMCELL_NAME}" == "custom" ]]; then
 
   echo "Copying to stemcells folder..."
   MICRO_BOSH_STEMCELL_PATH=$(ls -t /var/tmp/bosh/bosh_agent-*/work/work/*.tgz | sort | tail -n 1)
-  mv $MICRO_BOSH_STEMCELL_PATH $STEMCELLS_DIR
+  sudo mv $MICRO_BOSH_STEMCELL_PATH $STEMCELLS_DIR
+  sudo chown vcap:vcap -R $STEMCELLS_DIR
   MICRO_BOSH_STEMCELL_NAME=$(basename $MICRO_BOSH_STEMCELL_PATH)
 
+elif [[ "${MICRO_BOSH_STEMCELL_TYPE}" == "edge-prebuilt" ]]; then
+  cd $STEMCELLS_DIR
+  curl -O $LAST_SUCCESSFUL_MICROBOSH_STEMCELL_URL
+  MICRO_BOSH_STEMCELL_NAME=$(basename $LAST_SUCCESSFUL_MICROBOSH_STEMCELL_URL)
+
+elif [[ "${MICRO_BOSH_STEMCELL_TYPE}" == "ami" ]]; then
+  echo "Using AMI ${MICRO_BOSH_STEMCELL_NAME}, so there is nothing to download."
+  
 elif [[ -f $STEMCELLS_DIR/$MICRO_BOSH_STEMCELL_NAME ]]; then
   echo "Stemcell $(pwd)/$MICRO_BOSH_STEMCELL_NAME already exists."
 

data/lib/bosh-bootstrap/stages/stage_micro_bosh_deploy.rb

@@ -15,8 +15,10 @@ module Bosh::Bootstrap::Stages
       @commands ||= Bosh::Bootstrap::Commander::Commands.new do |server|
         server.download "micro-bosh stemcell", script("download_micro_bosh_stemcell",
                       "MICRO_BOSH_STEMCELL_NAME" => settings.micro_bosh_stemcell_name,
+                      "MICRO_BOSH_STEMCELL_TYPE" => settings.micro_bosh_stemcell_type,
                       "PROVIDER" => settings.bosh_provider),
-                      :settings => settings, :save_output_to_settings_key => "micro_bosh_stemcell_name"
+                      :settings => settings,
+                      :save_output_to_settings_key => "micro_bosh_stemcell_name"
         server.upload_file \
                       "/var/vcap/store/microboshes/deployments/#{settings.bosh_name}/micro_bosh.yml",
                       micro_bosh_manifest
@@ -26,6 +28,7 @@ module Bosh::Bootstrap::Stages
         server.deploy "micro bosh", script("bosh_micro_deploy",
                       "BOSH_NAME" => settings.bosh_name,
                       "MICRO_BOSH_STEMCELL_NAME" => settings.micro_bosh_stemcell_name,
+                      "MICRO_BOSH_STEMCELL_TYPE" => settings.micro_bosh_stemcell_type,
                       "BOSH_HOST" => settings.bosh.ip_address,
                       "BOSH_USERNAME" => settings.bosh_username,
                       "BOSH_PASSWORD" => settings.bosh_password)

data/lib/bosh-bootstrap/stages/stage_prepare_inception_vm/configure_git

@@ -10,11 +10,6 @@
 
 set -e # exit immediately if a simple command exits with a non-zero status
 
-if [[ $EUID -ne 0 ]]; then
-  echo "ERROR: This script must be run as root" 1>&2
-  exit 1
-fi
-
 if [[ "${GIT_USER_NAME}X" == "X" ]]; then
   echo 'ERROR please provide $GIT_USER_NAME'
   exit 1
@@ -24,7 +19,7 @@ if [[ "${GIT_USER_EMAIL}X" == "X" ]]; then
   exit 1
 fi
 
-cd ~vcap
-chpst -u vcap:vcap git config -f ~vcap/.gitconfig user.name "${GIT_USER_NAME}"
-chpst -u vcap:vcap git config -f ~vcap/.gitconfig user.email "${GIT_USER_EMAIL}"
-chpst -u vcap:vcap git config -f ~vcap/.gitconfig color.ui true
+cd ~
+git config -f .gitconfig user.name "${GIT_USER_NAME}"
+git config -f .gitconfig user.email "${GIT_USER_EMAIL}"
+git config -f .gitconfig color.ui true

data/lib/bosh-bootstrap/stages/stage_prepare_inception_vm/create_vcap_user

@@ -43,7 +43,7 @@ mkdir -p ${store_dir}
 chown vcap:vcap ${store_dir}
 
 # setup common folders used by bosh-bootstrap or bosh deployments
-for path in microboshes microboshes/deployments deployments releases repos stemcells tmp bosh_cache
+for path in microboshes microboshes/deployments deployments releases repos stemcells inception tmp bosh_cache
 do
   echo "creating /var/vcap/store/${path}"
   mkdir -p ${store_dir}/${path}

data/lib/bosh-bootstrap/stages/stage_prepare_inception_vm/install_base_packages

@@ -8,13 +8,23 @@ fi
 set -e # exit immediately if a simple command exits with a non-zero status
 
 apt-get install python-software-properties
-add-apt-repository ppa:keithw/mosh
+if [ "$(lsb_release --release --short)" == '10.04' ]; then
+  add-apt-repository ppa:keithw/mosh
+else
+  add-apt-repository -y ppa:keithw/mosh
+fi
 
 apt-get update
 apt-get install build-essential libsqlite3-dev curl rsync git-core \
   tmux mosh \
   libmysqlclient-dev libxml2-dev libxslt-dev libpq-dev libsqlite3-dev \
   runit \
-  genisoimage mkpasswd \
+  genisoimage \
   debootstrap kpartx qemu-kvm \
   vim -y
+
+if [ "$(lsb_release --release --short)" == '10.04' ]; then
+	apt-get install mkpasswd -y
+else
+	apt-get install whois -y
+fi