Greetings!
Please review the pull request #164: Tickets/2.7.x/9831 standardize windows provider confines opened by (jhelwig)
Some more information about the pull request:
- Opened: Tue Oct 11 18:27:54 UTC 2011
- Based on: puppetlabs:2.7.x (5e3962c5b149c1eeaf62db9090b665b45ad8a128)
- Requested merge: jhelwig:tickets/2.7.x/9831-standardize-windows-provider-confines (ad98d472e9d3c2ac995d7122c07843d7283ae9c2)
Description:
The newly created providers for Windows were using a combination of:operatingsystem => :windows and :feature => :microsoft_windows
for their confine and defaultfor calls. This brings them in line to
all use the :operatingsystem => :windows form.
The general reasoning being that :operatingsystem is used for things
that are platform specific, where :feature is used for things that are
supported across multiple platforms, but require that external (to
Puppet or the base platform) support exist on the host.
Thanks!
The Pull Request Bot
Diff follows:
diff --git a/lib/puppet/provider/exec/windows.rb b/lib/puppet/provider/exec/windows.rb index 9ce29f1..367b30b 100644 --- a/lib/puppet/provider/exec/windows.rb +++ b/lib/puppet/provider/exec/windows.rb @@ -3,8 +3,8 @@ require 'puppet/provider/exec' Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do include Puppet::Util::Execution - confine :feature => :microsoft_windows - defaultfor :feature => :microsoft_windows + confine :operatingsystem => :windows + defaultfor :operatingsystem => :windows desc "Execute external binaries directly, on Windows systems. This does not pass through a shell, or perform any interpolation, but diff --git a/lib/puppet/provider/file/windows.rb b/lib/puppet/provider/file/windows.rb index d71e7d4..5a7b9ad 100644 --- a/lib/puppet/provider/file/windows.rb +++ b/lib/puppet/provider/file/windows.rb @@ -1,7 +1,7 @@ Puppet::Type.type(:file).provide :windows do desc "Uses Microsoft Windows functionality to manage file's users and rights." - confine :feature => :microsoft_windows + confine :operatingsystem => :windows include Puppet::Util::Warnings diff --git a/lib/puppet/provider/group/windows_adsi.rb b/lib/puppet/provider/group/windows_adsi.rb index 4ddc83b..83dd00b 100644 --- a/lib/puppet/provider/group/windows_adsi.rb +++ b/lib/puppet/provider/group/windows_adsi.rb @@ -4,8 +4,7 @@ Puppet::Type.type(:group).provide :windows_adsi do desc "Group management for Windows" defaultfor :operatingsystem => :windows - confine :operatingsystem => :windows - confine :feature => :microsoft_windows + confine :operatingsystem => :windows has_features :manages_members diff --git a/lib/puppet/provider/service/windows.rb b/lib/puppet/provider/service/windows.rb index 289be69..162dc83 100644 --- a/lib/puppet/provider/service/windows.rb +++ b/lib/puppet/provider/service/windows.rb @@ -13,7 +13,7 @@ Puppet::Type.type(:service).provide :windows do * Control of service groups (dependencies) is not yet supported." defaultfor :operatingsystem => :windows - confine :operatingsystem => :windows + confine :operatingsystem => :windows has_feature :refreshable diff --git a/lib/puppet/provider/user/windows_adsi.rb b/lib/puppet/provider/user/windows_adsi.rb index 1470e17..3a5c716 100644 --- a/lib/puppet/provider/user/windows_adsi.rb +++ b/lib/puppet/provider/user/windows_adsi.rb @@ -4,8 +4,7 @@ Puppet::Type.type(:user).provide :windows_adsi do desc "User management for Windows" defaultfor :operatingsystem => :windows - confine :operatingsystem => :windows - confine :feature => :microsoft_windows + confine :operatingsystem => :windows has_features :manages_homedir, :manages_passwords
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
