bosh-director 1.2671.0 → 1.2681.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb1e33e934dc8fb2e942461ceea197e61995b852
-  data.tar.gz: d915b1c4eaab7a3188817c9ffce3890c6931dd06
+  metadata.gz: 4a7f44d202087d4aa0089e08984847e842eb313d
+  data.tar.gz: 971df267af17197cb276d5085b29a5422383ca93
 SHA512:
-  metadata.gz: b62223d97415c758a6e7cc405ed08e3b75d967e91f1291680ccd66be69f635f4043c7def087699dbe766f19d85bcf0619a8dc8f5ea10a4d58cdf7f7bf18032b4
-  data.tar.gz: c7838d737a2fa59f1693822537c1646601ddb42eb10762c371a7eea5bed6720d46d6f84cb48e1a5118e52baeae140845996a968880a18c7142c63119dd2bfa41
+  metadata.gz: c078eaa4f69de3e9ff00e8de8e4a27fa95cc666a52fc9fa1474c642835798f2d90bf53cc0898c8de2a06a54b59d51471504032a91f1cdadb5ec5c520955341f7
+  data.tar.gz: 71537ae4313800620429ec5ac9eb8eae8ac4ea92b71ce29821ecc225052d63df19e9aaa1cf02742d08dcd7bd3075ebf260fec8bb17a1a878998c0ae959b2dcfe

data/db/migrations/director/20140731215410_increase_text_limit_for_data_columns.rb

@@ -0,0 +1,52 @@
+require 'digest/sha1'
+
+Sequel.migration do
+  change do
+    affected_constraint = [:package_id, :stemcell_id, :dependency_key]
+    constraint = self.indexes(:compiled_packages).find do |_, v|
+      v[:columns] == affected_constraint
+    end
+
+    if constraint
+      if [:mysql2, :mysql].include?(adapter_scheme)
+        alter_table(:compiled_packages) do
+          drop_index affected_constraint, name: constraint.first
+        end
+      else
+        alter_table(:compiled_packages) do
+          drop_constraint constraint.first
+        end
+      end
+    end
+
+    alter_table(:compiled_packages) do
+      set_column_type :dependency_key, String, null: false, text: true
+
+      add_column :dependency_key_sha1, String, null: true
+    end
+
+
+    self[:compiled_packages].each do |row|
+      self[:compiled_packages].filter(:id => row[:id]).update(
+        :dependency_key_sha1 => Digest::SHA1.hexdigest(row[:dependency_key])
+      )
+    end
+
+    # enforcing dependency_key_sha1 to be not null after adding values to old data
+    alter_table(:compiled_packages) do
+      set_column_not_null :dependency_key_sha1
+
+      # Dependency key is part of unique constraint since different
+      # dependencies uniquely identify compiled package
+      add_index [:package_id, :stemcell_id, :dependency_key_sha1], unique: true, name: 'package_stemcell_dependency_key_sha1_idx'
+    end
+
+    alter_table(:deployment_properties) do
+      set_column_type :value, String, null: false, text: true
+    end
+
+    alter_table(:director_attributes) do
+      set_column_type :value, String, text: true
+    end
+  end
+end

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

@@ -12,6 +12,12 @@ module Bosh::Director::Models
       validates_unique [:package_id, :stemcell_id, :build]
     end
 
+    def before_save
+      self.dependency_key_sha1 = Digest::SHA1.hexdigest(self.dependency_key)
+
+      super
+    end
+
     def name
       package.name
     end
@@ -28,6 +34,5 @@ module Bosh::Director::Models
 
       filter(attrs).max(:build).to_i + 1
     end
-
   end
 end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2671.0'
+    VERSION = '1.2681.0'
   end
 end

data/lib/cloud/dummy.rb

@@ -18,11 +18,6 @@ module Bosh
           raise ArgumentError, 'Must specify dir'
         end
 
-        @agent_type = options['agent']['type']
-        unless %w(ruby go).include?(@agent_type)
-          raise ArgumentError, 'Unknown agent type provided'
-        end
-
         @running_vms_dir = File.join(@base_dir, 'running_vms')
 
         @logger = MonoLogger.new(options['log_device'] || STDOUT)
@@ -174,7 +169,7 @@ module Bosh
         root_dir = File.join(agent_base_dir(agent_id), 'root_dir')
         FileUtils.mkdir_p(File.join(root_dir, 'etc', 'logrotate.d'))
 
-        agent_cmd = agent_cmd(agent_id, root_dir)
+        agent_cmd = agent_cmd(agent_id)
         agent_log = agent_log_path(agent_id)
 
         agent_pid = Process.spawn(*agent_cmd, {
@@ -215,12 +210,9 @@ module Bosh
         File.write(path, JSON.generate('ip' => ip_address))
       end
 
-      def agent_cmd(agent_id, root_dir)
-        go_agent_exe = File.expand_path('../../../../go_agent/out/bosh-agent', __FILE__)
-        {
-          'ruby' => %W[bosh_agent      -b #{agent_base_dir(agent_id)} -I dummy -r #{root_dir} --no-alerts],
-          'go'   => %W[#{go_agent_exe} -b #{agent_base_dir(agent_id)} -I dummy -P dummy -M dummy-nats],
-        }[@agent_type.to_s]
+      def agent_cmd(agent_id)
+        go_agent_exe = File.expand_path('../../../../go/src/github.com/cloudfoundry/bosh-agent/out/bosh-agent', __FILE__)
+        %W[#{go_agent_exe} -b #{agent_base_dir(agent_id)} -I dummy -P dummy -M dummy-nats]
       end
 
       def read_agent_settings(agent_id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2671.0
+  version: 1.2681.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,140 +30,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
 - !ruby/object:Gem::Dependency
   name: bosh_warden_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2671.0
+        version: 1.2681.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -460,7 +460,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  03191d
+  c8f6a2
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -509,6 +509,7 @@ files:
 - db/migrations/director/20131125232201_rename_rendered_templates_archives_blob_id_and_checksum_columns.rb
 - db/migrations/director/20140116002324_pivot_director_attributes.rb
 - db/migrations/director/20140124225348_proper_pk_for_attributes.rb
+- db/migrations/director/20140731215410_increase_text_limit_for_data_columns.rb
 - db/migrations/dns/20120123234908_initial.rb
 - lib/bosh/director.rb
 - lib/bosh/director/agent_client.rb