Browse code
don't restrict disable_excludes choices incorrectly (#47453)
* don't restrict disable_excludes choices incorrectly
Fixes #47085
(cherry picked from commit 0e3e646189552950a9ae2e681a21554b2003d910)
Signed-off-by: Adam Miller <admiller@redhat.com>
Adam Miller authored on 2018/10/24 01:39:55Showing 4 changed files
- changelogs/fragments/dnfyum-disable-excludes.yaml
- lib/ansible/module_utils/yumdnf.py
- lib/ansible/modules/packaging/os/dnf.py
- lib/ansible/modules/packaging/os/yum.py
| ... | ... |
@@ -22,7 +22,7 @@ yumdnf_argument_spec = dict( |
| 22 | 22 |
autoremove=dict(type='bool', default=False), |
| 23 | 23 |
bugfix=dict(required=False, type='bool', default=False), |
| 24 | 24 |
conf_file=dict(type='str'), |
| 25 |
- disable_excludes=dict(type='str', default=None, choices=['all', 'main', 'repoid']), |
|
| 25 |
+ disable_excludes=dict(type='str', default=None), |
|
| 26 | 26 |
disable_gpg_check=dict(type='bool', default=False), |
| 27 | 27 |
disable_plugin=dict(type='list', default=[]), |
| 28 | 28 |
disablerepo=dict(type='list', default=[]), |
| ... | ... |
@@ -149,7 +149,6 @@ options: |
| 149 | 149 |
- If set to C(main), disable excludes defined in [main] in yum.conf. |
| 150 | 150 |
- If set to C(repoid), disable excludes defined for given repo id. |
| 151 | 151 |
required: false |
| 152 |
- choices: [ all, main, repoid ] |
|
| 153 | 152 |
version_added: "2.7" |
| 154 | 153 |
validate_certs: |
| 155 | 154 |
description: |
| ... | ... |
@@ -183,7 +183,6 @@ options: |
| 183 | 183 |
- If set to C(main), disable excludes defined in [main] in yum.conf. |
| 184 | 184 |
- If set to C(repoid), disable excludes defined for given repo id. |
| 185 | 185 |
required: false |
| 186 |
- choices: [ all, main, repoid ] |
|
| 187 | 186 |
version_added: "2.7" |
| 188 | 187 |
download_only: |
| 189 | 188 |
description: |