diff options
| author | Noah Kantrowitz <noah@coderanger.net> | 2017-04-04 10:45:41 -0700 |
|---|---|---|
| committer | Noah Kantrowitz <noah@coderanger.net> | 2017-04-04 10:45:41 -0700 |
| commit | 11a07953165b631eb3612a00560a24fa14d14606 (patch) | |
| tree | b4011db7d33e99186e9e9c124d62040db1e6bb3f /lib/chef/resource | |
| parent | 848404e77096c19ba8689927330c61e12cbd10fb (diff) | |
| parent | 93c72873224c6a79ae13b5d2fa70cb9bfc645c5c (diff) | |
| download | chef-11a07953165b631eb3612a00560a24fa14d14606.tar.gz | |
Merge branch 'master' into freeze-property-default
Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
Diffstat (limited to 'lib/chef/resource')
| -rw-r--r-- | lib/chef/resource/launchd.rb | 4 | ||||
| -rw-r--r-- | lib/chef/resource/lwrp_base.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/systemd_unit.rb | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/lib/chef/resource/launchd.rb b/lib/chef/resource/launchd.rb index d158b1e165..3fba76e220 100644 --- a/lib/chef/resource/launchd.rb +++ b/lib/chef/resource/launchd.rb @@ -27,7 +27,7 @@ class Chef identity_attr :label default_action :create - allowed_actions :create, :create_if_missing, :delete, :enable, :disable + allowed_actions :create, :create_if_missing, :delete, :enable, :disable, :restart property :label, String, default: lazy { name }, identity: true property :backup, [Integer, FalseClass] @@ -114,7 +114,7 @@ class Chef property :ld_group, String property :limit_load_from_hosts, Array property :limit_load_to_hosts, Array - property :limit_load_to_session_type, Array + property :limit_load_to_session_type, [ Array, String ] property :low_priority_io, [ TrueClass, FalseClass ] property :mach_services, Hash property :nice, Integer diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb index 7dfe147341..b12ac98673 100644 --- a/lib/chef/resource/lwrp_base.rb +++ b/lib/chef/resource/lwrp_base.rb @@ -69,8 +69,6 @@ class Chef LWRPBase.loaded_lwrps[filename] = true - # Create the deprecated Chef::Resource::LwrpFoo class - Chef::Resource.register_deprecated_lwrp_class(resource_class, convert_to_class_name(resource_name)) resource_class end diff --git a/lib/chef/resource/systemd_unit.rb b/lib/chef/resource/systemd_unit.rb index 688f2e9dcd..1a19a7d682 100644 --- a/lib/chef/resource/systemd_unit.rb +++ b/lib/chef/resource/systemd_unit.rb @@ -33,14 +33,19 @@ class Chef :try_restart, :reload_or_restart, :reload_or_try_restart + # Internal provider-managed properties property :enabled, [TrueClass, FalseClass] property :active, [TrueClass, FalseClass] property :masked, [TrueClass, FalseClass] property :static, [TrueClass, FalseClass] + + # User-provided properties property :user, String, desired_state: false property :content, [String, Hash] property :triggers_reload, [TrueClass, FalseClass], default: true, desired_state: false + property :verify, [TrueClass, FalseClass], + default: true, desired_state: false def to_ini case content |