diff options
author | Derek Groh <derekgroh@gmail.com> | 2018-09-13 13:43:02 -0500 |
---|---|---|
committer | Derek Groh <derekgroh@gmail.com> | 2018-09-13 13:43:22 -0500 |
commit | 78cee99b68d3d2bb8a6dbf2b161414e4a7c3a207 (patch) | |
tree | a1478d8d57ec413c9a413501a43447773f47eaef | |
parent | 4a50f8512912a403983c09d96973406e4aae412e (diff) | |
download | chef-78cee99b68d3d2bb8a6dbf2b161414e4a7c3a207.tar.gz |
syntax and logic fixes
Signed-off-by: Derek Groh <derekgroh@github.io>
-rw-r--r-- | lib/chef/resource/windows_workgroup.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef/resource/windows_workgroup.rb b/lib/chef/resource/windows_workgroup.rb index 6f34eb5bd4..7d0f462caf 100644 --- a/lib/chef/resource/windows_workgroup.rb +++ b/lib/chef/resource/windows_workgroup.rb @@ -55,7 +55,8 @@ class Chef description "Update the workgroup." unless workgroup_member? - cmd = "$pswd = ConvertTo-SecureString \'#{new_resource.password}\' -AsPlainText -Force;" if new_resource.password + cmd = "" + cmd << "$pswd = ConvertTo-SecureString \'#{new_resource.password}\' -AsPlainText -Force;" if new_resource.password cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{new_resource.user}\",$pswd);" if new_resource.password cmd << "Add-Computer -WorkgroupName #{new_resource.workgroup_name}" cmd << " -Credential $credential" if new_resource.password @@ -90,7 +91,7 @@ class Chef end def workgroup_member? - node_workgroup = powershell_out!("Get-WmiObject -Class Win32_ComputerSystem).Workgroup") + node_workgroup = powershell_out!("(Get-WmiObject -Class Win32_ComputerSystem).Workgroup") raise "Failed to determine if system already a member of workgroup #{new_resource.workgroup_name}" if node_workgroup.error? node_workgroup.stdout.downcase.strip == new_resource.workgroup_name.downcase end |