ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

- If katello sends manifest did not change, do not report a change. - Allow support of repository_sets that do not have a releasever, like the Red Hat Satellite Tools 6.2 for RHEL 7 Server RPMs x86_64 set. (#19022)

Browse source
This commit is contained in:
cliles 2017-01-19 09:19:19 -08:00 committed by Toshio Kuratomi
parent ebd06ebba0
commit 2a90963833
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/remote_management/foreman/katello.py
View file

@ -245,7 +245,7 @@ class NailGun(object):
e = get_exception() e = get_exception()
if "Import is the same as existing data" in e.message: if "Import is the same as existing data" in e.message:
return True return False
else: else:
self._module.fail_json(msg="Manifest import failed with %s" % e) self._module.fail_json(msg="Manifest import failed with %s" % e)
@ -308,7 +308,7 @@ class NailGun(object):
formatted_name = [params['name'].replace('(', '').replace(')', '')] formatted_name = [params['name'].replace('(', '').replace(')', '')]
formatted_name.append(params['basearch']) formatted_name.append(params['basearch'])
if params['releasever']: if 'releasever' in params:
formatted_name.append(params['releasever']) formatted_name.append(params['releasever'])
formatted_name = ' '.join(formatted_name) formatted_name = ' '.join(formatted_name)
@ -319,7 +319,10 @@ class NailGun(object):
repository = repository.search() repository = repository.search()
if len(repository) == 0: if len(repository) == 0:
if 'releasever' in params:
reposet.enable(data={'basearch': params['basearch'], 'releasever': params['releasever']}) reposet.enable(data={'basearch': params['basearch'], 'releasever': params['releasever']})
else:
reposet.enable(data={'basearch': params['basearch']})
return True return True