bosh_deployer 1.3.0 → 1.4.0

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

@@ -9,6 +9,7 @@ module Bosh::Cli::Command
 
     MICRO_DIRECTOR_PORT = 25555
     DEFAULT_CONFIG_PATH = File.expand_path("~/.bosh_deployer_config")
+    MICRO_BOSH_YAML = "micro_bosh.yml"
 
     def initialize(runner)
       super(runner)
@@ -118,12 +119,12 @@ module Bosh::Cli::Command
         end
       end
 
+      deployer.check_dependencies
+
       rel_path = deployment[/#{Regexp.escape File.join(work_dir, '')}(.*)/, 1]
 
       desc = "`#{rel_path.green}' to `#{target_name.green}'"
 
-      deployer.check_dependencies
-
       if update
         unless deployer.exists?
           err "No existing instance to update"
@@ -139,7 +140,7 @@ module Bosh::Cli::Command
 
         # make sure the user knows a persistent disk is required
         unless dig_hash(manifest, "resources", "persistent_disk")
-          quit("No persistent disk configured!".red)
+          quit("No persistent disk configured in #{MICRO_BOSH_YAML}".red)
         end
 
         confirmation = "Deploying new"
@@ -296,16 +297,20 @@ module Bosh::Cli::Command
 
     def find_deployment(name)
       check_if_deployments_dir
-      File.expand_path(File.join(work_dir, "#{name}", "micro_bosh.yml"))
+      File.expand_path(File.join(work_dir, "#{name}", MICRO_BOSH_YAML))
     end
 
     def deployment_name
       File.basename(File.dirname(deployment))
     end
 
+    # set new target and clear out cached values
+    # does not persist the new values (set_current() does this)
     def set_target(ip)
       config.target = "http://#{ip}:#{MICRO_DIRECTOR_PORT}"
-      config.save
+      config.target_name = nil
+      config.target_version = nil
+      config.target_uuid = nil
     end
 
     def update_target

data/lib/deployer.rb

@@ -19,5 +19,6 @@ require "common/thread_formatter"
 require "deployer/version"
 require "deployer/helpers"
 require "deployer/config"
+require "deployer/specification"
 require "deployer/instance_manager"
 require "deployer/instance_manager_helpers"

data/lib/deployer/config.rb

@@ -106,6 +106,13 @@ module Bosh::Deployer
         @networks
       end
 
+      def task_checkpoint
+        # Bosh::Clouds::Config (bosh_cli >= 0.5.1) delegates task_checkpoint
+        # method to periodically check if director task is cancelled,
+        # so we need to define a void method in Bosh::Deployer::Config to avoid
+        # NoMethodError exceptions.
+      end
+
       private
 
       def migrate_cpi

data/lib/deployer/instance_manager.rb

@@ -151,11 +151,11 @@ module Bosh::Deployer
 
       unless @apply_spec
         step "Fetching apply spec" do
-          @apply_spec = agent.release_apply_spec
+          @apply_spec = Specification.new(agent.release_apply_spec)
         end
       end
 
-      apply(@apply_spec)
+      apply
 
       step "Waiting for the director" do
         wait_until_director_ready
@@ -163,12 +163,14 @@ module Bosh::Deployer
     end
 
     def destroy
-      renderer.enter_stage("Delete micro BOSH", 6)
+      renderer.enter_stage("Delete micro BOSH", 7)
       agent_stop
       if state.disk_cid
-        delete_disk(state.disk_cid, state.vm_cid)
-        state.disk_cid = nil
-        save_state
+        step "Deleting persistent disk `#{state.disk_cid}'" do
+          delete_disk(state.disk_cid, state.vm_cid)
+          state.disk_cid = nil
+          save_state
+        end
       end
       delete_vm
       delete_stemcell
@@ -200,14 +202,14 @@ module Bosh::Deployer
           run_command("tar -zxf #{stemcell_tgz} -C #{stemcell}")
         end
 
-        @apply_spec = load_apply_spec(stemcell)
+        @apply_spec = Specification.load_from_stemcell(stemcell)
 
         # load properties from stemcell manifest
         properties = load_stemcell_manifest(stemcell)
 
         # override with values from the deployment manifest
         override = Config.cloud_options["properties"]["stemcell"]
-        override_property(properties, "cloud_properties", override)
+        properties["cloud_properties"].merge!(override) if override
 
         step "Uploading stemcell" do
           cloud.create_stemcell("#{stemcell}/image", properties["cloud_properties"])
@@ -287,7 +289,7 @@ module Bosh::Deployer
 
     def detach_disk(disk_cid)
       unless disk_cid
-        err "Error while detaching disk: unknown disk attached to instance"
+        err "Error: nil value given for persistent disk id"
       end
 
       unmount_disk(disk_cid)
@@ -342,41 +344,12 @@ module Bosh::Deployer
       save_state
     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
-
-      # blobstore and nats need to use an elastic IP (if available),
-      # as when the micro bosh instance is re-created during a
-      # deployment, it might get a new private IP
-      %w{blobstore nats}.each do |service|
-        update_agent_service_address(properties, service, bosh_ip)
-      end
-
-      services = %w{postgres director redis blobstore nats aws_registry
-                    openstack_registry powerdns}
-      services.each do |service|
-        update_service_address(properties, service, service_ip)
-      end
-
-      # health monitor does not listen to any ports, so there is no
-      # need to update the service address, but we still want to
-      # be able to override values in the apply_spec
-      override_property(properties, "hm", Config.spec_properties["hm"])
-
-      spec
-    end
-
-    def apply(spec)
+    def apply
       agent_stop
 
       step "Applying micro BOSH spec" do
-        agent.run_task(:apply, update_spec(spec.dup))
+        update_spec(@apply_spec)
+        agent.run_task(:apply, @apply_spec.update(bosh_ip, service_ip))
       end
 
       agent_start
@@ -396,28 +369,6 @@ module Bosh::Deployer
 
     private
 
-    # update the agent service section from the contents of the apply_spec
-    def update_agent_service_address(properties, service, address)
-      if Config.agent_properties
-        agent = properties["agent"] ||= {}
-        svc = agent[service] ||= {}
-        svc["address"] = address
-
-        override_property(agent, service, Config.agent_properties[service])
-      end
-    end
-
-    def update_service_address(properties, service, address)
-      return unless properties[service]
-      properties[service]["address"] = address
-
-      override_property(properties, service, Config.spec_properties[service])
-    end
-
-    def override_property(properties, service, override)
-      properties[service].merge!(override) if override
-    end
-
     def bosh_ip
       Config.bosh_ip
     end
@@ -456,7 +407,7 @@ module Bosh::Deployer
     end
 
     def wait_until_director_ready
-      port = @apply_spec["properties"]["director"]["port"]
+      port = @apply_spec.director_port
       url = "http://#{bosh_ip}:#{port}/info"
       wait_until_ready do
         info = Yajl::Parser.parse(HTTPClient.new.get(url).body)
@@ -501,6 +452,7 @@ module Bosh::Deployer
       end
     end
 
+    # TODO remove
     def load_apply_spec(dir)
       load_spec("#{dir}/apply_spec.yml") do
         err "this isn't a micro bosh stemcell - apply_spec.yml missing"

data/lib/deployer/instance_manager/aws.rb

@@ -7,9 +7,9 @@ module Bosh::Deployer
 
       include InstanceManagerHelpers
 
+      # TODO extract
       def update_spec(spec)
-        spec = super(spec)
-        properties = spec["properties"]
+        properties = spec.properties
 
         properties["aws"] =
           Config.spec_properties["aws"] ||
@@ -19,8 +19,6 @@ module Bosh::Deployer
         properties["aws"]["stemcell"] = Config.cloud_options["properties"]["stemcell"]
 
         spec.delete("networks")
-
-        spec
       end
 
       def configure

data/lib/deployer/instance_manager/openstack.rb

@@ -7,9 +7,9 @@ module Bosh::Deployer
 
       include InstanceManagerHelpers
 
+      # TODO extract
       def update_spec(spec)
-        spec = super(spec)
-        properties = spec["properties"]
+        properties = spec.properties
 
         properties["openstack"] =
           Config.spec_properties["openstack"] ||
@@ -19,8 +19,6 @@ module Bosh::Deployer
         properties["openstack"]["stemcell"] = Config.cloud_options["properties"]["stemcell"]
 
         spec.delete("networks")
-
-        spec
       end
 
       def configure

data/lib/deployer/instance_manager/vcloud.rb

@@ -5,17 +5,15 @@ module Bosh::Deployer
 
     class Vcloud < InstanceManager
 
+      # TODO extract
       def update_spec(spec)
-        spec = super(spec)
-        properties = spec["properties"]
+        properties = spec.properties
 
         properties["vcd"] =
           Config.spec_properties["vcd"] ||
           Config.cloud_options["properties"]["vcds"].first.dup
 
         properties["vcd"]["address"] ||= properties["vcd"]["url"]
-
-        spec
       end
 
       # @return [Integer] size in MiB

data/lib/deployer/instance_manager/vsphere.rb

@@ -13,17 +13,15 @@ module Bosh::Deployer
         @disk_model
       end
 
+      # TODO extract
       def update_spec(spec)
-        spec = super(spec)
-        properties = spec["properties"]
+        properties = spec.properties
 
         properties["vcenter"] =
           Config.spec_properties["vcenter"] ||
           Config.cloud_options["properties"]["vcenters"].first.dup
 
         properties["vcenter"]["address"] ||= properties["vcenter"]["host"]
-
-        spec
       end
     end
 

data/lib/deployer/specification.rb

@@ -0,0 +1,103 @@
+module Bosh::Deployer
+  class Specification
+
+    def self.load_from_stemcell(dir)
+      spec = load_apply_spec(dir)
+      Specification.new(spec)
+    end
+
+    def self.load_apply_spec(dir)
+      file = "apply_spec.yml"
+      apply_spec = File.join(dir, file)
+      unless File.exist?(apply_spec)
+        err "this isn't a micro bosh stemcell - #{file} missing"
+      end
+      YAML.load_file(apply_spec)
+    end
+
+    attr_accessor :spec
+    attr_accessor :properties
+
+    def initialize(spec)
+      @spec = spec
+      @properties = @spec["properties"]
+    end
+
+    # Update the spec with the IP of the micro bosh instance.
+    # @param [String] bosh_ip IP address of the micro bosh VM
+    # @param [String] service_ip private IP of the micro bosh VM on AWS/OS,
+    #   or the same as the bosh_ip if vSphere/vCloud
+    def update(bosh_ip, service_ip)
+      # 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
+
+      # on AWS blobstore and nats need to use an elastic IP (if available),
+      # as when the micro bosh instance is re-created during a deployment,
+      # it might get a new private IP
+      %w{blobstore nats}.each do |service|
+        update_agent_service_address(service, bosh_ip)
+      end
+
+      services = %w{postgres director redis blobstore nats aws_registry
+                    openstack_registry powerdns}
+      services.each do |service|
+        update_service_address(service, service_ip)
+      end
+
+      # health monitor does not listen to any ports, so there is no
+      # need to update the service address, but we still want to
+      # be able to override values in the apply_spec
+      override_property(@properties, "hm", Config.spec_properties["hm"])
+
+      # TODO this override should be made more generic
+      if Config.spec_properties.has_key?("ntp")
+        @properties["agent"] ||= {}
+        @properties["agent"]["ntp"] = Config.spec_properties["ntp"]
+      end
+
+      # TODO: this override is ugly (aws-specific) but needed for aws_registry
+      if Config.spec_properties["aws"] ||
+         Config.cloud_options["properties"]["aws"]
+        @properties["aws"] = Config.spec_properties["aws"] ||
+                             Config.cloud_options["properties"]["aws"]
+      end
+
+      @spec
+    end
+
+    # @param [String] name property name to delete from the spec
+    def delete(name)
+      @spec.delete(name)
+    end
+
+    # @return [String] the port the director runs on
+    def director_port
+      @properties["director"]["port"]
+    end
+
+    private
+
+    # update the agent service section from the contents of the apply_spec
+    def update_agent_service_address(service, address)
+      agent = @properties["agent"] ||= {}
+      svc = agent[service] ||= {}
+      svc["address"] = address
+
+      override_property(agent, service, Config.agent_properties[service])
+    end
+
+    def update_service_address(service, address)
+      return unless @properties[service]
+      @properties[service]["address"] = address
+
+      override_property(@properties, service, Config.spec_properties[service])
+    end
+
+    def override_property(properties, service, override)
+      properties[service].merge!(override) if override
+    end
+  end
+end

data/lib/deployer/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Deployer
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_deployer
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -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_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -80,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_registry
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_registry
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: agent_client
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,7 @@ files:
 - lib/deployer/instance_manager/vsphere.rb
 - lib/deployer/instance_manager_helpers.rb
 - lib/deployer/models/instance.rb
+- lib/deployer/specification.rb
 - lib/deployer/version.rb
 - README.rdoc
 - Rakefile
@@ -208,17 +209,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -132721875164071695
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -132721875164071695
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Micro BOSH Deployer
 test_files: []
-has_rdoc: