arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Now that we can specify domain per node, take out check that would reject a valid config

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15709 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2013-03-28 18:51:09 +00:00
parent c6005f0dac
commit 3ca8c9a561
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/lib/perl/xCAT/Template.pm
View File

@ -317,7 +317,7 @@ sub windows_account_data {
}
}
unless ($::XCATSITEVALS{directoryprovider} eq "activedirectory" and $::XCATSITEVALS{domain}) {
unless ($::XCATSITEVALS{directoryprovider} eq "activedirectory") {
return $useraccountxml;
}
my $domain;
@ -380,7 +380,7 @@ sub windows_dns_cfg {
#-Provide domain administrator credentials, avoiding the SSL scenario. This is by default forbidden as it is high risk for exposing sensitive credentials.
# Also populate MachineObjectOU
sub windows_join_data {
unless ($::XCATSITEVALS{directoryprovider} eq "activedirectory" and $::XCATSITEVALS{domain}) {
unless ($::XCATSITEVALS{directoryprovider} eq "activedirectory") {
return "";
}
#we are still here, meaning configuration has a domain and activedirectory set, probably want to join..