change env-bosh-pw to vcapPw

cloudfoundry · Sep 11, 2024 · 94b5d36 · 94b5d36
1 parent 41ac368
commit 94b5d36
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/bosh-director/lib/bosh/director/deployment_plan/steps/create_vm_step.rb b/src/bosh-director/lib/bosh/director/deployment_plan/steps/create_vm_step.rb
@@ -125,9 +125,9 @@ def create(instance, stemcell_cid, cloud_properties, network_settings, disks, en
           end
 
           password = env.fetch('bosh', {}).fetch('password', "")
-          if !cloud_properties.dig('env', 'bosh', 'password').nil?
+          if !cloud_properties.dig('vcap_password').nil?
             env['bosh'] ||= {}
-            env['bosh']['password'] = cloud_properties['env']['bosh']['password']
+            env['bosh']['password'] = cloud_properties['vcap_password']
           elsif Config.generate_vm_passwords && password == ""
             env['bosh'] ||= {}
             env['bosh']['password'] = sha512_hashed_password

diff --git a/src/bosh-director/spec/unit/deployment_plan/steps/create_vm_step_spec.rb b/src/bosh-director/spec/unit/deployment_plan/steps/create_vm_step_spec.rb
@@ -698,11 +698,7 @@ module Steps
                 {
                   'ram' => '4gb',
                   'disk' => '20gb',
-                  'env' => {
-                    'bosh' => {
-                      'password' => 'foo123'
-                    }
-                  }
+                  'vcap_password' => 'foo123'
                 }
               end