bosh_cli_plugin_micro 1.5.0.pre.1113 → 1.5.0.pre.1114

data/lib/{deployer → bosh/deployer}/instance_manager/openstack.rb

@@ -8,54 +8,54 @@ module Bosh::Deployer
       def update_spec(spec)
         properties = spec.properties
 
-        properties["openstack"] =
-          Config.spec_properties["openstack"] ||
-          Config.cloud_options["properties"]["openstack"].dup
+        properties['openstack'] =
+          Config.spec_properties['openstack'] ||
+          Config.cloud_options['properties']['openstack'].dup
 
-        properties["openstack"]["registry"] = Config.cloud_options["properties"]["registry"]
-        properties["openstack"]["stemcell"] = Config.cloud_options["properties"]["stemcell"]
+        properties['openstack']['registry'] = Config.cloud_options['properties']['registry']
+        properties['openstack']['stemcell'] = Config.cloud_options['properties']['stemcell']
 
-        spec.delete("networks")
+        spec.delete('networks')
       end
 
       def configure
-        properties = Config.cloud_options["properties"]
-        @ssh_user = properties["openstack"]["ssh_user"]
-        @ssh_port = properties["openstack"]["ssh_port"] || 22
-        @ssh_wait = properties["openstack"]["ssh_wait"] || 60
+        properties = Config.cloud_options['properties']
+        @ssh_user = properties['openstack']['ssh_user']
+        @ssh_port = properties['openstack']['ssh_port'] || 22
+        @ssh_wait = properties['openstack']['ssh_wait'] || 60
 
-        key = properties["openstack"]["private_key"]
-        err "Missing properties.openstack.private_key" unless key
+        key = properties['openstack']['private_key']
+        err 'Missing properties.openstack.private_key' unless key
         @ssh_key = File.expand_path(key)
         unless File.exists?(@ssh_key)
           err "properties.openstack.private_key '#{key}' does not exist"
         end
 
-        uri = URI.parse(properties["registry"]["endpoint"])
-        user, password = uri.userinfo.split(":", 2)
+        uri = URI.parse(properties['registry']['endpoint'])
+        user, password = uri.userinfo.split(':', 2)
         @registry_port = uri.port
 
-        @registry_db = Tempfile.new("bosh_registry_db")
+        @registry_db = Tempfile.new('bosh_registry_db')
         @registry_connection_settings = {
             'adapter' => 'sqlite',
             'database' => @registry_db.path
         }
 
         registry_config = {
-          "logfile" => "./bosh-registry.log",
-          "http" => {
-            "port" => uri.port,
-            "user" => user,
-            "password" => password
+          'logfile' => './bosh-registry.log',
+          'http' => {
+            'port' => uri.port,
+            'user' => user,
+            'password' => password
           },
-          "db" => @registry_connection_settings,
-          "cloud" => {
-            "plugin" => "openstack",
-            "openstack" => properties["openstack"]
+          'db' => @registry_connection_settings,
+          'cloud' => {
+            'plugin' => 'openstack',
+            'openstack' => properties['openstack']
           }
         }
 
-        @registry_config = Tempfile.new("bosh_registry_yml")
+        @registry_config = Tempfile.new('bosh_registry_yml')
         @registry_config.write(Psych.dump(registry_config))
         @registry_config.close
       end
@@ -65,12 +65,12 @@ module Bosh::Deployer
 
         Sequel.connect(@registry_connection_settings) do |db|
           migrate(db)
-          instances = @deployments["registry_instances"]
+          instances = @deployments['registry_instances']
           db[:registry_instances].insert_multiple(instances) if instances
         end
 
         unless has_bosh_registry?
-          err "bosh-registry command not found - " +
+          err 'bosh-registry command not found - ' +
             "run 'gem install bosh-registry'"
         end
 
@@ -105,14 +105,14 @@ module Bosh::Deployer
 
       def stop
         if @registry_pid && process_exists?(@registry_pid)
-          Process.kill("INT", @registry_pid)
+          Process.kill('INT', @registry_pid)
           Process.waitpid(@registry_pid)
         end
 
         return unless @registry_connection_settings
 
         Sequel.connect(@registry_connection_settings) do |db|
-          @deployments["registry_instances"] = db[:registry_instances].map {|row| row}
+          @deployments['registry_instances'] = db[:registry_instances].map {|row| row}
         end
 
         save_state
@@ -155,8 +155,8 @@ module Bosh::Deployer
       private
 
       def has_bosh_registry?(path=ENV['PATH'])
-        path.split(":").each do |dir|
-          return true if File.exist?(File.join(dir, "bosh-registry"))
+        path.split(':').each do |dir|
+          return true if File.exist?(File.join(dir, 'bosh-registry'))
         end
         false
       end

data/lib/{deployer → bosh/deployer}/instance_manager/vcloud.rb

@@ -14,11 +14,11 @@ module Bosh::Deployer
       def update_spec(spec)
         properties = spec.properties
 
-        properties["vcd"] =
-          Config.spec_properties["vcd"] ||
-          Config.cloud_options["properties"]["vcds"].first.dup
+        properties['vcd'] =
+          Config.spec_properties['vcd'] ||
+          Config.cloud_options['properties']['vcds'].first.dup
 
-        properties["vcd"]["address"] ||= properties["vcd"]["url"]
+        properties['vcd']['address'] ||= properties['vcd']['url']
       end
 
       # @return [Integer] size in MiB

data/lib/bosh/deployer/instance_manager/vsphere.rb

@@ -0,0 +1,43 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+module Bosh::Deployer
+  class InstanceManager
+    class Vsphere < InstanceManager
+      def remote_tunnel(port)
+      end
+
+      def disk_model
+        if @disk_model.nil?
+          require 'cloud/vsphere'
+          @disk_model = VSphereCloud::Models::Disk
+        end
+        @disk_model
+      end
+
+      def update_spec(spec)
+        properties = spec.properties
+
+        properties['vcenter'] =
+          Config.spec_properties['vcenter'] ||
+          Config.cloud_options['properties']['vcenters'].first.dup
+
+        properties['vcenter']['address'] ||= properties['vcenter']['host']
+      end
+
+      # @return [Integer] size in MiB
+      def disk_size(cid)
+        disk_model.first(uuid: cid).size
+      end
+
+      def persistent_disk_changed?
+        Config.resources['persistent_disk'] != disk_size(state.disk_cid)
+      end
+
+      def check_dependencies
+        if Bosh::Common.which(%w[genisoimage mkisofs]).nil?
+          err("either of 'genisoimage' or 'mkisofs' commands must be present")
+        end
+      end
+    end
+  end
+end

data/lib/{deployer → bosh/deployer}/instance_manager.rb

@@ -1,67 +1,41 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 require 'open3'
+require 'bosh/deployer/logger_renderer'
+require 'bosh/deployer/director_gateway_error'
 
 module Bosh::Deployer
-
-  class DirectorGatewayError < RuntimeError; end
-
   class InstanceManager
-    
+
     CONNECTION_EXCEPTIONS = [
       Bosh::Agent::Error,
       Errno::ECONNREFUSED,
       Errno::ETIMEDOUT,
-      Bosh::Deployer::DirectorGatewayError,
+      DirectorGatewayError,
       HTTPClient::ConnectTimeoutError
     ]
 
+    extend Helpers
     include Helpers
 
     attr_reader :state
     attr_accessor :renderer
 
-    class LoggerRenderer
-      attr_accessor :stage, :total, :index
+    def self.create(config)
+      plugin = cloud_plugin(config)
 
-      def initialize
-        enter_stage("Deployer", 0)
-      end
-
-      def enter_stage(stage, total)
-        @stage = stage
-        @total = total
-        @index = 0
-      end
-
-      def update(state, task)
-        Config.logger.info("#{@stage} - #{state} #{task}")
-        @index += 1 if state == :finished
-      end
-    end
-
-    class << self
-
-      include Helpers
-
-      def create(config)
-        plugin = cloud_plugin(config)
-
-        begin
-          require "deployer/instance_manager/#{plugin}"
-        rescue LoadError
-          err "Could not find Provider Plugin: #{plugin}"
-        end
-        Bosh::Deployer::InstanceManager.const_get(plugin.capitalize).new(config)
+      begin
+        require "bosh/deployer/instance_manager/#{plugin}"
+      rescue LoadError
+        err "Could not find Provider Plugin: #{plugin}"
       end
 
+      InstanceManager.const_get(plugin.capitalize).new(config)
     end
 
     def initialize(config)
       Config.configure(config)
 
-      @state_yml = File.join(config["dir"], DEPLOYMENTS_FILE)
-      load_state(config["name"])
+      @state_yml = File.join(config['dir'], DEPLOYMENTS_FILE)
+      load_state(config['name'])
 
       Config.uuid = state.uuid
 
@@ -136,50 +110,50 @@ module Bosh::Deployer
         err "stemcell #{state.stemcell_cid} already exists"
       end
 
-      renderer.enter_stage("Deploy Micro BOSH", 11)
+      renderer.enter_stage('Deploy Micro BOSH', 11)
 
       state.stemcell_cid = create_stemcell(stemcell_tgz)
-      state.stemcell_name = File.basename(stemcell_tgz, ".tgz")
+      state.stemcell_name = File.basename(stemcell_tgz, '.tgz')
       save_state
 
       step "Creating VM from #{state.stemcell_cid}" do
         state.vm_cid = create_vm(state.stemcell_cid)
-        update_vm_metadata(state.vm_cid, {"Name" => state.name})
+        update_vm_metadata(state.vm_cid, { 'Name' => state.name })
         discover_bosh_ip
       end
       save_state
 
-      step "Waiting for the agent" do        
+      step 'Waiting for the agent' do
         begin
           wait_until_agent_ready
         rescue *CONNECTION_EXCEPTIONS
-          err "Unable to connect to Bosh agent. Check logs for more details."
+          err 'Unable to connect to Bosh agent. Check logs for more details.'
         end
       end
 
-      step "Updating persistent disk" do
+      step 'Updating persistent disk' do
         update_persistent_disk
       end
 
       unless @apply_spec
-        step "Fetching apply spec" do
+        step 'Fetching apply spec' do
           @apply_spec = Specification.new(agent.release_apply_spec)
         end
       end
 
       apply
 
-      step "Waiting for the director" do
+      step 'Waiting for the director' do
         begin
           wait_until_director_ready
         rescue *CONNECTION_EXCEPTIONS
-          err "Unable to connect to Bosh Director. Retry manually or check logs for more details."
+          err 'Unable to connect to Bosh Director. Retry manually or check logs for more details.'
         end
       end
     end
 
     def destroy
-      renderer.enter_stage("Delete micro BOSH", 7)
+      renderer.enter_stage('Delete micro BOSH', 7)
       agent_stop
       if state.disk_cid
         step "Deleting persistent disk `#{state.disk_cid}'" do
@@ -193,7 +167,7 @@ module Bosh::Deployer
     end
 
     def update(stemcell_tgz)
-      renderer.enter_stage("Prepare for update", 5)
+      renderer.enter_stage('Prepare for update', 5)
       agent_stop
       detach_disk(state.disk_cid)
       delete_vm
@@ -207,14 +181,14 @@ module Bosh::Deployer
 
     def create_stemcell(stemcell_tgz)
       unless is_tgz?(stemcell_tgz)
-        step "Using existing stemcell" do
+        step 'Using existing stemcell' do
         end
 
         return stemcell_tgz
       end
 
-      Dir.mktmpdir("sc-") do |stemcell|
-        step "Unpacking stemcell" do
+      Dir.mktmpdir('sc-') do |stemcell|
+        step 'Unpacking stemcell' do
           run_command("tar -zxf #{stemcell_tgz} -C #{stemcell}")
         end
 
@@ -224,11 +198,11 @@ module Bosh::Deployer
         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
+        override = Config.cloud_options['properties']['stemcell']
+        properties['cloud_properties'].merge!(override) if override
 
-        step "Uploading stemcell" do
-          cloud.create_stemcell("#{stemcell}/image", properties["cloud_properties"])
+        step 'Uploading stemcell' do
+          cloud.create_stemcell("#{stemcell}/image", properties['cloud_properties'])
         end
       end
     rescue => e
@@ -240,7 +214,7 @@ module Bosh::Deployer
 
     def create_vm(stemcell_cid)
       resources = Config.resources['cloud_properties']
-      networks  = Config.networks
+      networks = Config.networks
       env = Config.env
       cloud.create_vm(state.uuid, stemcell_cid, resources, networks, nil, env)
     end
@@ -252,24 +226,24 @@ module Bosh::Deployer
     end
 
     def mount_disk(disk_cid)
-      step "Mount disk" do
+      step 'Mount disk' do
         agent.run_task(:mount_disk, disk_cid.to_s)
       end
     end
 
     def unmount_disk(disk_cid)
-      step "Unmount disk" do
+      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])
+                         [disk_cid, disk_info])
         end
       end
     end
 
     def migrate_disk(src_disk_cid, dst_disk_cid)
-      step "Migrate disk" do
+      step 'Migrate disk' do
         agent.run_task(:migrate_disk, src_disk_cid.to_s, dst_disk_cid.to_s)
       end
     end
@@ -280,7 +254,7 @@ module Bosh::Deployer
     end
 
     def create_disk
-      step "Create disk" do
+      step 'Create disk' do
         size = Config.resources['persistent_disk']
         state.disk_cid = cloud.create_disk(size, state.vm_cid)
         save_state
@@ -292,14 +266,14 @@ module Bosh::Deployer
       unmount_disk(disk_cid)
 
       begin
-        step "Detach disk" do
+        step 'Detach disk' do
           cloud.detach_disk(vm_cid, disk_cid) if vm_cid
         end
       rescue Bosh::Clouds::DiskNotAttached
       end
 
       begin
-        step "Delete disk" do
+        step 'Delete disk' do
           cloud.delete_disk(disk_cid)
         end
       rescue Bosh::Clouds::DiskNotFound
@@ -316,11 +290,11 @@ module Bosh::Deployer
 
     def detach_disk(disk_cid)
       unless disk_cid
-        err "Error: nil value given for persistent disk id"
+        err 'Error: nil value given for persistent disk id'
       end
 
       unmount_disk(disk_cid)
-      step "Detach disk" do
+      step 'Detach disk' do
         cloud.detach_disk(state.vm_cid, disk_cid)
       end
     end
@@ -336,8 +310,8 @@ module Bosh::Deployer
       agent_disk_cid = disk_info.first
       if agent_disk_cid != state.disk_cid
         err "instance #{state.vm_cid} has invalid disk: " +
-          "Agent reports #{agent_disk_cid} while " +
-          "deployer's record shows #{state.disk_cid}"
+              "Agent reports #{agent_disk_cid} while " +
+              "deployer's record shows #{state.disk_cid}"
       end
     end
 
@@ -376,7 +350,7 @@ module Bosh::Deployer
 
       spec ||= @apply_spec
 
-      step "Applying micro BOSH spec" do
+      step 'Applying micro BOSH spec' do
         # first update spec with infrastructure specific stuff
         update_spec(spec)
         # then update spec with generic changes
@@ -405,7 +379,7 @@ module Bosh::Deployer
     end
 
     def agent_stop
-      step "Stopping agent services" do
+      step 'Stopping agent services' do
         begin
           agent.run_task(:stop)
         rescue
@@ -414,7 +388,7 @@ module Bosh::Deployer
     end
 
     def agent_start
-      step "Starting agent services" do
+      step 'Starting agent services' do
         agent.run_task(:start)
       end
     end
@@ -428,7 +402,7 @@ module Bosh::Deployer
     end
 
     def agent_port
-      uri = URI.parse(Config.cloud_options["properties"]["agent"]["mbus"])
+      uri = URI.parse(Config.cloud_options['properties']['agent']['mbus'])
 
       uri.port
     end
@@ -436,14 +410,14 @@ module Bosh::Deployer
     def wait_until_agent_ready #XXX >> agent_client
       remote_tunnel(@registry_port)
 
-      wait_until_ready("agent") { agent.ping }
+      wait_until_ready('agent') { agent.ping }
     end
 
     def wait_until_director_ready
       port = @apply_spec.director_port
       url = "https://#{bosh_ip}:#{port}/info"
 
-      wait_until_ready("director", 1, 600) do
+      wait_until_ready('director', 1, 600) do
 
         http_client = HTTPClient.new
 
@@ -451,21 +425,21 @@ module Bosh::Deployer
         http_client.ssl_config.verify_callback = Proc.new {}
 
         response = http_client.get(url)
-        message = "Nginx has started but the application it is proxying to has not started yet."
-        raise Bosh::Deployer::DirectorGatewayError.new(message) if response.status == 502 || response.status == 503
+        message = 'Nginx has started but the application it is proxying to has not started yet.'
+        raise DirectorGatewayError.new(message) if response.status == 502 || response.status == 503
         info = Yajl::Parser.parse(response.body)
         logger.info("Director is ready: #{info.inspect}")
       end
     end
 
     def delete_stemcell
-      err "Cannot find existing stemcell" unless state.stemcell_cid
+      err 'Cannot find existing stemcell' unless state.stemcell_cid
 
       if state.stemcell_cid == state.stemcell_name
-        step "Preserving stemcell" do
+        step 'Preserving stemcell' do
         end
       else
-        step "Delete stemcell" do
+        step 'Delete stemcell' do
           cloud.delete_stemcell(state.stemcell_cid)
         end
       end
@@ -476,9 +450,9 @@ module Bosh::Deployer
     end
 
     def delete_vm
-      err "Cannot find existing VM" unless state.vm_cid
+      err 'Cannot find existing VM' unless state.vm_cid
 
-      step "Delete VM" do
+      step 'Delete VM' do
         cloud.delete_vm(state.vm_cid)
       end
       state.vm_cid = nil
@@ -491,7 +465,7 @@ module Bosh::Deployer
         Psych.load_file(@state_yml)
       else
         logger.info("No existing deployments found (will save to #{@state_yml})")
-        { "instances" => [], "disks" => [] }
+        { 'instances' => [], 'disks' => [] }
       end
     end
 
@@ -520,8 +494,8 @@ module Bosh::Deployer
     def load_state(name)
       @deployments = load_deployments
 
-      disk_model.insert_multiple(@deployments["disks"]) if disk_model
-      instance_model.insert_multiple(@deployments["instances"])
+      disk_model.insert_multiple(@deployments['disks']) if disk_model
+      instance_model.insert_multiple(@deployments['instances'])
 
       @state = instance_model.find(:name => name)
       if @state.nil?
@@ -536,10 +510,10 @@ module Bosh::Deployer
 
     def save_state
       state.save
-      @deployments["instances"] = instance_model.map { |instance| instance.values }
-      @deployments["disks"] = disk_model.map { |disk| disk.values } if disk_model
+      @deployments['instances'] = instance_model.map { |instance| instance.values }
+      @deployments['disks'] = disk_model.map { |disk| disk.values } if disk_model
 
-      File.open(@state_yml, "w") do |file|
+      File.open(@state_yml, 'w') do |file|
         file.write(Psych.dump(@deployments))
       end
     end

data/lib/bosh/deployer/logger_renderer.rb

@@ -0,0 +1,20 @@
+module Bosh::Deployer
+  class LoggerRenderer
+    attr_accessor :stage, :total, :index
+
+    def initialize
+      enter_stage('Deployer', 0)
+    end
+
+    def enter_stage(stage, total)
+      @stage = stage
+      @total = total
+      @index = 0
+    end
+
+    def update(state, task)
+      Config.logger.info("#{@stage} - #{state} #{task}")
+      @index += 1 if state == :finished
+    end
+  end
+end

data/lib/{deployer → bosh/deployer}/specification.rb

@@ -7,7 +7,7 @@ module Bosh::Deployer
     end
 
     def self.load_apply_spec(dir)
-      file = "apply_spec.yml"
+      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"
@@ -20,7 +20,7 @@ module Bosh::Deployer
 
     def initialize(spec)
       @spec = spec
-      @properties = @spec["properties"]
+      @properties = @spec['properties']
     end
 
     # Update the spec with the IP of the micro bosh instance.
@@ -30,8 +30,8 @@ module Bosh::Deployer
     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
+        @properties['director'] = {} unless @properties['director']
+        @properties['director']['name'] = Config.name
       end
 
       # on AWS blobstore and nats need to use an elastic IP (if available),
@@ -49,11 +49,11 @@ module Bosh::Deployer
       # 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"])
+      override_property(@properties, 'hm', Config.spec_properties['hm'])
 
-      override_property(@properties, "director", Config.spec_properties["director"])
-      set_property(@properties, "ntp", Config.spec_properties["ntp"])
-      set_property(@properties, "compiled_package_cache", Config.spec_properties["compiled_package_cache"])
+      override_property(@properties, 'director', Config.spec_properties['director'])
+      set_property(@properties, 'ntp', Config.spec_properties['ntp'])
+      set_property(@properties, 'compiled_package_cache', Config.spec_properties['compiled_package_cache'])
 
       @spec
     end
@@ -65,23 +65,23 @@ module Bosh::Deployer
 
     # @return [String] the port the director runs on
     def director_port
-      @properties["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"] ||= {}
+      agent = @properties['agent'] ||= {}
       svc = agent[service] ||= {}
-      svc["address"] = address
+      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
+      @properties[service]['address'] = address
 
       override_property(@properties, service, Config.spec_properties[service])
     end