Skip to content

Commit 296365b

Browse files
committed
change env-bosh-pw to vcapPw
1 parent d68277a commit 296365b

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

src/bosh-director/lib/bosh/director/deployment_plan/steps/create_vm_step.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ def create(instance, stemcell_cid, cloud_properties, network_settings, disks, en
125125
end
126126

127127
password = env.fetch('bosh', {}).fetch('password', "")
128-
if !cloud_properties.dig('env', 'bosh', 'password').nil?
128+
if !cloud_properties.dig('vcap_password').nil?
129129
env['bosh'] ||= {}
130-
env['bosh']['password'] = cloud_properties['env']['bosh']['password']
130+
env['bosh']['password'] = cloud_properties['vcap_password']
131131
elsif Config.generate_vm_passwords && password == ""
132132
env['bosh'] ||= {}
133133
env['bosh']['password'] = sha512_hashed_password

src/bosh-director/spec/unit/deployment_plan/steps/create_vm_step_spec.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -698,11 +698,7 @@ module Steps
698698
{
699699
'ram' => '4gb',
700700
'disk' => '20gb',
701-
'env' => {
702-
'bosh' => {
703-
'password' => 'foo123'
704-
}
705-
}
701+
'vcap_password' => 'foo123'
706702
}
707703
end
708704

0 commit comments

Comments
 (0)