diff options
| -rw-r--r-- | kitchen-tests/kitchen.travis.yml | 3 | ||||
| -rw-r--r-- | lib/chef/resource/zypper_package.rb | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/kitchen-tests/kitchen.travis.yml b/kitchen-tests/kitchen.travis.yml index 0161b3aeba..06b789a3c2 100644 --- a/kitchen-tests/kitchen.travis.yml +++ b/kitchen-tests/kitchen.travis.yml @@ -105,7 +105,8 @@ platforms: image: dokken/opensuse-leap pid_one_command: /bin/systemd intermediate_instructions: - - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers + - RUN /usr/bin/zypper --non-interactive update + - RUN /usr/bin/zypper --non-interactive install cron suites: - name: end-to-end diff --git a/lib/chef/resource/zypper_package.rb b/lib/chef/resource/zypper_package.rb index 9dd9a0b7b9..8e2186b2a5 100644 --- a/lib/chef/resource/zypper_package.rb +++ b/lib/chef/resource/zypper_package.rb @@ -35,7 +35,9 @@ class Chef description: "Allow downgrading a package to satisfy requested version requirements.", default: false, introduced: "13.6" - property :global_options, [ String, Array ], coerce: proc { |x| x.is_a?(String) ? x.shellsplit : x } + property :global_options, [ String, Array ], + description: "One (or more) additional options that are passed to the package resource other than options to the command. e.g. zypper_package <global-options> command <command-options>", + coerce: proc { |x| x.is_a?(String) ? x.shellsplit : x } end end end |