bosh-director 1.3262.0 → 1.3262.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 576adc0d9f6febe9f333d2f9323ae9d8c7a31f87
-  data.tar.gz: 01311d5a771cd111a100a5866d7cd38007dde982
+  metadata.gz: fef907f7eb794345ecc71719479d6bccce8c38cd
+  data.tar.gz: 4a096667cc426bde89ea2857699f5f6540a67038
 SHA512:
-  metadata.gz: addb243b3fe331ae2783f7799af05991645e5529b205bf968756f2bc4dd1e7d41d797c0130657706d8f98b86366d344f874156d0fdf25e38e88fb3d2f65f93b9
-  data.tar.gz: 0f4ca4cd3d286d8a904202380647faa9e5f4e62de7b1abab550a615a69311a14ae38ca2eaa957874b794357d6b862c080140471300d55d461078a219b15ce5d3
+  metadata.gz: 8895ccf2fb097b628415ec8800a6694e57c3e523e0d9ce05430fb2bc7098f5bf586ac6ad5278d7b552c2f4a426919583d92d994c0975a8209ff482dfad70bff2
+  data.tar.gz: 6f92d6c25bae4f77039889e3755715399b18bfa1fab63ac28a763c1e72dbe7d8fa551c66f012371d30f82f188e771baa395182d6fc33384ca29dd7c819f9f150

data/lib/bosh/director.rb

@@ -39,7 +39,6 @@ require 'delayed_job_sequel'
 require 'common/thread_formatter'
 require 'bosh/core/encryption_handler'
 require 'bosh/director/api'
-require 'bosh/director/dns/blobstore_dns_publisher'
 require 'bosh/director/dns/canonicalizer'
 require 'bosh/director/dns/dns_manager'
 require 'bosh/director/dns/local_dns_repo'

data/lib/bosh/director/config.rb

@@ -40,7 +40,6 @@ module Bosh::Director
         :generate_vm_passwords,
         :remove_dev_tools,
         :enable_virtual_delete_vms,
-        :local_dns,
       )
 
       attr_reader(
@@ -165,7 +164,6 @@ module Bosh::Director
         @generate_vm_passwords = config.fetch('generate_vm_passwords', false)
         @remove_dev_tools = config['remove_dev_tools']
         @record_events = config.fetch('record_events', false)
-        @local_dns = config.fetch('local_dns', false)
 
         @enable_virtual_delete_vms = config.fetch('enable_virtual_delete_vms', false)
 

data/lib/bosh/director/dns/dns_manager.rb

@@ -1,28 +1,76 @@
 module Bosh::Director
   class DnsManagerProvider
     def self.create
-      dns_config = Config.dns || {}
+      dns_enabled = !!Config.dns_db # to be consistent with current behavior
+      if dns_enabled
+        dns_config = Config.dns || {}
+        logger = Config.logger
+        local_dns_repo = LocalDnsRepo.new(logger)
+        dns_domain_name = Canonicalizer.canonicalize(dns_config.fetch('domain_name', 'bosh'), :allow_dots => true)
+        dns_provider = PowerDns.new(dns_domain_name, logger)
+
+        EnabledDnsManager.new(dns_domain_name, dns_config, dns_provider, local_dns_repo, logger)
+      else
+        DisabledDnsManager.new
+      end
+    end
+  end
+
+  private
+
+  class DnsManager
+    def configure_nameserver ; end
+
+    def delete_dns_for_instance(instance_model) ; end
+
+    def dns_record_name(hostname, job_name, network_name, deployment_name) ; end
+
+    # build a list of dns servers to use
+    def dns_servers(network, dns_spec, add_default_dns = true)
+      servers = nil
+
+      if dns_spec
+        servers = []
+        dns_spec.each do |dns|
+          dns = NetAddr::CIDR.create(dns)
+          unless dns.size == 1
+            raise NetworkInvalidDns,
+              "Invalid DNS for network '#{network}': must be a single IP"
+          end
+
+          servers << dns.ip
+        end
+      end
+
+      return servers unless add_default_dns
+      add_default_dns_server(servers)
+    end
+
+    def find_dns_record(dns_record_name, ip_address) ; end
 
-      logger = Config.logger
-      dns_domain_name = Canonicalizer.canonicalize(dns_config.fetch('domain_name', 'bosh'), :allow_dots => true)
-      local_dns_repo = LocalDnsRepo.new(logger)
+    def find_dns_record_names_by_instance(instance_model) ; end
 
-      dns_publisher = BlobstoreDnsPublisher.new(App.instance.blobstores.blobstore, dns_domain_name) if Config.local_dns
-      dns_provider = PowerDns.new(dns_domain_name, logger) if !!Config.dns_db
+    def flush_dns_cache ; end
 
-      DnsManager.new(dns_domain_name, dns_config, dns_provider, dns_publisher, local_dns_repo, logger)
+    def migrate_legacy_records(instance_model) ; end
+
+    def update_dns_record_for_instance(instance_model, dns_names_to_ip) ; end
+
+    private
+
+    def add_default_dns_server(servers)
+      servers
     end
   end
 
   public
 
-  class DnsManager
+  class EnabledDnsManager < DnsManager
     attr_reader :dns_domain_name
 
-    def initialize(dns_domain_name, dns_config, dns_provider, dns_publisher, local_dns_repo, logger)
+    def initialize(dns_domain_name, dns_config, dns_provider, local_dns_repo, logger)
       @dns_domain_name = dns_domain_name
       @dns_provider = dns_provider
-      @dns_publisher = dns_publisher
       @default_server = dns_config['server']
       @flush_command = dns_config['flush_command']
       @ip_address = dns_config['address']
@@ -31,21 +79,21 @@ module Bosh::Director
     end
 
     def dns_enabled?
-      !@dns_provider.nil?
-    end
-
-    def publisher_enabled?
-      !@dns_publisher.nil?
+      true
     end
 
     def configure_nameserver
-      @dns_provider.create_or_update_nameserver(@ip_address) if dns_enabled?
+      @dns_provider.create_or_update_nameserver(@ip_address)
     end
 
     def find_dns_record(dns_record_name, ip_address)
       @dns_provider.find_dns_record(dns_record_name, ip_address)
     end
 
+    def find_dns_record_names_by_instance(instance_model)
+      instance_model.nil? ? [] : instance_model.dns_record_names.to_a.compact
+    end
+
     def update_dns_record_for_instance(instance_model, dns_names_to_ip)
       current_dns_records = @local_dns_repo.find(instance_model)
       new_dns_records = []
@@ -60,7 +108,6 @@ module Bosh::Director
 
     def migrate_legacy_records(instance_model)
       return if @local_dns_repo.find(instance_model).any?
-      return unless dns_enabled?
 
       index_pattern_for_all_networks = dns_record_name(
         instance_model.index,
@@ -84,8 +131,6 @@ module Bosh::Director
     end
 
     def delete_dns_for_instance(instance_model)
-      return if !dns_enabled?
-
       current_dns_records = @local_dns_repo.find(instance_model)
       if current_dns_records.empty?
         # for backwards compatibility when old instances
@@ -136,24 +181,6 @@ module Bosh::Director
           @logger.warn("Failed to flush DNS cache: #{stderr.chomp}")
         end
       end
-      publish_dns_records
-    end
-
-    def publish_dns_records
-      if publisher_enabled?
-        dns_records = @dns_publisher.export_dns_records
-        @dns_publisher.publish(dns_records)
-      end
-    end
-
-    def cleanup_dns_records
-      if publisher_enabled?
-        @dns_publisher.cleanup_blobs
-      end
-    end
-
-    def find_dns_record_names_by_instance(instance_model)
-      instance_model.nil? ? [] : instance_model.dns_record_names.to_a.compact
     end
 
     def dns_record_name(hostname, job_name, network_name, deployment_name)
@@ -179,4 +206,14 @@ module Bosh::Director
       servers
     end
   end
+
+  class DisabledDnsManager < DnsManager
+    def dns_domain_name
+      nil
+    end
+
+    def dns_enabled?
+      false
+    end
+  end
 end

data/lib/bosh/director/instance_deleter.rb

@@ -35,14 +35,6 @@ module Bosh::Director
             @dns_manager.delete_dns_for_instance(instance_model)
           end
 
-          error_ignorer.with_force_check do
-            @dns_manager.publish_dns_records
-          end
-
-          error_ignorer.with_force_check do
-            @dns_manager.cleanup_dns_records
-          end
-
           error_ignorer.with_force_check do
             RenderedJobTemplatesCleaner.new(instance_model, @blobstore, @logger).clean_all
           end

data/lib/bosh/director/models.rb

@@ -10,7 +10,6 @@ require 'bosh/director/models/deployment_property'
 require 'bosh/director/models/director_attribute'
 require 'bosh/director/models/instance'
 require 'bosh/director/models/ip_address'
-require 'bosh/director/models/local_dns_blob'
 require 'bosh/director/models/log_bundle'
 require 'bosh/director/models/orphan_disk'
 require 'bosh/director/models/orphan_snapshot'

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3262.0'
+    VERSION = '1.3262.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3262.0
+  version: 1.3262.4.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3262.0
+        version: 1.3262.4.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -810,7 +810,6 @@ files:
 - lib/bosh/director/deployment_plan/vm_extension.rb
 - lib/bosh/director/deployment_plan/vm_type.rb
 - lib/bosh/director/disk_manager.rb
-- lib/bosh/director/dns/blobstore_dns_publisher.rb
 - lib/bosh/director/dns/canonicalizer.rb
 - lib/bosh/director/dns/dns_manager.rb
 - lib/bosh/director/dns/local_dns_repo.rb
@@ -907,7 +906,6 @@ files:
 - lib/bosh/director/models/helpers/model_helper.rb
 - lib/bosh/director/models/instance.rb
 - lib/bosh/director/models/ip_address.rb
-- lib/bosh/director/models/local_dns_blob.rb
 - lib/bosh/director/models/lock.rb
 - lib/bosh/director/models/log_bundle.rb
 - lib/bosh/director/models/orphan_disk.rb

data/lib/bosh/director/dns/blobstore_dns_publisher.rb

@@ -1,35 +0,0 @@
-module Bosh::Director
-  class BlobstoreDnsPublisher
-    def initialize(blobstore, domain_name)
-      @blobstore = blobstore
-      @domain_name = domain_name
-    end
-
-    def publish(dns_records)
-      json_records = {:records => dns_records}.to_json
-      blobstore_id = @blobstore.create(json_records)
-      Models::LocalDnsBlob.create(:blobstore_id => blobstore_id, :sha1 => Digest::SHA1.hexdigest(json_records), :created_at => Time.new)
-      blobstore_id
-    end
-
-    def export_dns_records
-      hosts = []
-      Models::Instance.all.map do |instance|
-        spec = instance.spec
-        spec['networks'].each do |network_name, network|
-          hosts << [ network['ip'], spec['id'] + '.' + spec['name'] + '.' + network_name + '.' + spec['deployment'] + '.' + @domain_name ]
-        end
-      end
-      hosts
-    end
-
-    def cleanup_blobs
-      dns_blobs = Models::LocalDnsBlob.order(:id).all
-      dns_blobs = dns_blobs - [ dns_blobs.last ]
-      dns_blobs.each do |blob|
-        Models::EphemeralBlob.create(:blobstore_id => blob.blobstore_id, :sha1 => blob.sha1, :created_at => blob.created_at)
-        blob.delete
-      end
-    end
-  end
-end

data/lib/bosh/director/models/local_dns_blob.rb

@@ -1,4 +0,0 @@
-module Bosh::Director::Models
-  class LocalDnsBlob < Sequel::Model(Bosh::Director::Config.db)
-  end
-end