implemented installroot option (#33613)

* fix

* move version to 2.6
This commit is contained in:
Aleksander Kovtunenko 2018-03-20 12:41:50 +02:00 committed by John R Barker
parent 334b291720
commit f51a6ea832
2 changed files with 27 additions and 1 deletions

View file

@ -62,6 +62,12 @@ options:
choices: [ package, patch, pattern, product, srcpackage, application ] choices: [ package, patch, pattern, product, srcpackage, application ]
default: "package" default: "package"
version_added: "2.0" version_added: "2.0"
extra_args_precommand:
version_added: "2.6"
required: false
description:
- Add additional global target options to C(zypper).
- Options should be supplied in a single line as if given in the command line.
disable_gpg_check: disable_gpg_check:
description: description:
- Whether to disable to GPG signature checking of the package - Whether to disable to GPG signature checking of the package
@ -308,7 +314,9 @@ def get_cmd(m, subcommand):
is_install = subcommand in ['install', 'update', 'patch', 'dist-upgrade'] is_install = subcommand in ['install', 'update', 'patch', 'dist-upgrade']
is_refresh = subcommand == 'refresh' is_refresh = subcommand == 'refresh'
cmd = ['/usr/bin/zypper', '--quiet', '--non-interactive', '--xmlout'] cmd = ['/usr/bin/zypper', '--quiet', '--non-interactive', '--xmlout']
if m.params['extra_args_precommand']:
args_list = m.params['extra_args_precommand'].split()
cmd.extend(args_list)
# add global options before zypper command # add global options before zypper command
if (is_install or is_refresh) and m.params['disable_gpg_check']: if (is_install or is_refresh) and m.params['disable_gpg_check']:
cmd.append('--no-gpg-checks') cmd.append('--no-gpg-checks')
@ -464,6 +472,7 @@ def main():
name=dict(required=True, aliases=['pkg'], type='list'), name=dict(required=True, aliases=['pkg'], type='list'),
state=dict(required=False, default='present', choices=['absent', 'installed', 'latest', 'present', 'removed', 'dist-upgrade']), state=dict(required=False, default='present', choices=['absent', 'installed', 'latest', 'present', 'removed', 'dist-upgrade']),
type=dict(required=False, default='package', choices=['package', 'patch', 'pattern', 'product', 'srcpackage', 'application']), type=dict(required=False, default='package', choices=['package', 'patch', 'pattern', 'product', 'srcpackage', 'application']),
extra_args_precommand=dict(required=False, default=None),
disable_gpg_check=dict(required=False, default='no', type='bool'), disable_gpg_check=dict(required=False, default='no', type='bool'),
disable_recommends=dict(required=False, default='yes', type='bool'), disable_recommends=dict(required=False, default='yes', type='bool'),
force=dict(required=False, default='no', type='bool'), force=dict(required=False, default='no', type='bool'),

View file

@ -229,6 +229,23 @@
name: empty name: empty
state: removed state: removed
- name: extract from rpm
zypper:
name: "{{ output_dir | expanduser }}/zypper2/rpm-build/noarch/empty-1-0.noarch.rpm"
state: installed
disable_gpg_check: yes
extra_args_precommand: --root {{ output_dir | expanduser }}/testdir/
- name: check that dir var is exist
stat: path={{ output_dir | expanduser }}/testdir/var
register: stat_result
- name: check that we extract rpm package in testdir folder and folder var is exist
assert:
that:
- "stat_result.stat.exists == true"
# test simultaneous remove and install using +- prefixes # test simultaneous remove and install using +- prefixes
- name: install hello to prep next task - name: install hello to prep next task