bosh_deployer 0.2.4 → 0.4.0

data/lib/bosh/cli/commands/micro.rb

@@ -29,7 +29,7 @@ module Bosh::Cli::Command
     end
 
     command :micro_deploy do
-      usage  "micro deploy <stemcell>"
+      usage  "micro deploy [<stemcell>]"
       desc   "Deploy a micro BOSH instance to the currently selected deployment"
       option "--update", "update existing instance"
       route  :micro, :perform
@@ -80,14 +80,23 @@ module Bosh::Cli::Command
 
     def perform(*options)
       update = options.delete("--update")
-      tarball_path = options.shift
-
-      if tarball_path.nil?
-        err "No stemcell provided"
-      end
+      stemcell = options.shift
 
       err "No deployment set" unless deployment
 
+      if stemcell.nil?
+        manifest = load_yaml_file(deployment)
+        unless manifest.is_a?(Hash)
+          err("Invalid manifest format")
+        end
+
+        stemcell = dig_hash(manifest, "cloud", "properties", "stemcell", "image_id")
+
+        if stemcell.nil?
+          err "No stemcell provided"
+        end
+      end
+
       rel_path = deployment[/#{Regexp.escape File.join(work_dir, '')}(.*)/, 1]
 
       desc = "`#{rel_path.green}' to `#{target_name.green}'"
@@ -112,14 +121,14 @@ module Bosh::Cli::Command
 
       confirm_deployment("#{confirmation} micro BOSH instance #{desc}")
 
-      if is_tgz?(tarball_path)
-        stemcell = Bosh::Cli::Stemcell.new(tarball_path, cache)
+      if is_tgz?(stemcell)
+        stemcell_file = Bosh::Cli::Stemcell.new(stemcell, cache)
 
         say("\nVerifying stemcell...")
-        stemcell.validate
+        stemcell_file.validate
         say("\n")
 
-        unless stemcell.valid?
+        unless stemcell_file.valid?
           err("Stemcell is invalid, please fix, verify and upload again")
         end
       end
@@ -130,7 +139,7 @@ module Bosh::Cli::Command
 
       start_time = Time.now
 
-      deployer.send(method, tarball_path)
+      deployer.send(method, stemcell)
 
       renderer.finish("done")
 

data/lib/deployer/config.rb

@@ -10,7 +10,7 @@ module Bosh::Deployer
       include Helpers
 
       attr_accessor :logger, :db, :uuid, :resources, :cloud_options,
-        :spec_properties, :bosh_ip, :env
+        :spec_properties, :bosh_ip, :env, :name
 
       def configure(config)
         plugin = cloud_plugin(config)
@@ -20,6 +20,7 @@ module Bosh::Deployer
         @base_dir = config["dir"]
         FileUtils.mkdir_p(@base_dir)
 
+        @name = config["name"]
         @cloud_options = config["cloud"]
         @net_conf = config["network"]
         @bosh_ip = @net_conf["ip"]

data/lib/deployer/helpers.rb

@@ -21,6 +21,12 @@ module Bosh::Deployer
       config["cloud"]["plugin"]
     end
 
+    def dig_hash(hash, *path)
+      path.inject(hash) do |location, key|
+        location.respond_to?(:keys) ? location[key] : nil
+      end
+    end
+
   end
 
 end

data/lib/deployer/instance_manager/aws.rb

@@ -142,9 +142,24 @@ module Bosh::Deployer
         cloud.ec2.instances[state.vm_cid].private_ip_address
       end
 
+      # @return [Integer] size in kB
+      def disk_size(cid)
+        # AWS stores disk size in MiB but we work with kB
+        cloud.ec2.volumes[cid].size * 1024
+      end
+
+      def persistent_disk_changed?
+        # since AWS stores disk size in MiB and we use kB there
+        # is a risk of conversion errors which lead to an unnecessary
+        # disk migration, so we need to do a double conversion
+        # here to avoid that
+        requested = (Config.resources['persistent_disk'] / 1024.0).ceil * 1024
+        requested != disk_size(state.disk_cid)
+      end
+
       private
 
-      # TODO this code is simliar to has_stemcell_copy?
+      # TODO this code is similar to has_stemcell_copy?
       # move the two into bosh_common later
       def has_aws_registry?(path=ENV['PATH'])
         path.split(":").each do |dir|

data/lib/deployer/instance_manager/vsphere.rb

@@ -27,5 +27,13 @@ module Bosh::Deployer
       end
     end
 
+    # @return [Integer] size in kB
+    def disk_size(cid)
+      disk_model[cid].size
+    end
+
+    def persistent_disk_changed?
+      Config.resources['persistent_disk'] != disk_size(state.disk_cid)
+    end
   end
 end

data/lib/deployer/instance_manager.rb

@@ -168,6 +168,8 @@ module Bosh::Deployer
       agent_stop
       if state.disk_cid
         delete_disk(state.disk_cid, state.vm_cid)
+        state.disk_cid = nil
+        save_state
       end
       delete_vm
       delete_stemcell
@@ -176,8 +178,12 @@ module Bosh::Deployer
     def update(stemcell_tgz)
       renderer.enter_stage("Prepare for update", 5)
       agent_stop
-      detach_disk
+      detach_disk(state.disk_cid)
       delete_vm
+      # Do we always want to delete the stemcell?
+      # What if we are redeploying to the same stemcell version just so
+      # we can upgrade to a bigger persistent disk.
+      # Perhaps use "--preserve" to skip the delete?
       delete_stemcell
       create(stemcell_tgz)
     end
@@ -195,15 +201,17 @@ module Bosh::Deployer
           run_command("tar -zxf #{stemcell_tgz} -C #{stemcell}")
         end
 
-        spec_file = "#{stemcell}/apply_spec.yml"
-        unless File.exist?(spec_file)
-          raise "this isn't a micro bosh stemcell - apply_spec.yml missing"
-        end
-        @apply_spec = load_apply_spec(spec_file)
-        properties = Config.cloud_options["properties"]["stemcell"]
+        @apply_spec = load_apply_spec(stemcell)
+
+        # load properties from stemcell manifest
+        properties = load_stemcell_manifest(stemcell)
+
+        # override with values from the deployment manifest
+        override = Config.cloud_options["properties"]["stemcell"]
+        properties["cloud_properties"].merge!(override) if override
 
         step "Uploading stemcell" do
-          cloud.create_stemcell("#{stemcell}/image", properties)
+          cloud.create_stemcell("#{stemcell}/image", properties["cloud_properties"])
         end
       end
     end
@@ -225,6 +233,9 @@ module Bosh::Deployer
       step "Unmount disk" do
         if disk_info.include?(disk_cid)
           agent.run_task(:unmount_disk, disk_cid.to_s)
+        else
+          logger.error("not unmounting %s as it doesn't belong to me: %s" %
+            [disk_cid, disk_info])
         end
       end
     end
@@ -242,11 +253,13 @@ module Bosh::Deployer
 
     def create_disk
       step "Create disk" do
-        state.disk_cid = cloud.create_disk(Config.resources['persistent_disk'], state.vm_cid)
+        size = Config.resources['persistent_disk']
+        state.disk_cid = cloud.create_disk(size, state.vm_cid)
         save_state
       end
     end
 
+    # it is up to the caller to save/update disk state info
     def delete_disk(disk_cid, vm_cid)
       unmount_disk(disk_cid)
 
@@ -261,44 +274,33 @@ module Bosh::Deployer
         step "Delete disk" do
           cloud.delete_disk(disk_cid)
         end
-        state.disk_cid = nil
-        save_state
       rescue Bosh::Clouds::DiskNotFound
       end
     end
 
-    def attach_disk(is_create=false)
-      return if state.disk_cid.nil?
-
-      cloud.attach_disk(state.vm_cid, state.disk_cid)
-      save_state
+    # it is up to the caller to save/update disk state info
+    def attach_disk(disk_cid, is_create=false)
+      return unless disk_cid
 
-      begin
-        mount_disk(state.disk_cid)
-      rescue
-        if is_create
-          logger.warn("!!! mount_disk(#{state.disk_cid}) failed !!! retrying...")
-          mount_disk(state.disk_cid)
-        else
-          raise
-        end
-      end
+      cloud.attach_disk(state.vm_cid, disk_cid)
+      mount_disk(disk_cid)
     end
 
-    def detach_disk
-      if state.disk_cid.nil?
+    def detach_disk(disk_cid)
+      unless disk_cid
         raise "Error while detaching disk: unknown disk attached to instance"
       end
 
-      unmount_disk(state.disk_cid)
+      unmount_disk(disk_cid)
       step "Detach disk" do
-        cloud.detach_disk(state.vm_cid, state.disk_cid)
+        cloud.detach_disk(state.vm_cid, disk_cid)
       end
     end
 
     def attach_missing_disk
       if state.disk_cid
-        attach_disk(true)
+        attach_disk(state.disk_cid, true)
+        save_state
       end
     end
 
@@ -314,16 +316,40 @@ module Bosh::Deployer
       attach_missing_disk
       check_persistent_disk
 
-      #XXX handle disk size change
       if state.disk_cid.nil?
         create_disk
-        attach_disk(true)
+        attach_disk(state.disk_cid, true)
+      elsif persistent_disk_changed?
+        size = Config.resources['persistent_disk']
+
+        # save a reference to the old disk
+        old_disk_cid = state.disk_cid
+
+        # create a new disk and attach it
+        new_disk_cid = cloud.create_disk(size, state.vm_cid)
+        attach_disk(new_disk_cid, true)
+
+        # migrate data (which mounts the disks)
+        migrate_disk(old_disk_cid, new_disk_cid)
+
+        # replace the old with the new in the state file
+        state.disk_cid = new_disk_cid
+        save_state
+
+        # delete the old disk
+        delete_disk(old_disk_cid, state.vm_cid)
       end
     end
 
     def update_spec(spec)
       properties = spec["properties"]
 
+      # set the director name to what is specified in the micro_bosh.yml
+      if Config.name
+        properties["director"] = {} unless properties["director"]
+        properties["director"]["name"] = Config.name
+      end
+
       %w{blobstore postgres director redis nats aws_registry}.each do |service|
         next unless properties[service]
         properties[service]["address"] = service_ip
@@ -442,8 +468,21 @@ module Bosh::Deployer
       end
     end
 
-    def load_apply_spec(file)
-      logger.info("Loading apply spec from #{file}")
+    def load_apply_spec(dir)
+      load_spec("#{dir}/apply_spec.yml") do
+        raise "this isn't a micro bosh stemcell - apply_spec.yml missing"
+      end
+    end
+
+    def load_stemcell_manifest(dir)
+      load_spec("#{dir}/stemcell.MF") do
+        raise "this isn't a stemcell - stemcell.MF missing"
+      end
+    end
+
+    def load_spec(file)
+      yield unless File.exist?(file)
+      logger.info("Loading yaml from #{file}")
       YAML.load_file(file)
     end
 

data/lib/deployer/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Deployer
-    VERSION = "0.2.4"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_deployer
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.4.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: agent_client
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4260462944740584037
+      hash: -397846320824722837
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4260462944740584037
+      hash: -397846320824722837
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24