bosh-gen 0.18.1 → 0.18.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/ChangeLog.md +1 -0
  3. data/lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/bin/{run → run.tt} +0 -0
  4. data/lib/bosh/gen/models/deployment_manifest.rb +6 -1
  5. data/lib/bosh/gen/version.rb +1 -1
  6. data/spec/fixtures/deployment_manifests/2_jobs_1_ip_8196_disk.yml +6 -2
  7. data/spec/fixtures/deployment_manifests/2_jobs_1_ip_8196_disk_with_numeric.yml +6 -2
  8. data/spec/fixtures/deployment_manifests/2_jobs_2_ips_no_disk.yml +6 -2
  9. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3a9020cf883b488cfb4f48688a78c2824018d9e7
4
- data.tar.gz: 256ff1b2761ac9b2bd195bfffcb2d4105a22ab93
3
+ metadata.gz: b33b8281a43096f6d2e5c36d92fcb4a661cc8821
4
+ data.tar.gz: f7456bfb815d99be7e0f537b5c8d492af2217311
5
5
  SHA512:
6
- metadata.gz: d24f7e19053b2227e85bd96f89f9af128a8e30cd95cac02b8dde0d2301591169dab6910e0834b1d5395cc6c91a69255fc0b9c5d25a8ca1e96f8fa9d1e19fd2d5
7
- data.tar.gz: 7689fe1c79be6da4a48b507a99ae7e6de9e922d40b5a892bb228c7424dc9057137eba24c52d3bb2263bd7ca33d52816bed1acd9ad328d6050b68ab725fa3ad8a
6
+ metadata.gz: 54fcdd8c06fbc4868ea2d9472857046c9ba083937b3b952e9d87a54f47283054ab61f6e9783bac6d14cd42a87d0ca1c10fbe55d847adf4cd09b3b5596b1dac9d
7
+ data.tar.gz: 9dacc8b094fc26db274be7b082fce5030a6c3697bfda4775bd58b16b75a397fb7c4607d4a5e5c68c628074b66267d146a7853dfa3f413d90029ae57cca7b0a2c
data/ChangeLog.md CHANGED
@@ -6,6 +6,7 @@ v0.18.0
6
6
  - `errand` - generates an errand-style job template
7
7
  - `copy_property` helper now in bosh-templates gem
8
8
  - `manifest` - `resource_pools` no longer specifies a `size` (modern BOSH has auto-sizing) (v0.18.1)
9
+ - `manifest` - use modern flexible `jobs.templates` format (v0.18.2)
9
10
 
10
11
  v0.17.0
11
12
  -------
data/lib/bosh/gen/models/deployment_manifest.rb CHANGED
@@ -7,6 +7,7 @@ module Bosh::Gen::Models
7
7
  def initialize(name, director_uuid, release_properties, cloud_properties, properties)
8
8
  @manifest = {}
9
9
  @cloud_properties = cloud_properties
10
+ @release_properties = release_properties
10
11
  @properties = properties
11
12
  @security_groups = ["default"]
12
13
  @stemcell_version = "latest"
@@ -73,7 +74,11 @@ module Bosh::Gen::Models
73
74
  job_instances = job["instances"] || 1
74
75
  manifest_job = {
75
76
  "name" => job["name"],
76
- "template" => job["template"] || job["name"],
77
+ "templates" => [
78
+ { "name" => job["template"] || job["name"],
79
+ "release" => @release_properties["name"]
80
+ }
81
+ ],
77
82
  "instances" => job_instances,
78
83
  "resource_pool" => "common",
79
84
  "networks" => [
data/lib/bosh/gen/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Gen
3
- VERSION = "0.18.1"
3
+ VERSION = "0.18.2"
4
4
  end
5
5
  end
data/spec/fixtures/deployment_manifests/2_jobs_1_ip_8196_disk.yml CHANGED
@@ -38,7 +38,9 @@ resource_pools:
38
38
  persistent_disk: 8196
39
39
  jobs:
40
40
  - name: job-with-ips
41
- template: job-with-ips
41
+ templates:
42
+ - name: job-with-ips
43
+ release: myrelease
42
44
  instances: 1
43
45
  resource_pool: common
44
46
  networks:
@@ -51,7 +53,9 @@ jobs:
51
53
  - 1.2.3.4
52
54
  persistent_disk: 8196
53
55
  - name: misc
54
- template: misc
56
+ templates:
57
+ - name: misc
58
+ release: myrelease
55
59
  instances: 1
56
60
  resource_pool: common
57
61
  networks:
data/spec/fixtures/deployment_manifests/2_jobs_1_ip_8196_disk_with_numeric.yml CHANGED
@@ -38,7 +38,9 @@ resource_pools:
38
38
  persistent_disk: 8196
39
39
  jobs:
40
40
  - name: job-with-ips
41
- template: job-with-ips
41
+ templates:
42
+ - name: job-with-ips
43
+ release: myrelease
42
44
  instances: 1
43
45
  resource_pool: common
44
46
  networks:
@@ -51,7 +53,9 @@ jobs:
51
53
  - 4.3.2.1
52
54
  persistent_disk: 8196
53
55
  - name: misc
54
- template: misc
56
+ templates:
57
+ - name: misc
58
+ release: myrelease
55
59
  instances: 1
56
60
  resource_pool: common
57
61
  networks:
data/spec/fixtures/deployment_manifests/2_jobs_2_ips_no_disk.yml CHANGED
@@ -37,7 +37,9 @@ resource_pools:
37
37
  instance_type: m1.small
38
38
  jobs:
39
39
  - name: job-with-ips
40
- template: job-with-ips
40
+ templates:
41
+ - name: job-with-ips
42
+ release: myrelease
41
43
  instances: 1
42
44
  resource_pool: common
43
45
  networks:
@@ -49,7 +51,9 @@ jobs:
49
51
  static_ips:
50
52
  - 1.2.3.4
51
53
  - name: misc
52
- template: misc
54
+ templates:
55
+ - name: misc
56
+ release: myrelease
53
57
  instances: 1
54
58
  resource_pool: common
55
59
  networks:
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-gen
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.18.1
4
+ version: 0.18.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dr Nic Williams
@@ -162,7 +162,7 @@ files:
162
162
  - lib/bosh/gen/generators/errand_generator.rb
163
163
  - lib/bosh/gen/generators/errand_generator/templates/.gitkeep
164
164
  - lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/monit.tt
165
- - lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/bin/run
165
+ - lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/bin/run.tt
166
166
  - lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/config/.gitkeep
167
167
  - lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/helpers/ctl_setup.sh
168
168
  - lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/helpers/ctl_utils.sh