bosh-director 1.3232.0 → 1.3232.14.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/db/migrations/director/20160614182106_change_text_to_longtext_for_mysql.rb +21 -0
  3. data/db/migrations/director/20160615192201_change_text_to_longtext_for_mysql_for_additional_fields.rb +10 -0
  4. data/lib/bosh/director/api/event_manager.rb +2 -2
  5. data/lib/bosh/director/deployment_plan/instance_spec.rb +10 -2
  6. data/lib/bosh/director/version.rb +1 -1
  7. metadata +18 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3be5b66fb713f0101c8fdd159b0bc3032a717f1d
4
- data.tar.gz: 0429e247b484b8ef9bbefb29282112be66ad596c
3
+ metadata.gz: a837c7b90d039dbd492c1506a4c7253dec5eb819
4
+ data.tar.gz: 5b2d3ce62da0df025a2a42640ae3e141bec0d572
5
5
  SHA512:
6
- metadata.gz: d6cbcbff8db5ec4b94178b51753fd51c024064d336d92c65c661fa7cdc5ff3c7a8b52bf9d07301fbccc30ba5c017984e48f6b20ccdbd9b846b8e530f8555ea63
7
- data.tar.gz: 7f5c5e5f696bb7d1a8bdfab55631dd198ddcd3d8c7db624722aa4428500319a0857b424301413587ecc0a5ae47d3a99418739995386942a8ae5b4c8255fc7456
6
+ metadata.gz: 5c84bcc40ce0f73fbe079807e5c6661a3046ed3efec1036ba1c8343e0d43d626ee639f6b7277eb09c2a17dc2a843c429558e3e3b796b41a79347c7ddd9fb76e9
7
+ data.tar.gz: a0e71896691b3165b1db175db703e6f50759f2376c915140a8b38abff02cc72ebf057fe84afc0a9c03ec57e9012fdc2e26184f936df97d9799de17827ab39190
data/db/migrations/director/20160614182106_change_text_to_longtext_for_mysql.rb ADDED
@@ -0,0 +1,21 @@
1
+ Sequel.migration do
2
+ change do
3
+ if [:mysql2, :mysql].include?(adapter_scheme)
4
+ set_column_type :compiled_packages, :dependency_key, 'longtext'
5
+ set_column_type :deployment_problems, :data_json, 'longtext'
6
+ set_column_type :deployment_properties, :value, 'longtext'
7
+ set_column_type :deployments, :link_spec_json, 'longtext'
8
+ set_column_type :director_attributes, :value, 'longtext'
9
+ set_column_type :instances, :cloud_properties, 'longtext'
10
+ set_column_type :instances, :dns_records, 'longtext'
11
+ set_column_type :instances, :spec_json, 'longtext'
12
+ set_column_type :instances, :credentials_json, 'longtext'
13
+ set_column_type :orphan_disks, :cloud_properties_json, 'longtext'
14
+ set_column_type :packages, :dependency_set_json, 'longtext'
15
+ set_column_type :persistent_disks, :cloud_properties_json, 'longtext'
16
+ set_column_type :templates, :package_names_json, 'longtext'
17
+ set_column_type :templates, :logs_json, 'longtext'
18
+ set_column_type :templates, :properties_json, 'longtext'
19
+ end
20
+ end
21
+ end
data/db/migrations/director/20160615192201_change_text_to_longtext_for_mysql_for_additional_fields.rb ADDED
@@ -0,0 +1,10 @@
1
+ Sequel.migration do
2
+ change do
3
+ if [:mysql2, :mysql].include?(adapter_scheme)
4
+ set_column_type :events, :error, 'longtext'
5
+ set_column_type :events, :context_json, 'longtext'
6
+ set_column_type :delayed_jobs, :handler, 'longtext'
7
+ set_column_type :delayed_jobs, :last_error, 'longtext'
8
+ end
9
+ end
10
+ end
data/lib/bosh/director/api/event_manager.rb CHANGED
@@ -33,7 +33,7 @@ module Bosh::Director
33
33
  object_type = options[:object_type]
34
34
  object_name = options.fetch(:object_name, nil)
35
35
  task = options.fetch(:task, nil)
36
- error = options.fetch(:error){ |error| error ? error.to_s: nil }
36
+ error = options.fetch(:error, nil)
37
37
  deployment = options.fetch(:deployment, nil)
38
38
  instance = options.fetch(:instance, nil)
39
39
  context = options.fetch(:context, {})
@@ -45,7 +45,7 @@ module Bosh::Director
45
45
  action: action,
46
46
  object_type: object_type,
47
47
  object_name: object_name,
48
- error: error,
48
+ error: error ? error.to_s : nil,
49
49
  task: task,
50
50
  deployment: deployment,
51
51
  instance: instance,
data/lib/bosh/director/deployment_plan/instance_spec.rb CHANGED
@@ -122,16 +122,24 @@ module Bosh::Director
122
122
  template_hash = @full_spec.select {|k,v| keys.include?(k) }
123
123
 
124
124
  networks_hash = template_hash['networks']
125
- networks_hash_with_dns = networks_hash.each_pair do |network_name, network_settings|
125
+ modified_networks_hash = networks_hash.each_pair do |network_name, network_settings|
126
126
  if @full_spec['job'] != nil
127
127
  settings_with_dns = network_settings.merge({'dns_record_name' => @dns_manager.dns_record_name(@full_spec['index'], @full_spec['job']['name'], network_name, @full_spec['deployment'])})
128
128
  networks_hash[network_name] = settings_with_dns
129
129
  end
130
+
131
+ if network_settings['type'] == 'dynamic'
132
+ # Templates may get rendered before we know dynamic IPs from the Agent.
133
+ # Use valid IPs so that templates don't have to write conditionals around nil values.
134
+ networks_hash[network_name]['ip'] ||= '127.0.0.1'
135
+ networks_hash[network_name]['netmask'] ||= '127.0.0.1'
136
+ networks_hash[network_name]['gateway'] ||= '127.0.0.1'
137
+ end
130
138
  end
131
139
 
132
140
  template_hash.merge({
133
141
  'resource_pool' => @full_spec['vm_type']['name'],
134
- 'networks' => networks_hash_with_dns
142
+ 'networks' => modified_networks_hash
135
143
  })
136
144
  end
137
145
  end
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.3232.0'
3
+ VERSION = '1.3232.14.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-director
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3232.0
4
+ version: 1.3232.14.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-25 00:00:00.000000000 Z
11
+ date: 2016-07-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_common
@@ -16,98 +16,98 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.3232.0
19
+ version: 1.3232.14.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.3232.0
26
+ version: 1.3232.14.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bosh_cpi
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.3232.0
33
+ version: 1.3232.14.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.3232.0
40
+ version: 1.3232.14.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bosh-registry
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.3232.0
47
+ version: 1.3232.14.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 1.3232.0
54
+ version: 1.3232.14.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: blobstore_client
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.3232.0
61
+ version: 1.3232.14.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 1.3232.0
68
+ version: 1.3232.14.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bosh-core
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.3232.0
75
+ version: 1.3232.14.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 1.3232.0
82
+ version: 1.3232.14.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bosh-director-core
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 1.3232.0
89
+ version: 1.3232.14.0
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 1.3232.0
96
+ version: 1.3232.14.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: bosh-template
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.3232.0
103
+ version: 1.3232.14.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 1.3232.0
110
+ version: 1.3232.14.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bosh_openstack_cpi
113
113
  requirement: !ruby/object:Gem::Requirement
@@ -659,6 +659,8 @@ files:
659
659
  - db/migrations/director/20160329201256_set_instances_with_nil_serial_to_false.rb
660
660
  - db/migrations/director/20160331225404_backfill_stemcell_os.rb
661
661
  - db/migrations/director/20160411104407_add_task_started_at.rb
662
+ - db/migrations/director/20160614182106_change_text_to_longtext_for_mysql.rb
663
+ - db/migrations/director/20160615192201_change_text_to_longtext_for_mysql_for_additional_fields.rb
662
664
  - db/migrations/dns/20120123234908_initial.rb
663
665
  - lib/bosh/director.rb
664
666
  - lib/bosh/director/agent_client.rb