Bosh release issue with vSphere CPI about bosh

[pmenglund]

I ran in to the same issue myself, and this is what I think needs to be done. I haven't tested it yet, as my vSphere test environment is not in order.

± me+kx |master ✗| → git di
diff --git a/release/jobs/director/templates/director.yml.erb b/release/jobs/director/templates/director.yml.erb
index 1e7feda..3e6cf04 100644
--- a/release/jobs/director/templates/director.yml.erb
+++ b/release/jobs/director/templates/director.yml.erb
@@ -133,15 +133,15 @@ cloud:
         password: <%= password %>
         datacenters:
           <% datacenters.each do |dc| %>
-          - name: <%= dc.name %>
-            vm_folder: <%= dc.vm_folder || "BOSH_VMs" %>
-            template_folder: <%= dc.template_folder || "BOSH_Templates" %>
-            disk_path: <%= dc.disk_path || "BOSH_Disks" %>
-            datastore_pattern: <%= dc.datastore_pattern %>
-            persistent_datastore_pattern: <%= dc.persistent_datastore_pattern %>
-            allow_mixed_datastores: <%= dc.allow_mixed_datastores || true %>
+          - name: <%= dc['name'] %>
+            vm_folder: <%= dc['vm_folder'] || "BOSH_VMs" %>
+            template_folder: <%= dc['template_folder'] || "BOSH_Templates" %>
+            disk_path: <%= dc['disk_path'] || "BOSH_Disks" %>
+            datastore_pattern: <%= dc['datastore_pattern'] %>
+            persistent_datastore_pattern: <%= dc['persistent_datastore_pattern'] %>
+            allow_mixed_datastores: <%= dc['allow_mixed_datastores'] || true %>
             clusters:
-              <% dc.clusters.each do |cluster| %>
+              <% dc['clusters'].each do |cluster| %>
                 <% case cluster
                    when OpenStruct %>
                   <% cluster_hash = cluster.marshal_dump %>

[stefanschneider]

I've put and tested the following fix and worked Ok. I'm not sure which one is more hacky and/or future proof. Which one should go for a pull request?

diff --git a/release/jobs/director/templates/director.yml.erb b/release/jobs/director/templates/director.yml.erb
index 1e7feda..400ec60 100644
--- a/release/jobs/director/templates/director.yml.erb
+++ b/release/jobs/director/templates/director.yml.erb
@@ -132,7 +132,7 @@ cloud:
         user: <%= user %>
         password: <%= password %>
         datacenters:
-          <% datacenters.each do |dc| %>
+          <% properties.vcenter.datacenters.each do |dc| %>
           - name: <%= dc.name %>
             vm_folder: <%= dc.vm_folder || "BOSH_VMs" %>
             template_folder: <%= dc.template_folder || "BOSH_Templates" %>

[pmenglund]

We are trying to move away from accessing the properties directly, i.e. use the p() helpers, and as

datacenters.each do |dc|

now yield a Hash, we should be using it instead (or perhaps turn dc into an OpenStruct).

[pmenglund]

Merged Stefan's changes