stackforge-attic/murano-conductor
Code Issues Proposed changes

AD + ExternalAD extended with ability to configure user name and OU

Browse Source 
Change-Id: Ide79ff7d7a7c6328c1ea936b97605a0083c67a9e
This commit is contained in:
Stan Lagun 2013-07-16 20:16:33 +04:00
parent 8f718b33cb
commit d77660f8dc
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/templates/agent/JoinDomain.template
View File

@ -1,5 +1,4 @@
{
"Scripts": [],
"Commands": [
{
"Name": "Import-Module",
@ -17,11 +16,15 @@
{
"Name": "Join-Domain",
"Arguments": {
"Username": "$domainUser",
"Password": "$domainPassword",
"DomainName": "$domain",
"Username": "Administrator",
"Password": "$domainPassword"
"OUPath": "$ouPath"
}
}
],
"RebootOnCompletion": 1
"RebootOnCompletion": 1,
"Scripts": [
"RnVuY3Rpb24gSm9pbi1Eb21haW4gewo8IwouU1lOT1BTSVMKRXhlY3V0ZXMgIkpvaW4gZG9tYWluIiBhY3Rpb24uCgpSZXF1aXJlcyAnQ29yZUZ1bmN0aW9ucycgbW9kdWxlLgojPgoJcGFyYW0gKAoJCVtTdHJpbmddICREb21haW5OYW1lID0gJycsCgkJW1N0cmluZ10gJFVzZXJOYW1lID0gJycsCgkJW1N0cmluZ10gJFBhc3N3b3JkID0gJycsCgkJW1N0cmluZ10gJE9VUGF0aCA9ICcnLAogICAgICAgIFtTd2l0Y2hdICRBbGxvd1Jlc3RhcnQKCSkKCQoJaWYgKCRVc2VyTmFtZSAtZXEgJycpIHsKCQkkVXNlck5hbWUgPSAnQWRtaW5pc3RyYXRvcicKCX0KCgkkQ3JlZGVudGlhbCA9IE5ldy1DcmVkZW50aWFsIC1Vc2VyTmFtZSAiJERvbWFpbk5hbWVcJFVzZXJOYW1lIiAtUGFzc3dvcmQgJFBhc3N3b3JkCgoJaWYgKFRlc3QtQ29tcHV0ZXJOYW1lIC1Eb21haW5OYW1lICREb21haW5OYW1lKSB7CiAgICAgICAgV3JpdGUtTG9nV2FybmluZyAiQ29tcHV0ZXIgYWxyZWFkeSBqb2luZWQgdG8gZG9tYWluICckRG9tYWluTmFtZSciCgl9CgllbHNlIHsKCQlXcml0ZS1Mb2cgIkpvaW5pbmcgY29tcHV0ZXIgdG8gZG9tYWluICckRG9tYWluTmFtZScgLi4uIgoJCQoJCWlmICgkT1VQYXRoIC1lcSAnJykgewoJCQlBZGQtQ29tcHV0ZXIgLURvbWFpbk5hbWUgJERvbWFpbk5hbWUgLUNyZWRlbnRpYWwgJENyZWRlbnRpYWwgLUZvcmNlIC1FcnJvckFjdGlvbiBTdG9wCgkJfQoJCWVsc2UgewoJCQlBZGQtQ29tcHV0ZXIgLURvbWFpbk5hbWUgJERvbWFpbk5hbWUgLUNyZWRlbnRpYWwgJENyZWRlbnRpYWwgLU9VUGF0aCAkT1VQYXRoIC1Gb3JjZSAtRXJyb3JBY3Rpb24gU3RvcAoJCX0KCQkKICAgICAgICBpZiAoJEFsbG93UmVzdGFydCkgewogICAgICAgICAgICBXcml0ZS1Mb2cgIlJlc3RhcnRpbmcgY29tcHV0ZXIgLi4uIgogICAgICAgICAgICBSZXN0YXJ0LUNvbXB1dGVyIC1Gb3JjZQogICAgICAgIH0KICAgICAgICBlbHNlIHsKICAgICAgICAgICAgV3JpdGUtTG9nICJQbGVhc2UgcmVzdGFydCB0aGUgY29tcHV0ZXIgbm93LiIKICAgICAgICB9Cgl9Cn0K"
]
}

2
data/workflows/AD.xml
View File

@ -162,6 +162,8 @@
<mapping name="dnsIp">
<select path="state.primaryDcIp"/>
</mapping>
<mapping name="domainUser">Administrator</mapping>
<mapping name="ouPath"></mapping>
</map>
</parameter>

14
data/workflows/ExternalAD.xml.example
View File

@ -8,19 +8,23 @@
<!-- Specify here parameters of domain controllers at each availability zone -->
<!-- ======================================================================= -->
<mapping name="AvailabilityZone1">
<mapping name="Region1">
<map>
<mapping name="domain">domain1</mapping>
<mapping name="domainUser">Administrator</mapping>
<mapping name="domainPassword">password1</mapping>
<mapping name="dnsIp">ip1</mapping>
<mapping name="ou"></mapping>
</map>
</mapping>
<mapping name="AvailabilityZone2">
<mapping name="Region2">
<map>
<mapping name="domain">domain2</mapping>
<mapping name="domainUser">Administrator</mapping>
<mapping name="domainPassword">password2</mapping>
<mapping name="dnsIp">ip2</mapping>
<mapping name="ou"></mapping>
</map>
</mapping>
@ -49,12 +53,18 @@
<mapping name="domain">
<select path="domain" source="ad"/>
</mapping>
<mapping name="domainUser">
<select path="domainUser" source="ad"/>
</mapping>
<mapping name="domainPassword">
<select path="domainPassword" source="ad"/>
</mapping>
<mapping name="dnsIp">
<select path="dnsIp" source="ad"/>
</mapping>
<mapping name="ouPath">
<select path="ou" source="ad"/>
</mapping>
</map>
</parameter>