bosh_cli_plugin_micro 1.2089.0 → 1.2121.0

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

@@ -5,10 +5,11 @@ require 'bosh/deployer/ssh_server'
 module Bosh::Deployer
   class InstanceManager
     class Openstack
-      def initialize(instance_manager, logger)
+      def initialize(instance_manager, config, logger)
         @instance_manager = instance_manager
         @logger = logger
-        properties = Config.cloud_options['properties']
+        @config = config
+        properties = config.cloud_options['properties']
 
         @registry = Registry.new(
           properties['registry']['endpoint'],
@@ -24,7 +25,7 @@ module Bosh::Deployer
       end
 
       def remote_tunnel
-        @remote_tunnel.create(instance_manager.bosh_ip, registry.port)
+        @remote_tunnel.create(instance_manager.client_services_ip, registry.port)
       end
 
       def disk_model
@@ -35,11 +36,11 @@ module Bosh::Deployer
         properties = spec.properties
 
         properties['openstack'] =
-          Config.spec_properties['openstack'] ||
-          Config.cloud_options['properties']['openstack'].dup
+          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')
       end
@@ -57,24 +58,18 @@ module Bosh::Deployer
         instance_manager.save_state
       end
 
-      def discover_bosh_ip
-        if instance_manager.state.vm_cid
-          floating_ip = instance_manager.cloud.openstack.servers.
-            get(instance_manager.state.vm_cid).floating_ip_address
-          ip = floating_ip || service_ip
-
-          if ip != instance_manager.bosh_ip
-            instance_manager.bosh_ip = ip
-            logger.info("discovered bosh ip=#{instance_manager.bosh_ip}")
-          end
-        end
+      def client_services_ip
+        logger.info('discovering client services ip')
+        discover_client_services_ip
+      end
 
-        instance_manager.bosh_ip
+      def agent_services_ip
+        logger.info('discovering agent services ip')
+        discover_agent_services_ip
       end
 
-      def service_ip
-        instance_manager.cloud.openstack.servers.
-          get(instance_manager.state.vm_cid).private_ip_address
+      def internal_services_ip
+        config.internal_services_ip
       end
 
       # @return [Integer] size in MiB
@@ -88,13 +83,13 @@ module Bosh::Deployer
         # 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 = (config.resources['persistent_disk'] / 1024.0).ceil * 1024
         requested != disk_size(instance_manager.state.disk_cid)
       end
 
       private
 
-      attr_reader :registry, :instance_manager, :logger
+      attr_reader :registry, :instance_manager, :logger, :config
 
       def ssh_properties(properties)
         ssh_user = properties['openstack']['ssh_user']
@@ -103,6 +98,7 @@ module Bosh::Deployer
 
         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"
@@ -110,6 +106,36 @@ module Bosh::Deployer
 
         [ssh_key, ssh_port, ssh_user, ssh_wait]
       end
+
+      def discover_client_services_ip
+        if instance_manager.state.vm_cid
+          server = instance_manager.cloud.openstack.servers.get(instance_manager.state.vm_cid)
+
+          ip = server.floating_ip_address || server.private_ip_address
+
+          logger.info("discovered bosh ip=#{ip}")
+          ip
+        else
+          default_ip = config.client_services_ip
+          logger.info("ip address not discovered - using default of #{default_ip}")
+          default_ip
+        end
+      end
+
+      def discover_agent_services_ip
+        if instance_manager.state.vm_cid
+          server = instance_manager.cloud.openstack.servers.get(instance_manager.state.vm_cid)
+
+          ip = server.private_ip_address
+
+          logger.info("discovered bosh ip=#{ip}")
+          ip
+        else
+          default_ip = config.agent_services_ip
+          logger.info("ip address not discovered - using default of #{default_ip}")
+          default_ip
+        end
+      end
     end
   end
 end

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

@@ -1,10 +1,13 @@
-# Copyright (c) 2009-2012 VMware, Inc.
+require 'forwardable'
 
 module Bosh::Deployer
   class InstanceManager
     class Vcloud
-      def initialize(instance_manager, logger)
+      extend Forwardable
+
+      def initialize(instance_manager, config, logger)
         @instance_manager = instance_manager
+        @config = config
         @logger = logger
       end
 
@@ -21,8 +24,8 @@ module Bosh::Deployer
         properties = spec.properties
 
         properties['vcd'] =
-          Config.spec_properties['vcd'] ||
-          Config.cloud_options['properties']['vcds'].first.dup
+          config.spec_properties['vcd'] ||
+            config.cloud_options['properties']['vcds'].first.dup
 
         properties['vcd']['address'] ||= properties['vcd']['url']
       end
@@ -39,13 +42,12 @@ module Bosh::Deployer
       def stop
       end
 
-      def discover_bosh_ip
-        instance_manager.bosh_ip
-      end
-
-      def service_ip
-        instance_manager.bosh_ip
-      end
+      def_delegators(
+        :config,
+        :internal_services_ip,
+        :agent_services_ip,
+        :client_services_ip,
+      )
 
       # @return [Integer] size in MiB
       def disk_size(cid)
@@ -53,12 +55,12 @@ module Bosh::Deployer
       end
 
       def persistent_disk_changed?
-        Config.resources['persistent_disk'] != disk_size(instance_manager.state.disk_cid)
+        config.resources['persistent_disk'] != disk_size(instance_manager.state.disk_cid)
       end
 
       private
 
-      attr_reader :instance_manager, :logger
+      attr_reader :instance_manager, :logger, :config
 
       FakeRegistry = Struct.new(:port)
       def registry

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

@@ -1,10 +1,13 @@
-# Copyright (c) 2009-2012 VMware, Inc.
+require 'forwardable'
 
 module Bosh::Deployer
   class InstanceManager
     class Vsphere
-      def initialize(instance_manager, logger)
+      extend Forwardable
+
+      def initialize(instance_manager, config, logger)
         @instance_manager = instance_manager
+        @config = config
         @logger = logger
       end
 
@@ -23,8 +26,8 @@ module Bosh::Deployer
         properties = spec.properties
 
         properties['vcenter'] =
-          Config.spec_properties['vcenter'] ||
-          Config.cloud_options['properties']['vcenters'].first.dup
+          config.spec_properties['vcenter'] ||
+            config.cloud_options['properties']['vcenters'].first.dup
 
         properties['vcenter']['address'] ||= properties['vcenter']['host']
       end
@@ -41,13 +44,12 @@ module Bosh::Deployer
       def stop
       end
 
-      def discover_bosh_ip
-        instance_manager.bosh_ip
-      end
-
-      def service_ip
-        instance_manager.bosh_ip
-      end
+      def_delegators(
+        :config,
+        :internal_services_ip,
+        :agent_services_ip,
+        :client_services_ip,
+      )
 
       # @return [Integer] size in MiB
       def disk_size(cid)
@@ -55,12 +57,12 @@ module Bosh::Deployer
       end
 
       def persistent_disk_changed?
-        Config.resources['persistent_disk'] != disk_size(instance_manager.state.disk_cid)
+        config.resources['persistent_disk'] != disk_size(instance_manager.state.disk_cid)
       end
 
       private
 
-      attr_reader :instance_manager, :logger
+      attr_reader :instance_manager, :logger, :config
 
       FakeRegistry = Struct.new(:port)
       def registry

data/lib/bosh/deployer/instance_manager.rb

@@ -40,24 +40,23 @@ module Bosh::Deployer
       config_sha1 = Bosh::Deployer::HashFingerprinter.new.sha1(config)
       ui_messager = Bosh::Deployer::UiMessager.for_deployer
 
-      new(config, config_sha1, ui_messager, plugin_name)
+      new(Config.configure(config), config_sha1, ui_messager, plugin_name)
     end
 
     def initialize(config, config_sha1, ui_messager, plugin_name)
-      Config.configure(config)
-      @config = Config
+      @config = config
 
       plugin_class = InstanceManager.const_get(plugin_name.capitalize)
-      @infrastructure = plugin_class.new(self, logger)
+      @infrastructure = plugin_class.new(self, config, logger)
 
-      @deployments_state = DeploymentsState.load_from_dir(config['dir'], logger)
-      load_state(config['name'])
+      @deployments_state = DeploymentsState.load_from_dir(config.base_dir, logger)
+      deployments_state.load_deployment(config.name, infrastructure)
 
-      Config.uuid = state.uuid
+      config.uuid = state.uuid
 
       @config_sha1 = config_sha1
       @ui_messager = ui_messager
-      @renderer = LoggerRenderer.new
+      @renderer = LoggerRenderer.new(logger)
     end
 
     def_delegators(
@@ -70,19 +69,16 @@ module Bosh::Deployer
     def_delegators(
       :@config,
       :cloud,
-      :agent,
       :logger,
-      :bosh_ip,
-      :bosh_ip=,
     )
 
-    def check_dependencies
-      infrastructure.check_dependencies
-    end
-
-    def discover_bosh_ip
-      infrastructure.discover_bosh_ip
-    end
+    def_delegators(
+      :infrastructure,
+      :check_dependencies,
+      :agent_services_ip,
+      :client_services_ip,
+      :internal_services_ip,
+    )
 
     def step(task)
       renderer.update(:started, task)
@@ -126,7 +122,6 @@ module Bosh::Deployer
       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 })
-        infrastructure.discover_bosh_ip
       end
       save_state
 
@@ -144,7 +139,7 @@ module Bosh::Deployer
 
       unless @apply_spec
         step 'Fetching apply spec' do
-          @apply_spec = Specification.new(agent.release_apply_spec)
+          @apply_spec = Specification.new(agent.release_apply_spec, config)
         end
       end
 
@@ -220,13 +215,13 @@ module Bosh::Deployer
           run_command("tar -zxf #{stemcell_tgz} -C #{stemcell}")
         end
 
-        @apply_spec = Specification.load_from_stemcell(stemcell)
+        @apply_spec = Specification.load_from_stemcell(stemcell, config)
 
         # load properties from stemcell manifest
         properties = load_stemcell_manifest(stemcell)
 
         # override with values from the deployment manifest
-        override = Config.cloud_options['properties']['stemcell']
+        override = config.cloud_options['properties']['stemcell']
         properties['cloud_properties'].merge!(override) if override
 
         step 'Uploading stemcell' do
@@ -242,9 +237,9 @@ module Bosh::Deployer
     # rubocop:enable MethodLength
 
     def create_vm(stemcell_cid)
-      resources = Config.resources['cloud_properties']
-      networks = Config.networks
-      env = Config.env
+      resources = config.resources['cloud_properties']
+      networks = config.networks
+      env = config.env
       cloud.create_vm(state.uuid, stemcell_cid, resources, networks, nil, env)
     end
 
@@ -283,7 +278,7 @@ module Bosh::Deployer
 
     def create_disk
       step 'Create disk' do
-        size = Config.resources['persistent_disk']
+        size = config.resources['persistent_disk']
         state.disk_cid = cloud.create_disk(size, state.vm_cid)
         save_state
       end
@@ -353,7 +348,7 @@ module Bosh::Deployer
         create_disk
         attach_disk(state.disk_cid, true)
       elsif infrastructure.persistent_disk_changed?
-        size = Config.resources['persistent_disk']
+        size = config.resources['persistent_disk']
 
         # save a reference to the old disk
         old_disk_cid = state.disk_cid
@@ -383,11 +378,12 @@ module Bosh::Deployer
       step 'Applying micro BOSH spec' do
         # first update spec with infrastructure specific stuff
         infrastructure.update_spec(spec)
+
         # then update spec with generic changes
-        spec = spec.update(bosh_ip, infrastructure.service_ip)
+        spec = spec.update(agent_services_ip, internal_services_ip)
 
-        microbosh_job_instance = MicroboshJobInstance.new(bosh_ip, Config.agent_url, logger)
-        spec = microbosh_job_instance.render_templates(spec)
+        microbosh_instance = MicroboshJobInstance.new(client_services_ip, config.agent_url, logger)
+        spec = microbosh_instance.render_templates(spec)
 
         agent.run_task(:apply, spec)
       end
@@ -399,8 +395,22 @@ module Bosh::Deployer
       deployments_state.save(infrastructure)
     end
 
+    def agent
+      uri = URI.parse(config.agent_url)
+      user, password = uri.userinfo.split(':', 2)
+      uri.userinfo = nil
+      uri.host = client_services_ip
+      Bosh::Agent::HTTPClient.new(uri.to_s, {
+        'user' => user,
+        'password' => password,
+        'reply_to' => config.uuid,
+      })
+    end
+
     private
 
+    attr_reader :config
+
     def agent_stop
       step 'Stopping agent services' do
         begin
@@ -431,7 +441,7 @@ module Bosh::Deployer
     end
 
     def agent_port
-      URI.parse(Config.cloud_options['properties']['agent']['mbus']).port
+      URI.parse(config.cloud_options['properties']['agent']['mbus']).port
     end
 
     def wait_until_agent_ready
@@ -441,7 +451,7 @@ module Bosh::Deployer
 
     def wait_until_director_ready
       port = @apply_spec.director_port
-      url = "https://#{bosh_ip}:#{port}/info"
+      url = "https://#{client_services_ip}:#{port}/info"
 
       wait_until_ready('director', 1, 600) do
 
@@ -499,11 +509,6 @@ module Bosh::Deployer
       Psych.load_file(file)
     end
 
-    def load_state(name)
-      deployments_state.load_deployment(name, infrastructure)
-      infrastructure.discover_bosh_ip
-    end
-
     def run_command(command)
       output, status = Open3.capture2e(command)
       if status.exitstatus != 0

data/lib/bosh/deployer/logger_renderer.rb

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

data/lib/bosh/deployer/microbosh_job_instance.rb

@@ -6,13 +6,13 @@ require 'blobstore_client'
 module Bosh::Deployer
   class MicroboshJobInstance
 
-    def initialize(bosh_ip, mbus, logger)
+    def initialize(blobstore_ip, mbus, logger)
       @logger = logger
 
       uri = URI.parse(mbus)
       user, password = uri.userinfo.split(':', 2)
       uri.userinfo = ''
-      uri.host = bosh_ip
+      uri.host = blobstore_ip
       uri.path = '/blobs'
       @blobstore_options = {
         'endpoint' => uri.to_s,

data/lib/bosh/deployer/models/instance.rb

@@ -1,4 +1,7 @@
 module Bosh::Deployer::Models
-  class Instance < Sequel.Model(Bosh::Deployer::Config.db[:instances])
+  def self.define_instance_from_table(table)
+    return if const_defined?(:Instance)
+    klass = Class.new(Sequel.Model(table))
+    const_set(:Instance, klass)
   end
 end

data/lib/bosh/deployer/specification.rb

@@ -1,8 +1,8 @@
 module Bosh::Deployer
   class Specification
-    def self.load_from_stemcell(dir)
+    def self.load_from_stemcell(dir, config)
       spec = load_apply_spec(dir)
-      Specification.new(spec)
+      Specification.new(spec, config)
     end
 
     def self.load_apply_spec(dir)
@@ -15,46 +15,35 @@ module Bosh::Deployer
     attr_accessor :spec
     attr_accessor :properties
 
-    def initialize(spec)
+    def initialize(spec, config)
+      @config = config
       @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)
+    # @param [String] agent_services_ip IP address of the micro bosh VM
+    # @param [String] internal_services_ip private IP of the micro bosh VM
+    def update(agent_services_ip, internal_services_ip)
       # set the director name to what is specified in the micro_bosh.yml
-      if Config.name
+      if config.name
         @properties['director'] = {} unless @properties['director']
-        @properties['director']['name'] = Config.name
+        @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)
+        update_agent_service_address(service, agent_services_ip)
       end
 
-      services = %w{director redis blobstore nats registry dns}
-      services.each do |service|
-        update_service_address(service, service_ip)
+      %w{registry dns}.each do |service|
+        update_service_address(service, agent_services_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'])
-      override_property(@properties, 'director', Config.spec_properties['director'])
-      set_property(@properties, 'ntp', Config.spec_properties['ntp'])
+      %w{director redis blobstore nats}.each do |service|
+        update_service_address(service, internal_services_ip)
+      end
 
-      set_property(
-        @properties,
-        'compiled_package_cache',
-        Config.spec_properties['compiled_package_cache'],
-      )
+      update_properties
 
       @spec
     end
@@ -71,20 +60,37 @@ module Bosh::Deployer
 
     private
 
+    attr_reader :config
+
+    # 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
+    def update_properties
+      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'],
+      )
+    end
+
     # 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])
+      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])
+      override_property(@properties, service, config.spec_properties[service])
     end
 
     def set_property(properties, key, value)

data/lib/bosh/deployer/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Deployer
-    VERSION = '1.2089.0'
+    VERSION = '1.2121.0'
   end
 end