cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2112 from jhawkesworth/fix_ame_2090

Browse source 
Fix for https://github.com/ansible/ansible-modules-extras/issues/2090
This commit is contained in:
Matt Davis 2016-04-26 11:43:58 -07:00
commit 0b66156f25
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
windows/win_regedit.ps1
View file

@ -118,8 +118,8 @@ else
} }
if($registryDataType -eq "binary" -and $registryData -ne $null) { if($registryDataType -eq "binary" -and $registryData -ne $null -and $registryData.GetType().Name -eq 'String') {
$registryData = Convert-RegExportHexStringToByteArray($registryData) $registryData = Convert-RegExportHexStringToByteArray($registryData)
} }
if($state -eq "present") { if($state -eq "present") {

15
windows/win_regedit.py
View file

@ -43,7 +43,7 @@ options:
aliases: [] aliases: []
data: data:
description: description:
- Registry Value Data. Binary data should be expressed as comma separated hex values. An easy way to generate this is to run C(regedit.exe) and use the I(Export) option to save the registry values to a file. In the exported file binary values will look like C(hex:be,ef,be,ef). The C(hex:) prefix is optional. - Registry Value Data. Binary data should be expressed a yaml byte array or as comma separated hex values. An easy way to generate this is to run C(regedit.exe) and use the I(Export) option to save the registry values to a file. In the exported file binary values will look like C(hex:be,ef,be,ef). The C(hex:) prefix is optional.
required: false required: false
default: null default: null
aliases: [] aliases: []
@ -96,13 +96,24 @@ EXAMPLES = '''
# Creates Registry Key called MyCompany, # Creates Registry Key called MyCompany,
# a value within MyCompany Key called "hello", and # a value within MyCompany Key called "hello", and
# binary data for the value "hello" as type "binary". # binary data for the value "hello" as type "binary"
# data expressed as comma separated list
win_regedit: win_regedit:
key: HKCU:\Software\MyCompany key: HKCU:\Software\MyCompany
value: hello value: hello
data: hex:be,ef,be,ef,be,ef,be,ef,be,ef data: hex:be,ef,be,ef,be,ef,be,ef,be,ef
datatype: binary datatype: binary
# Creates Registry Key called MyCompany,
# a value within MyCompany Key called "hello", and
# binary data for the value "hello" as type "binary"
# data expressed as yaml array of bytes
win_regedit:
key: HKCU:\Software\MyCompany
value: hello
data: [0xbe,0xef,0xbe,0xef,0xbe,0xef,0xbe,0xef,0xbe,0xef]
datatype: binary
# Delete Registry Key MyCompany # Delete Registry Key MyCompany
# NOTE: Not specifying a value will delete the root key which means # NOTE: Not specifying a value will delete the root key which means
# all values will be deleted # all values will be deleted