From fdf454497dbcb50372ee3adfa8f1e41587b4dcca Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Fri, 8 May 2020 08:56:40 +0200 Subject: [PATCH 01/91] update test docs --- docs/testing.md | 84 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 67 insertions(+), 17 deletions(-) diff --git a/docs/testing.md b/docs/testing.md index 89988048..97c7b41e 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -1,29 +1,79 @@ -# How to test modules +# Testing Foreman Ansible Modules -To test, you need a running instance of Foreman, probably with Katello (use [forklift](https://github.com/theforeman/forklift) if unsure). -Also you need to run `make test-setup` and update `tests/test_playbooks/vars/server.yml`: +## Overview -```sh -make test-setup -vi tests/test_playbooks/vars/server.yml # point to your Foreman instance +Foreman Ansible Modules are tested in different ways: +1. Unit tests +2. Integration tests +3. Ansible Sanity + +### Unit tests + +We currently only have unit tests for the `foreman_spec` to `argument_spec` translation helpers (see `tests/test_foreman_spec_helper.py`). +All other code is tested by the integration tests. + +### Integration tests + +Every module is tested using a playbook (`see tests/test_playbooks`) against all supported Ansible versions plus the current `devel` branch of Ansible. +Additionally, the modules which support check mode are tested with the latest Ansible release in check mode. + +### Ansible Sanity + +Ansible provides [Sanity Tests](https://docs.ansible.com/ansible/latest/dev_guide/testing/sanity/index.html) that ensure the modules are using the current best practices in terms of development and documentantion. +We run these tests with the `devel` branch of Ansible to ensure conformability with the latest guidelines. + +## Running tests + +### Preparation + +All tests require you to have run `make test-setup`. This will install all test dependencies and prepare a configuration file (`tests/test_playbooks/vars/server.yml`). + +The configuration file will need updates if you want to run tests against a live Foreman instance (see below). + +### Unit tests + +To run the unit tests, execute: + +```console +$ make test-other +``` + +### Integration tests + +To run all integration tests, execute: + +```console +$ make test ``` -To run the tests using the `foreman_global_parameter` module as an example: +To run a specific test or a set of tests, execute: -```sh -make test # all tests -make test_global_parameter # single test -make test TEST="-k 'organzation or global_parameter'" # select tests by expression (see `pytest -h`) +```console +$ make test_global_parameter # single test +$ make test TEST="-k 'organzation or global_parameter'" # select tests by expression (see `pytest -h`) ``` -The tests are run against prerecorded server-responses. -You can (re-)record the cassettes for a specific test with +By default, tests are run with prerecorded server responses using [VCRpy](https://vcrpy.readthedocs.io/). +When tests or modules are changed, those responses might not match anymore and you'll have to re-record the interaction. + +To be able to re-record, you need a running instance of Foreman, probably with Katello (use [forklift](https://github.com/theforeman/forklift) if unsure). +You also need to update `tests/test_playbooks/vars/server.yml` with the URL and credentials of said instance. + +To re-record, execute: + +```console +$ make record_global_parameter +``` + +### Ansible Sanity + +To run the Ansible Sanity tests, execute: -```sh -make record_global_parameter +```console +$ make sanity ``` -# Guideline to writing tests +## Writing tests The tests in this repository run playbooks that can be found in `tests/test_playbooks`. To be run, the name of the corresponding playbook must be listed in `tests/test_crud.py`. @@ -45,7 +95,7 @@ In order to run these tests, the API responses of a running Foreman or Katello s For this last step, `tests/test_playbooks/vars/server.yml` must be configured to point to a running Foreman or Katello server. Then, `make record_` must be called, and the resulting vcr files (`test_playbook/fixtures/-*.yml`) must be checked into git. -## Recording/storing apidoc.json for tests +### Recording/storing apidoc.json for tests The tests depend on a valid `apidoc.json` being available during execution. The easiest way to do so is to provide a `.json` in the `tests/fixtures/apidoc` folder. From 3c7b15bae046caf96b4a2f870d9f9337eee3499d Mon Sep 17 00:00:00 2001 From: Nikhil Jain Date: Tue, 26 May 2020 22:32:39 +0530 Subject: [PATCH 02/91] add host_filters and want_ansible_ssh_host like script used to have --- plugins/inventory/foreman.py | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/plugins/inventory/foreman.py b/plugins/inventory/foreman.py index bd420ecc..94a3e757 100644 --- a/plugins/inventory/foreman.py +++ b/plugins/inventory/foreman.py @@ -65,6 +65,12 @@ - Places hostvars in a dictionary with keys `foreman`, `foreman_facts`, and `foreman_params` type: boolean default: False + want_ansible_ssh_host: + description: Toggle, if true the plugin will populate the ansible_ssh_host variable to explicitly specify the connection target + type: boolean + default: False + host_filters: + description: This can be used to restrict the list of returned host ''' EXAMPLES = ''' @@ -127,7 +133,7 @@ def _get_session(self): self.session.verify = self.get_option('validate_certs') return self.session - def _get_json(self, url, ignore_errors=None): + def _get_json(self, url, ignore_errors=None, params=None): if not self.use_cache or url not in self._cache.get(self.cache_key, {}): @@ -136,7 +142,10 @@ def _get_json(self, url, ignore_errors=None): results = [] s = self._get_session() - params = {'page': 1, 'per_page': 250} + if params is None: + params = {} + params['page'] = 1 + params['per_page'] = 250 while True: ret = s.get(url, params=params) if ignore_errors and ret.status_code in ignore_errors: @@ -174,7 +183,12 @@ def _get_json(self, url, ignore_errors=None): return self._cache[self.cache_key][url] def _get_hosts(self): - return self._get_json("%s/api/v2/hosts" % self.foreman_url) + url = "%s/api/v2/hosts" % self.foreman_url + params = {} + if self.get_option('host_filters'): + params['search'] = self.get_option('host_filters') + return self._get_json(url, params=params) + def _get_all_params_by_id(self, hid): url = "%s/api/v2/hosts/%s" % (self.foreman_url, hid) @@ -274,6 +288,17 @@ def _populate(self): except ValueError as e: self.display.warning("Could not create groups for host collections for %s, skipping: %s" % (host_name, to_text(e))) + # put ansible_ssh_host as hostvar + if self.get_option('want_ansible_ssh_host'): + for key in ('ip', 'ipv4', 'ipv6'): + if host.get(key): + try: + self.inventory.set_variable(host_name, 'ansible_ssh_host', host[key]) + break + except ValueError as e: + self.display.warning("Could not set hostvar ansible_ssh_host to '%s' for the '%s' host, skipping: %s" % + (host[key], host_name, to_text(e))) + strict = self.get_option('strict') hostvars = self.inventory.get_host(host_name).get_vars() From e8d5d41a63de4f9d9bde2139a56a122f94887a75 Mon Sep 17 00:00:00 2001 From: Nikhil Jain Date: Wed, 27 May 2020 09:06:49 +0530 Subject: [PATCH 03/91] remove whitespace --- plugins/inventory/foreman.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/inventory/foreman.py b/plugins/inventory/foreman.py index 94a3e757..1e9a1077 100644 --- a/plugins/inventory/foreman.py +++ b/plugins/inventory/foreman.py @@ -144,7 +144,7 @@ def _get_json(self, url, ignore_errors=None, params=None): s = self._get_session() if params is None: params = {} - params['page'] = 1 + params['page'] = 1 params['per_page'] = 250 while True: ret = s.get(url, params=params) @@ -189,7 +189,6 @@ def _get_hosts(self): params['search'] = self.get_option('host_filters') return self._get_json(url, params=params) - def _get_all_params_by_id(self, hid): url = "%s/api/v2/hosts/%s" % (self.foreman_url, hid) ret = self._get_json(url, [404]) From cddd0ee200fff8827d8528571d03f96dee969c4e Mon Sep 17 00:00:00 2001 From: Nikhil Jain Date: Wed, 27 May 2020 23:11:39 +0530 Subject: [PATCH 04/91] adding example of host_filters --- plugins/inventory/foreman.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/inventory/foreman.py b/plugins/inventory/foreman.py index 1e9a1077..3f84bba3 100644 --- a/plugins/inventory/foreman.py +++ b/plugins/inventory/foreman.py @@ -71,6 +71,7 @@ default: False host_filters: description: This can be used to restrict the list of returned host + type: string ''' EXAMPLES = ''' @@ -80,6 +81,7 @@ user: ansible-tester password: secure validate_certs: False +host_filters: 'organization="Web Engineering"' ''' from distutils.version import LooseVersion From 55af205fe353c0c3ca985b69ef72daa063d83133 Mon Sep 17 00:00:00 2001 From: Nikhil Jain Date: Tue, 2 Jun 2020 18:28:33 +0530 Subject: [PATCH 05/91] remove want_ansible_ssh_host as that can be done via compose --- plugins/inventory/foreman.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/plugins/inventory/foreman.py b/plugins/inventory/foreman.py index 3f84bba3..bda1c4a7 100644 --- a/plugins/inventory/foreman.py +++ b/plugins/inventory/foreman.py @@ -65,10 +65,6 @@ - Places hostvars in a dictionary with keys `foreman`, `foreman_facts`, and `foreman_params` type: boolean default: False - want_ansible_ssh_host: - description: Toggle, if true the plugin will populate the ansible_ssh_host variable to explicitly specify the connection target - type: boolean - default: False host_filters: description: This can be used to restrict the list of returned host type: string @@ -289,17 +285,6 @@ def _populate(self): except ValueError as e: self.display.warning("Could not create groups for host collections for %s, skipping: %s" % (host_name, to_text(e))) - # put ansible_ssh_host as hostvar - if self.get_option('want_ansible_ssh_host'): - for key in ('ip', 'ipv4', 'ipv6'): - if host.get(key): - try: - self.inventory.set_variable(host_name, 'ansible_ssh_host', host[key]) - break - except ValueError as e: - self.display.warning("Could not set hostvar ansible_ssh_host to '%s' for the '%s' host, skipping: %s" % - (host[key], host_name, to_text(e))) - strict = self.get_option('strict') hostvars = self.inventory.get_host(host_name).get_vars() From 147dab703d6068d06ffd8a6aec640f4e14948274 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Thu, 28 May 2020 10:18:05 +0200 Subject: [PATCH 06/91] don't fail recording new composite content view components --- plugins/modules/katello_content_view.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/modules/katello_content_view.py b/plugins/modules/katello_content_view.py index 1826c1e1..09eb40a5 100644 --- a/plugins/modules/katello_content_view.py +++ b/plugins/modules/katello_content_view.py @@ -254,7 +254,9 @@ def main(): } module.resource_action('content_view_components', 'remove_components', payload) - final_cvcs_record = [item for item in final_cvcs_record if item['id'] not in components_to_remove] + # some entries in "final" don't have an id yet, as it is only assigned on creation of a cv component, + # which didn't happen yet when we record the data + final_cvcs_record = [item for item in final_cvcs_record if item.get('id', 'NEW_ID') not in components_to_remove] module.record_after('content_views/components', {'composite_content_view_id': content_view_entity['id'], 'content_view_components': final_cvcs_record}) From 9da71e902483f8d036278faf3e604ceabf5c4a39 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 3 Jun 2020 09:04:40 +0200 Subject: [PATCH 07/91] release 0.8.1 --- galaxy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/galaxy.yml b/galaxy.yml index 6c87325a..206ea6a8 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -31,6 +31,7 @@ authors: - "Mark Hlawatschek " - "Markus Bucher " - "Matthias Dellweg <2500@gmx.de>" + - "Nikhil Jain " - "Olivier " - "Patrick Creech " - "Paul Armstrong " @@ -48,7 +49,7 @@ authors: - "metalcated " - "russianguppie <46544650+russianguppie@users.noreply.github.com>" - "willtome " -version: "0.8.0" +version: "0.8.1" license: - "GPL-3.0-or-later" tags: From f934580dd3865c335b44019feb22bda18503fb81 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 8 Jun 2020 10:10:07 +0200 Subject: [PATCH 08/91] correct the doc strings of redhat_manifest the module interacts with the Red Hat portal, not Foreman --- plugins/modules/redhat_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/modules/redhat_manifest.py b/plugins/modules/redhat_manifest.py index 193610ca..ae229c9a 100644 --- a/plugins/modules/redhat_manifest.py +++ b/plugins/modules/redhat_manifest.py @@ -42,12 +42,12 @@ type: str username: description: - - Username on Foreman server + - Red Hat Portal username required: true type: str password: description: - - Password for user accessing Foreman server + - Red Hat Portal password required: true type: str pool_id: From 7ff30c5206b7e3a98b45163a03fd0fcb480abf57 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 8 Jun 2020 09:57:15 +0200 Subject: [PATCH 09/91] drop "using Foreman API" from the docs --- plugins/modules/foreman_architecture.py | 4 ++-- plugins/modules/foreman_auth_source_ldap.py | 4 ++-- plugins/modules/foreman_compute_profile.py | 4 ++-- plugins/modules/foreman_compute_resource.py | 4 ++-- plugins/modules/foreman_config_group.py | 4 ++-- plugins/modules/foreman_domain.py | 4 ++-- plugins/modules/foreman_environment.py | 4 ++-- plugins/modules/foreman_hostgroup.py | 4 ++-- plugins/modules/foreman_image.py | 4 ++-- plugins/modules/foreman_installation_medium.py | 4 ++-- plugins/modules/foreman_role.py | 4 ++-- plugins/modules/foreman_scap_content.py | 4 ++-- plugins/modules/foreman_scap_tailoring_file.py | 4 ++-- plugins/modules/foreman_smart_class_parameter.py | 6 +++--- plugins/modules/foreman_subnet.py | 4 ++-- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/plugins/modules/foreman_architecture.py b/plugins/modules/foreman_architecture.py index ea734e66..02a2b78d 100644 --- a/plugins/modules/foreman_architecture.py +++ b/plugins/modules/foreman_architecture.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_architecture -short_description: Manage Foreman Architectures using Foreman API +short_description: Manage Foreman Architectures description: - - Create, Update and Delete Foreman Architectures using Foreman API + - Create, Update and Delete Foreman Architectures author: - "Manisha Singhal (@Manisha15) ATIX AG" options: diff --git a/plugins/modules/foreman_auth_source_ldap.py b/plugins/modules/foreman_auth_source_ldap.py index 4bfdd4ff..62502f5c 100644 --- a/plugins/modules/foreman_auth_source_ldap.py +++ b/plugins/modules/foreman_auth_source_ldap.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_auth_source_ldap -short_description: Manage Foreman LDAP authentication sources using Foreman API +short_description: Manage Foreman LDAP authentication sources description: - - Create and Delete Foreman LDAP authentication sources using Foreman API + - Create and Delete Foreman LDAP authentication sources author: - "Christoffer Reijer (@ephracis) Basalt AB" options: diff --git a/plugins/modules/foreman_compute_profile.py b/plugins/modules/foreman_compute_profile.py index bc7145ad..e2a4f65d 100644 --- a/plugins/modules/foreman_compute_profile.py +++ b/plugins/modules/foreman_compute_profile.py @@ -27,9 +27,9 @@ DOCUMENTATION = ''' --- module: foreman_compute_profile -short_description: Manage Foreman Compute Profiles using Foreman API +short_description: Manage Foreman Compute Profiles description: - - Create and delete Foreman Compute Profiles using Foreman API + - Create and delete Foreman Compute Profiles author: - "Philipp Joos (@philippj)" - "Baptiste Agasse (@bagasse)" diff --git a/plugins/modules/foreman_compute_resource.py b/plugins/modules/foreman_compute_resource.py index 0eaa63f0..77b22780 100644 --- a/plugins/modules/foreman_compute_resource.py +++ b/plugins/modules/foreman_compute_resource.py @@ -28,9 +28,9 @@ DOCUMENTATION = ''' --- module: foreman_compute_resource -short_description: Manage Foreman Compute resources using Foreman API +short_description: Manage Foreman Compute resources description: - - Create, update and delete Foreman Compute Resources using Foreman API + - Create, update and delete Foreman Compute Resources author: - "Philipp Joos (@philippj)" - "Baptiste Agasse (@bagasse)" diff --git a/plugins/modules/foreman_config_group.py b/plugins/modules/foreman_config_group.py index 20942d77..c42f1b9c 100644 --- a/plugins/modules/foreman_config_group.py +++ b/plugins/modules/foreman_config_group.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_config_group -short_description: Manage (Puppet) config groups using Foreman API +short_description: Manage (Puppet) config groups description: - - Create and Delete Foreman (Puppet) config groups using Foreman API + - Create and Delete Foreman (Puppet) config groups author: - "Baptiste Agasse (@bagasse)" options: diff --git a/plugins/modules/foreman_domain.py b/plugins/modules/foreman_domain.py index 2ce5d9f6..5d6f0761 100644 --- a/plugins/modules/foreman_domain.py +++ b/plugins/modules/foreman_domain.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_domain -short_description: Manage Foreman Domains using Foreman API +short_description: Manage Foreman Domains description: - - Create and Delete Foreman Domains using Foreman API + - Create and Delete Foreman Domains author: - "Markus Bucher (@m-bucher) ATIX AG" options: diff --git a/plugins/modules/foreman_environment.py b/plugins/modules/foreman_environment.py index a9c207f5..b08dc0b3 100644 --- a/plugins/modules/foreman_environment.py +++ b/plugins/modules/foreman_environment.py @@ -27,9 +27,9 @@ DOCUMENTATION = ''' --- module: foreman_environment -short_description: Manage Foreman Environment (Puppet) using Foreman API +short_description: Manage Foreman Environment (Puppet) description: - - Create and Delete Foreman Environment using Foreman API + - Create and Delete Foreman Environment author: - "Bernhard Suttner (@_sbernhard) ATIX AG" - "Christoffer Reijer (@ephracis) Basalt AB" diff --git a/plugins/modules/foreman_hostgroup.py b/plugins/modules/foreman_hostgroup.py index f9ac421f..09f70e1e 100644 --- a/plugins/modules/foreman_hostgroup.py +++ b/plugins/modules/foreman_hostgroup.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_hostgroup -short_description: Manage Foreman Hostgroups using Foreman API +short_description: Manage Foreman Hostgroups description: - - Create, Update and Delete Foreman Hostgroups using Foreman API + - Create, Update and Delete Foreman Hostgroups author: - "Manisha Singhal (@Manisha15) ATIX AG" - "Baptiste Agasse (@bagasse)" diff --git a/plugins/modules/foreman_image.py b/plugins/modules/foreman_image.py index 488ddd26..5c227448 100644 --- a/plugins/modules/foreman_image.py +++ b/plugins/modules/foreman_image.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_image -short_description: Manage Foreman Images using Foreman API +short_description: Manage Foreman Images description: - - Create and Delete Foreman Images using Foreman API + - Create and Delete Foreman Images author: - "Mark Hlawatschek (@hlawatschek) ATIX AG" options: diff --git a/plugins/modules/foreman_installation_medium.py b/plugins/modules/foreman_installation_medium.py index 08993ac0..c13f5174 100644 --- a/plugins/modules/foreman_installation_medium.py +++ b/plugins/modules/foreman_installation_medium.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_installation_medium -short_description: Manage Foreman Installation Medium using Foreman API +short_description: Manage Foreman Installation Medium description: - - Create and Delete Foreman Installation Medium using Foreman API + - Create and Delete Foreman Installation Medium author: - "Manuel Bonk(@manuelbonk) ATIX AG" options: diff --git a/plugins/modules/foreman_role.py b/plugins/modules/foreman_role.py index 3d551a77..29579d20 100644 --- a/plugins/modules/foreman_role.py +++ b/plugins/modules/foreman_role.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_role -short_description: Manage Foreman Roles using Foreman API +short_description: Manage Foreman Roles description: - - Create and Delete Foreman Roles using Foreman API + - Create and Delete Foreman Roles author: - "Christoffer Reijer (@ephracis) Basalt AB" options: diff --git a/plugins/modules/foreman_scap_content.py b/plugins/modules/foreman_scap_content.py index 5d4dc4b9..f84f09ce 100644 --- a/plugins/modules/foreman_scap_content.py +++ b/plugins/modules/foreman_scap_content.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_scap_content -short_description: Manage Foreman SCAP content using Foreman API. +short_description: Manage Foreman SCAP content. description: - - Create, Update and Delete Foreman SCAP content using Foreman API. + - Create, Update and Delete Foreman SCAP content. author: - "Jameer Pathan (@jameerpathan111)" options: diff --git a/plugins/modules/foreman_scap_tailoring_file.py b/plugins/modules/foreman_scap_tailoring_file.py index bec8dc9e..1f0d5905 100644 --- a/plugins/modules/foreman_scap_tailoring_file.py +++ b/plugins/modules/foreman_scap_tailoring_file.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_scap_tailoring_file -short_description: Manage Foreman SCAP tailoring files using Foreman API. +short_description: Manage Foreman SCAP tailoring files. description: - - Create, Update and Delete Foreman SCAP tailoring files using Foreman API. + - Create, Update and Delete Foreman SCAP tailoring files. author: - "Evgeni Golov (@evgeni)" options: diff --git a/plugins/modules/foreman_smart_class_parameter.py b/plugins/modules/foreman_smart_class_parameter.py index 784944e6..27d14cb5 100644 --- a/plugins/modules/foreman_smart_class_parameter.py +++ b/plugins/modules/foreman_smart_class_parameter.py @@ -26,10 +26,10 @@ DOCUMENTATION = ''' --- module: foreman_smart_class_parameter -short_description: Manage Foreman Smart Class Parameters using Foreman API +short_description: Manage Foreman Smart Class Parameters description: - - Update Foreman Smart Class Parameters using Foreman API. Smart Class Paramters are created/deleted at on puppet classes import - - and cannot be created or deleted via Foreman API. + - Update Foreman Smart Class Parameters. + - Smart Class Paramters are created/deleted at on Puppet classes import and cannot be created or deleted. author: - "Baptiste Agasse (@bagasse)" options: diff --git a/plugins/modules/foreman_subnet.py b/plugins/modules/foreman_subnet.py index b407e64c..be9fefbe 100644 --- a/plugins/modules/foreman_subnet.py +++ b/plugins/modules/foreman_subnet.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_subnet -short_description: Manage Foreman Subnets using Foreman API +short_description: Manage Foreman Subnets description: - - Create and Delete Foreman Subnets using Foreman API + - Create and Delete Foreman Subnets author: - "Baptiste Agasse (@bagasse)" requirements: From dcbc73f8be375dd8690e59cab3623e5baee908d0 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 8 Jun 2020 10:02:54 +0200 Subject: [PATCH 10/91] unify "Create, update and delete" wording --- plugins/modules/foreman_architecture.py | 2 +- plugins/modules/foreman_auth_source_ldap.py | 2 +- plugins/modules/foreman_compute_profile.py | 2 +- plugins/modules/foreman_config_group.py | 2 +- plugins/modules/foreman_domain.py | 2 +- plugins/modules/foreman_environment.py | 2 +- plugins/modules/foreman_external_usergroup.py | 2 +- plugins/modules/foreman_hostgroup.py | 2 +- plugins/modules/foreman_image.py | 2 +- plugins/modules/foreman_installation_medium.py | 2 +- plugins/modules/foreman_role.py | 2 +- plugins/modules/foreman_scap_content.py | 2 +- plugins/modules/foreman_scap_tailoring_file.py | 2 +- plugins/modules/foreman_subnet.py | 2 +- plugins/modules/foreman_user.py | 2 +- plugins/modules/foreman_usergroup.py | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/plugins/modules/foreman_architecture.py b/plugins/modules/foreman_architecture.py index 02a2b78d..7c6fcc98 100644 --- a/plugins/modules/foreman_architecture.py +++ b/plugins/modules/foreman_architecture.py @@ -28,7 +28,7 @@ module: foreman_architecture short_description: Manage Foreman Architectures description: - - Create, Update and Delete Foreman Architectures + - Create, update and delete Foreman Architectures author: - "Manisha Singhal (@Manisha15) ATIX AG" options: diff --git a/plugins/modules/foreman_auth_source_ldap.py b/plugins/modules/foreman_auth_source_ldap.py index 62502f5c..eef8384c 100644 --- a/plugins/modules/foreman_auth_source_ldap.py +++ b/plugins/modules/foreman_auth_source_ldap.py @@ -28,7 +28,7 @@ module: foreman_auth_source_ldap short_description: Manage Foreman LDAP authentication sources description: - - Create and Delete Foreman LDAP authentication sources + - Create, update and delete Foreman LDAP authentication sources author: - "Christoffer Reijer (@ephracis) Basalt AB" options: diff --git a/plugins/modules/foreman_compute_profile.py b/plugins/modules/foreman_compute_profile.py index e2a4f65d..1728d9bb 100644 --- a/plugins/modules/foreman_compute_profile.py +++ b/plugins/modules/foreman_compute_profile.py @@ -29,7 +29,7 @@ module: foreman_compute_profile short_description: Manage Foreman Compute Profiles description: - - Create and delete Foreman Compute Profiles + - Create, update and delete Foreman Compute Profiles author: - "Philipp Joos (@philippj)" - "Baptiste Agasse (@bagasse)" diff --git a/plugins/modules/foreman_config_group.py b/plugins/modules/foreman_config_group.py index c42f1b9c..de9d5e96 100644 --- a/plugins/modules/foreman_config_group.py +++ b/plugins/modules/foreman_config_group.py @@ -28,7 +28,7 @@ module: foreman_config_group short_description: Manage (Puppet) config groups description: - - Create and Delete Foreman (Puppet) config groups + - Create, update and delete Foreman (Puppet) config groups author: - "Baptiste Agasse (@bagasse)" options: diff --git a/plugins/modules/foreman_domain.py b/plugins/modules/foreman_domain.py index 5d6f0761..46d88b96 100644 --- a/plugins/modules/foreman_domain.py +++ b/plugins/modules/foreman_domain.py @@ -28,7 +28,7 @@ module: foreman_domain short_description: Manage Foreman Domains description: - - Create and Delete Foreman Domains + - Create, update and delete Foreman Domains author: - "Markus Bucher (@m-bucher) ATIX AG" options: diff --git a/plugins/modules/foreman_environment.py b/plugins/modules/foreman_environment.py index b08dc0b3..9e3d619c 100644 --- a/plugins/modules/foreman_environment.py +++ b/plugins/modules/foreman_environment.py @@ -29,7 +29,7 @@ module: foreman_environment short_description: Manage Foreman Environment (Puppet) description: - - Create and Delete Foreman Environment + - Create, update and delete Foreman Environment author: - "Bernhard Suttner (@_sbernhard) ATIX AG" - "Christoffer Reijer (@ephracis) Basalt AB" diff --git a/plugins/modules/foreman_external_usergroup.py b/plugins/modules/foreman_external_usergroup.py index a6b8fd46..246ded63 100644 --- a/plugins/modules/foreman_external_usergroup.py +++ b/plugins/modules/foreman_external_usergroup.py @@ -28,7 +28,7 @@ module: foreman_external_usergroup short_description: Manage external user groups in Foreman description: - - Create and delete external user groups in Foreman + - Create, update and delete external user groups in Foreman author: - "Kirill Shirinkin (@Fodoj)" options: diff --git a/plugins/modules/foreman_hostgroup.py b/plugins/modules/foreman_hostgroup.py index 09f70e1e..b6a81c06 100644 --- a/plugins/modules/foreman_hostgroup.py +++ b/plugins/modules/foreman_hostgroup.py @@ -28,7 +28,7 @@ module: foreman_hostgroup short_description: Manage Foreman Hostgroups description: - - Create, Update and Delete Foreman Hostgroups + - Create, update and delete Foreman Hostgroups author: - "Manisha Singhal (@Manisha15) ATIX AG" - "Baptiste Agasse (@bagasse)" diff --git a/plugins/modules/foreman_image.py b/plugins/modules/foreman_image.py index 5c227448..b74ce2ff 100644 --- a/plugins/modules/foreman_image.py +++ b/plugins/modules/foreman_image.py @@ -28,7 +28,7 @@ module: foreman_image short_description: Manage Foreman Images description: - - Create and Delete Foreman Images + - Create, update and delete Foreman Images author: - "Mark Hlawatschek (@hlawatschek) ATIX AG" options: diff --git a/plugins/modules/foreman_installation_medium.py b/plugins/modules/foreman_installation_medium.py index c13f5174..7481e31f 100644 --- a/plugins/modules/foreman_installation_medium.py +++ b/plugins/modules/foreman_installation_medium.py @@ -28,7 +28,7 @@ module: foreman_installation_medium short_description: Manage Foreman Installation Medium description: - - Create and Delete Foreman Installation Medium + - Create, update and delete Foreman Installation Medium author: - "Manuel Bonk(@manuelbonk) ATIX AG" options: diff --git a/plugins/modules/foreman_role.py b/plugins/modules/foreman_role.py index 29579d20..61aa75c2 100644 --- a/plugins/modules/foreman_role.py +++ b/plugins/modules/foreman_role.py @@ -28,7 +28,7 @@ module: foreman_role short_description: Manage Foreman Roles description: - - Create and Delete Foreman Roles + - Create, update and delete Foreman Roles author: - "Christoffer Reijer (@ephracis) Basalt AB" options: diff --git a/plugins/modules/foreman_scap_content.py b/plugins/modules/foreman_scap_content.py index f84f09ce..45c180c8 100644 --- a/plugins/modules/foreman_scap_content.py +++ b/plugins/modules/foreman_scap_content.py @@ -28,7 +28,7 @@ module: foreman_scap_content short_description: Manage Foreman SCAP content. description: - - Create, Update and Delete Foreman SCAP content. + - Create, update and delete Foreman SCAP content. author: - "Jameer Pathan (@jameerpathan111)" options: diff --git a/plugins/modules/foreman_scap_tailoring_file.py b/plugins/modules/foreman_scap_tailoring_file.py index 1f0d5905..0ad33285 100644 --- a/plugins/modules/foreman_scap_tailoring_file.py +++ b/plugins/modules/foreman_scap_tailoring_file.py @@ -28,7 +28,7 @@ module: foreman_scap_tailoring_file short_description: Manage Foreman SCAP tailoring files. description: - - Create, Update and Delete Foreman SCAP tailoring files. + - Create, update and delete Foreman SCAP tailoring files. author: - "Evgeni Golov (@evgeni)" options: diff --git a/plugins/modules/foreman_subnet.py b/plugins/modules/foreman_subnet.py index be9fefbe..0bfb19e8 100644 --- a/plugins/modules/foreman_subnet.py +++ b/plugins/modules/foreman_subnet.py @@ -28,7 +28,7 @@ module: foreman_subnet short_description: Manage Foreman Subnets description: - - Create and Delete Foreman Subnets + - Create, update and delete Foreman Subnets author: - "Baptiste Agasse (@bagasse)" requirements: diff --git a/plugins/modules/foreman_user.py b/plugins/modules/foreman_user.py index e6ff9e5a..e6e19a16 100644 --- a/plugins/modules/foreman_user.py +++ b/plugins/modules/foreman_user.py @@ -28,7 +28,7 @@ module: foreman_user short_description: Manage Foreman Users description: - - Create and delete users in Foreman + - Create, update and delete users in Foreman author: - "Christoffer Reijer (@ephracis) Basalt AB" options: diff --git a/plugins/modules/foreman_usergroup.py b/plugins/modules/foreman_usergroup.py index 4df243a7..dab85646 100644 --- a/plugins/modules/foreman_usergroup.py +++ b/plugins/modules/foreman_usergroup.py @@ -28,7 +28,7 @@ module: foreman_usergroup short_description: Manage Foreman User groups description: - - Create and delete user groups in Foreman + - Create, update and delete user groups in Foreman author: - "Baptiste Agasse (@bagasse)" options: From 99de5db5830323342070c20b26bfbf95fc4ba83e Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 8 Jun 2020 10:05:21 +0200 Subject: [PATCH 11/91] drop "Foreman" from create/update/delete line --- plugins/modules/foreman_architecture.py | 2 +- plugins/modules/foreman_auth_source_ldap.py | 2 +- plugins/modules/foreman_compute_profile.py | 2 +- plugins/modules/foreman_compute_resource.py | 2 +- plugins/modules/foreman_config_group.py | 2 +- plugins/modules/foreman_domain.py | 2 +- plugins/modules/foreman_environment.py | 2 +- plugins/modules/foreman_external_usergroup.py | 2 +- plugins/modules/foreman_hostgroup.py | 2 +- plugins/modules/foreman_image.py | 2 +- plugins/modules/foreman_installation_medium.py | 2 +- plugins/modules/foreman_role.py | 2 +- plugins/modules/foreman_scap_content.py | 2 +- plugins/modules/foreman_scap_tailoring_file.py | 2 +- plugins/modules/foreman_subnet.py | 2 +- plugins/modules/foreman_user.py | 2 +- plugins/modules/foreman_usergroup.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/plugins/modules/foreman_architecture.py b/plugins/modules/foreman_architecture.py index 7c6fcc98..3f15e593 100644 --- a/plugins/modules/foreman_architecture.py +++ b/plugins/modules/foreman_architecture.py @@ -28,7 +28,7 @@ module: foreman_architecture short_description: Manage Foreman Architectures description: - - Create, update and delete Foreman Architectures + - Create, update and delete Architectures author: - "Manisha Singhal (@Manisha15) ATIX AG" options: diff --git a/plugins/modules/foreman_auth_source_ldap.py b/plugins/modules/foreman_auth_source_ldap.py index eef8384c..4e41ea13 100644 --- a/plugins/modules/foreman_auth_source_ldap.py +++ b/plugins/modules/foreman_auth_source_ldap.py @@ -28,7 +28,7 @@ module: foreman_auth_source_ldap short_description: Manage Foreman LDAP authentication sources description: - - Create, update and delete Foreman LDAP authentication sources + - Create, update and delete LDAP authentication sources author: - "Christoffer Reijer (@ephracis) Basalt AB" options: diff --git a/plugins/modules/foreman_compute_profile.py b/plugins/modules/foreman_compute_profile.py index 1728d9bb..453cfc11 100644 --- a/plugins/modules/foreman_compute_profile.py +++ b/plugins/modules/foreman_compute_profile.py @@ -29,7 +29,7 @@ module: foreman_compute_profile short_description: Manage Foreman Compute Profiles description: - - Create, update and delete Foreman Compute Profiles + - Create, update and delete Compute Profiles author: - "Philipp Joos (@philippj)" - "Baptiste Agasse (@bagasse)" diff --git a/plugins/modules/foreman_compute_resource.py b/plugins/modules/foreman_compute_resource.py index 77b22780..142ebff3 100644 --- a/plugins/modules/foreman_compute_resource.py +++ b/plugins/modules/foreman_compute_resource.py @@ -30,7 +30,7 @@ module: foreman_compute_resource short_description: Manage Foreman Compute resources description: - - Create, update and delete Foreman Compute Resources + - Create, update and delete Compute Resources author: - "Philipp Joos (@philippj)" - "Baptiste Agasse (@bagasse)" diff --git a/plugins/modules/foreman_config_group.py b/plugins/modules/foreman_config_group.py index de9d5e96..a594dee9 100644 --- a/plugins/modules/foreman_config_group.py +++ b/plugins/modules/foreman_config_group.py @@ -28,7 +28,7 @@ module: foreman_config_group short_description: Manage (Puppet) config groups description: - - Create, update and delete Foreman (Puppet) config groups + - Create, update and delete (Puppet) config groups author: - "Baptiste Agasse (@bagasse)" options: diff --git a/plugins/modules/foreman_domain.py b/plugins/modules/foreman_domain.py index 46d88b96..306ded73 100644 --- a/plugins/modules/foreman_domain.py +++ b/plugins/modules/foreman_domain.py @@ -28,7 +28,7 @@ module: foreman_domain short_description: Manage Foreman Domains description: - - Create, update and delete Foreman Domains + - Create, update and delete Domains author: - "Markus Bucher (@m-bucher) ATIX AG" options: diff --git a/plugins/modules/foreman_environment.py b/plugins/modules/foreman_environment.py index 9e3d619c..642746d2 100644 --- a/plugins/modules/foreman_environment.py +++ b/plugins/modules/foreman_environment.py @@ -29,7 +29,7 @@ module: foreman_environment short_description: Manage Foreman Environment (Puppet) description: - - Create, update and delete Foreman Environment + - Create, update and delete Environment author: - "Bernhard Suttner (@_sbernhard) ATIX AG" - "Christoffer Reijer (@ephracis) Basalt AB" diff --git a/plugins/modules/foreman_external_usergroup.py b/plugins/modules/foreman_external_usergroup.py index 246ded63..37ec5e22 100644 --- a/plugins/modules/foreman_external_usergroup.py +++ b/plugins/modules/foreman_external_usergroup.py @@ -28,7 +28,7 @@ module: foreman_external_usergroup short_description: Manage external user groups in Foreman description: - - Create, update and delete external user groups in Foreman + - Create, update and delete external user groups author: - "Kirill Shirinkin (@Fodoj)" options: diff --git a/plugins/modules/foreman_hostgroup.py b/plugins/modules/foreman_hostgroup.py index b6a81c06..ebc2bc9a 100644 --- a/plugins/modules/foreman_hostgroup.py +++ b/plugins/modules/foreman_hostgroup.py @@ -28,7 +28,7 @@ module: foreman_hostgroup short_description: Manage Foreman Hostgroups description: - - Create, update and delete Foreman Hostgroups + - Create, update and delete Hostgroups author: - "Manisha Singhal (@Manisha15) ATIX AG" - "Baptiste Agasse (@bagasse)" diff --git a/plugins/modules/foreman_image.py b/plugins/modules/foreman_image.py index b74ce2ff..182f3459 100644 --- a/plugins/modules/foreman_image.py +++ b/plugins/modules/foreman_image.py @@ -28,7 +28,7 @@ module: foreman_image short_description: Manage Foreman Images description: - - Create, update and delete Foreman Images + - Create, update and delete Images author: - "Mark Hlawatschek (@hlawatschek) ATIX AG" options: diff --git a/plugins/modules/foreman_installation_medium.py b/plugins/modules/foreman_installation_medium.py index 7481e31f..253b3cd3 100644 --- a/plugins/modules/foreman_installation_medium.py +++ b/plugins/modules/foreman_installation_medium.py @@ -28,7 +28,7 @@ module: foreman_installation_medium short_description: Manage Foreman Installation Medium description: - - Create, update and delete Foreman Installation Medium + - Create, update and delete Installation Medium author: - "Manuel Bonk(@manuelbonk) ATIX AG" options: diff --git a/plugins/modules/foreman_role.py b/plugins/modules/foreman_role.py index 61aa75c2..53f32b31 100644 --- a/plugins/modules/foreman_role.py +++ b/plugins/modules/foreman_role.py @@ -28,7 +28,7 @@ module: foreman_role short_description: Manage Foreman Roles description: - - Create, update and delete Foreman Roles + - Create, update and delete Roles author: - "Christoffer Reijer (@ephracis) Basalt AB" options: diff --git a/plugins/modules/foreman_scap_content.py b/plugins/modules/foreman_scap_content.py index 45c180c8..dac5f57b 100644 --- a/plugins/modules/foreman_scap_content.py +++ b/plugins/modules/foreman_scap_content.py @@ -28,7 +28,7 @@ module: foreman_scap_content short_description: Manage Foreman SCAP content. description: - - Create, update and delete Foreman SCAP content. + - Create, update and delete SCAP content. author: - "Jameer Pathan (@jameerpathan111)" options: diff --git a/plugins/modules/foreman_scap_tailoring_file.py b/plugins/modules/foreman_scap_tailoring_file.py index 0ad33285..35605efe 100644 --- a/plugins/modules/foreman_scap_tailoring_file.py +++ b/plugins/modules/foreman_scap_tailoring_file.py @@ -28,7 +28,7 @@ module: foreman_scap_tailoring_file short_description: Manage Foreman SCAP tailoring files. description: - - Create, update and delete Foreman SCAP tailoring files. + - Create, update and delete SCAP tailoring files. author: - "Evgeni Golov (@evgeni)" options: diff --git a/plugins/modules/foreman_subnet.py b/plugins/modules/foreman_subnet.py index 0bfb19e8..168596fa 100644 --- a/plugins/modules/foreman_subnet.py +++ b/plugins/modules/foreman_subnet.py @@ -28,7 +28,7 @@ module: foreman_subnet short_description: Manage Foreman Subnets description: - - Create, update and delete Foreman Subnets + - Create, update and delete Subnets author: - "Baptiste Agasse (@bagasse)" requirements: diff --git a/plugins/modules/foreman_user.py b/plugins/modules/foreman_user.py index e6e19a16..8250e5c8 100644 --- a/plugins/modules/foreman_user.py +++ b/plugins/modules/foreman_user.py @@ -28,7 +28,7 @@ module: foreman_user short_description: Manage Foreman Users description: - - Create, update and delete users in Foreman + - Create, update and delete users author: - "Christoffer Reijer (@ephracis) Basalt AB" options: diff --git a/plugins/modules/foreman_usergroup.py b/plugins/modules/foreman_usergroup.py index dab85646..88462418 100644 --- a/plugins/modules/foreman_usergroup.py +++ b/plugins/modules/foreman_usergroup.py @@ -28,7 +28,7 @@ module: foreman_usergroup short_description: Manage Foreman User groups description: - - Create, update and delete user groups in Foreman + - Create, update and delete user groups author: - "Baptiste Agasse (@bagasse)" options: From 72ebcb7a6ba04a41b7ed67888527510a4bb85f95 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 8 Jun 2020 10:07:34 +0200 Subject: [PATCH 12/91] drop Foreman from "manage" lines --- plugins/modules/foreman_architecture.py | 2 +- plugins/modules/foreman_auth_source_ldap.py | 2 +- plugins/modules/foreman_bookmark.py | 4 ++-- plugins/modules/foreman_compute_attribute.py | 4 ++-- plugins/modules/foreman_compute_profile.py | 2 +- plugins/modules/foreman_compute_resource.py | 2 +- plugins/modules/foreman_domain.py | 2 +- plugins/modules/foreman_environment.py | 2 +- plugins/modules/foreman_external_usergroup.py | 2 +- plugins/modules/foreman_global_parameter.py | 4 ++-- plugins/modules/foreman_host.py | 4 ++-- plugins/modules/foreman_host_power.py | 2 +- plugins/modules/foreman_hostgroup.py | 2 +- plugins/modules/foreman_image.py | 2 +- plugins/modules/foreman_installation_medium.py | 2 +- plugins/modules/foreman_job_template.py | 2 +- plugins/modules/foreman_location.py | 4 ++-- plugins/modules/foreman_model.py | 4 ++-- plugins/modules/foreman_operatingsystem.py | 4 ++-- plugins/modules/foreman_organization.py | 4 ++-- plugins/modules/foreman_os_default_template.py | 4 ++-- plugins/modules/foreman_provisioning_template.py | 2 +- plugins/modules/foreman_ptable.py | 2 +- plugins/modules/foreman_realm.py | 4 ++-- plugins/modules/foreman_role.py | 2 +- plugins/modules/foreman_scap_content.py | 2 +- plugins/modules/foreman_scap_tailoring_file.py | 2 +- plugins/modules/foreman_scc_account.py | 4 ++-- plugins/modules/foreman_scc_product.py | 2 +- plugins/modules/foreman_setting.py | 4 ++-- plugins/modules/foreman_smart_class_parameter.py | 2 +- plugins/modules/foreman_snapshot.py | 4 ++-- plugins/modules/foreman_subnet.py | 2 +- plugins/modules/foreman_user.py | 2 +- plugins/modules/foreman_usergroup.py | 2 +- 35 files changed, 48 insertions(+), 48 deletions(-) diff --git a/plugins/modules/foreman_architecture.py b/plugins/modules/foreman_architecture.py index 3f15e593..b024d13b 100644 --- a/plugins/modules/foreman_architecture.py +++ b/plugins/modules/foreman_architecture.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_architecture -short_description: Manage Foreman Architectures +short_description: Manage Architectures description: - Create, update and delete Architectures author: diff --git a/plugins/modules/foreman_auth_source_ldap.py b/plugins/modules/foreman_auth_source_ldap.py index 4e41ea13..913b83c6 100644 --- a/plugins/modules/foreman_auth_source_ldap.py +++ b/plugins/modules/foreman_auth_source_ldap.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_auth_source_ldap -short_description: Manage Foreman LDAP authentication sources +short_description: Manage LDAP authentication sources description: - Create, update and delete LDAP authentication sources author: diff --git a/plugins/modules/foreman_bookmark.py b/plugins/modules/foreman_bookmark.py index 18122e83..e78c20c5 100644 --- a/plugins/modules/foreman_bookmark.py +++ b/plugins/modules/foreman_bookmark.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_bookmark -short_description: Manage Foreman Bookmarks +short_description: Manage Bookmarks description: - - "Manage Foreman Bookmark Entities" + - "Manage Bookmark Entities" author: - "Bernhard Hopfenmueller (@Fobhep) ATIX AG" - "Christoffer Reijer (@ephracis) Basalt AB" diff --git a/plugins/modules/foreman_compute_attribute.py b/plugins/modules/foreman_compute_attribute.py index fd77c8d8..4866d289 100644 --- a/plugins/modules/foreman_compute_attribute.py +++ b/plugins/modules/foreman_compute_attribute.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_compute_attribute -short_description: Manage Foreman Compute Attributes +short_description: Manage Compute Attributes description: - - "Manage Foreman Compute Attributes" + - "Manage Compute Attributes" - "This beta version can create, and update compute attributes" author: - "Manisha Singhal (@Manisha15) ATIX AG" diff --git a/plugins/modules/foreman_compute_profile.py b/plugins/modules/foreman_compute_profile.py index 453cfc11..202db03c 100644 --- a/plugins/modules/foreman_compute_profile.py +++ b/plugins/modules/foreman_compute_profile.py @@ -27,7 +27,7 @@ DOCUMENTATION = ''' --- module: foreman_compute_profile -short_description: Manage Foreman Compute Profiles +short_description: Manage Compute Profiles description: - Create, update and delete Compute Profiles author: diff --git a/plugins/modules/foreman_compute_resource.py b/plugins/modules/foreman_compute_resource.py index 142ebff3..9f3b4499 100644 --- a/plugins/modules/foreman_compute_resource.py +++ b/plugins/modules/foreman_compute_resource.py @@ -28,7 +28,7 @@ DOCUMENTATION = ''' --- module: foreman_compute_resource -short_description: Manage Foreman Compute resources +short_description: Manage Compute resources description: - Create, update and delete Compute Resources author: diff --git a/plugins/modules/foreman_domain.py b/plugins/modules/foreman_domain.py index 306ded73..d1476413 100644 --- a/plugins/modules/foreman_domain.py +++ b/plugins/modules/foreman_domain.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_domain -short_description: Manage Foreman Domains +short_description: Manage Domains description: - Create, update and delete Domains author: diff --git a/plugins/modules/foreman_environment.py b/plugins/modules/foreman_environment.py index 642746d2..869ee350 100644 --- a/plugins/modules/foreman_environment.py +++ b/plugins/modules/foreman_environment.py @@ -27,7 +27,7 @@ DOCUMENTATION = ''' --- module: foreman_environment -short_description: Manage Foreman Environment (Puppet) +short_description: Manage Environment (Puppet) description: - Create, update and delete Environment author: diff --git a/plugins/modules/foreman_external_usergroup.py b/plugins/modules/foreman_external_usergroup.py index 37ec5e22..290257a7 100644 --- a/plugins/modules/foreman_external_usergroup.py +++ b/plugins/modules/foreman_external_usergroup.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_external_usergroup -short_description: Manage external user groups in Foreman +short_description: Manage external user groups description: - Create, update and delete external user groups author: diff --git a/plugins/modules/foreman_global_parameter.py b/plugins/modules/foreman_global_parameter.py index af7b43c5..df5e8085 100644 --- a/plugins/modules/foreman_global_parameter.py +++ b/plugins/modules/foreman_global_parameter.py @@ -27,9 +27,9 @@ DOCUMENTATION = ''' --- module: foreman_global_parameter -short_description: Manage Foreman Global Parameters +short_description: Manage Global Parameters description: - - "Manage Foreman Global Parameter Entities" + - "Manage Global Parameter Entities" author: - "Bernhard Hopfenmueller (@Fobhep) ATIX AG" - "Matthias Dellweg (@mdellweg) ATIX AG" diff --git a/plugins/modules/foreman_host.py b/plugins/modules/foreman_host.py index 71c878b8..52960ed3 100644 --- a/plugins/modules/foreman_host.py +++ b/plugins/modules/foreman_host.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_host -short_description: Manage Foreman hosts +short_description: Manage hosts description: - - "Manage Foreman host Entities" + - "Manage host Entities" - "This beta version can create and delete hosts from preexisting host groups" author: - "Bernhard Hopfenmueller (@Fobhep) ATIX AG" diff --git a/plugins/modules/foreman_host_power.py b/plugins/modules/foreman_host_power.py index 00bc9656..8f4b10a7 100644 --- a/plugins/modules/foreman_host_power.py +++ b/plugins/modules/foreman_host_power.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_host_power -short_description: Manage Foreman hosts power state +short_description: Manage hosts power state description: - "Manage power state of Foreman host" - "This beta version can start and stop an existing foreman host and question the current power state." diff --git a/plugins/modules/foreman_hostgroup.py b/plugins/modules/foreman_hostgroup.py index ebc2bc9a..12694600 100644 --- a/plugins/modules/foreman_hostgroup.py +++ b/plugins/modules/foreman_hostgroup.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_hostgroup -short_description: Manage Foreman Hostgroups +short_description: Manage Hostgroups description: - Create, update and delete Hostgroups author: diff --git a/plugins/modules/foreman_image.py b/plugins/modules/foreman_image.py index 182f3459..fc4c3764 100644 --- a/plugins/modules/foreman_image.py +++ b/plugins/modules/foreman_image.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_image -short_description: Manage Foreman Images +short_description: Manage Images description: - Create, update and delete Images author: diff --git a/plugins/modules/foreman_installation_medium.py b/plugins/modules/foreman_installation_medium.py index 253b3cd3..8f33512a 100644 --- a/plugins/modules/foreman_installation_medium.py +++ b/plugins/modules/foreman_installation_medium.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_installation_medium -short_description: Manage Foreman Installation Medium +short_description: Manage Installation Medium description: - Create, update and delete Installation Medium author: diff --git a/plugins/modules/foreman_job_template.py b/plugins/modules/foreman_job_template.py index f4b656bc..da709f6b 100644 --- a/plugins/modules/foreman_job_template.py +++ b/plugins/modules/foreman_job_template.py @@ -28,7 +28,7 @@ module: foreman_job_template short_description: Manage Job Templates in Foreman description: - - "Manage Foreman Remote Execution Job Templates" + - "Manage Remote Execution Job Templates" author: - "Manuel Bonk (@manuelbonk) ATIX AG" - "Matthias Dellweg (@mdellweg) ATIX AG" diff --git a/plugins/modules/foreman_location.py b/plugins/modules/foreman_location.py index e9e21766..36b7ecce 100644 --- a/plugins/modules/foreman_location.py +++ b/plugins/modules/foreman_location.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_location -short_description: Manage Foreman Location +short_description: Manage Location description: - - Manage Foreman Location + - Manage Location author: - "Matthias M Dellweg (@mdellweg) ATIX AG" options: diff --git a/plugins/modules/foreman_model.py b/plugins/modules/foreman_model.py index 5dba6b74..fd6dfc18 100644 --- a/plugins/modules/foreman_model.py +++ b/plugins/modules/foreman_model.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_model -short_description: Manage Foreman hardware models +short_description: Manage hardware models description: - - Manage Foreman hardware models + - Manage hardware models author: - "Evgeni Golov (@evgeni)" options: diff --git a/plugins/modules/foreman_operatingsystem.py b/plugins/modules/foreman_operatingsystem.py index 71f7c003..e7ccba91 100644 --- a/plugins/modules/foreman_operatingsystem.py +++ b/plugins/modules/foreman_operatingsystem.py @@ -27,9 +27,9 @@ DOCUMENTATION = ''' --- module: foreman_operatingsystem -short_description: Manage Foreman Operating Systems +short_description: Manage Operating Systems description: - - "Manage Foreman Operating System Entities" + - "Manage Operating System Entities" author: - "Matthias M Dellweg (@mdellweg) ATIX AG" - "Bernhard Hopfenmüller (@Fobhep) ATIX AG" diff --git a/plugins/modules/foreman_organization.py b/plugins/modules/foreman_organization.py index f8962da4..f965a621 100644 --- a/plugins/modules/foreman_organization.py +++ b/plugins/modules/foreman_organization.py @@ -27,9 +27,9 @@ DOCUMENTATION = ''' --- module: foreman_organization -short_description: Manage Foreman Organization +short_description: Manage Organization description: - - Manage Foreman Organization + - Manage Organization author: - "Eric D Helms (@ehelms)" - "Matthias M Dellweg (@mdellweg) ATIX AG" diff --git a/plugins/modules/foreman_os_default_template.py b/plugins/modules/foreman_os_default_template.py index f7d78e51..3db6aa7f 100644 --- a/plugins/modules/foreman_os_default_template.py +++ b/plugins/modules/foreman_os_default_template.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_os_default_template -short_description: Manage Foreman Default Template Associations To Operating Systems +short_description: Manage Default Template Associations To Operating Systems description: - - "Manage Foreman OSDefaultTemplate Entities" + - "Manage OSDefaultTemplate Entities" author: - "Matthias M Dellweg (@mdellweg) ATIX AG" options: diff --git a/plugins/modules/foreman_provisioning_template.py b/plugins/modules/foreman_provisioning_template.py index 41a6ff39..ccd50284 100644 --- a/plugins/modules/foreman_provisioning_template.py +++ b/plugins/modules/foreman_provisioning_template.py @@ -28,7 +28,7 @@ module: foreman_provisioning_template short_description: Manage Provisioning Template in Foreman description: - - "Manage Foreman Provisioning Template" + - "Manage Provisioning Template" author: - "Bernhard Hopfenmueller (@Fobhep) ATIX AG" - "Matthias Dellweg (@mdellweg) ATIX AG" diff --git a/plugins/modules/foreman_ptable.py b/plugins/modules/foreman_ptable.py index 51b87981..9ebdf589 100644 --- a/plugins/modules/foreman_ptable.py +++ b/plugins/modules/foreman_ptable.py @@ -28,7 +28,7 @@ module: foreman_ptable short_description: Manage Partition Table Template in Foreman description: - - "Manage Foreman Partition Table" + - "Manage Partition Table" author: - "Bernhard Hopfenmueller (@Fobhep) ATIX AG" - "Matthias Dellweg (@mdellweg) ATIX AG" diff --git a/plugins/modules/foreman_realm.py b/plugins/modules/foreman_realm.py index d9706cfe..b37627e8 100644 --- a/plugins/modules/foreman_realm.py +++ b/plugins/modules/foreman_realm.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_realm -short_description: Manage Foreman Realms +short_description: Manage Realms description: - - Manage Foreman Realms + - Manage Realms author: - "Lester R Claudio (@claudiol1)" options: diff --git a/plugins/modules/foreman_role.py b/plugins/modules/foreman_role.py index 53f32b31..b98a1ec1 100644 --- a/plugins/modules/foreman_role.py +++ b/plugins/modules/foreman_role.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_role -short_description: Manage Foreman Roles +short_description: Manage Roles description: - Create, update and delete Roles author: diff --git a/plugins/modules/foreman_scap_content.py b/plugins/modules/foreman_scap_content.py index dac5f57b..abb62d94 100644 --- a/plugins/modules/foreman_scap_content.py +++ b/plugins/modules/foreman_scap_content.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_scap_content -short_description: Manage Foreman SCAP content. +short_description: Manage SCAP content. description: - Create, update and delete SCAP content. author: diff --git a/plugins/modules/foreman_scap_tailoring_file.py b/plugins/modules/foreman_scap_tailoring_file.py index 35605efe..902df332 100644 --- a/plugins/modules/foreman_scap_tailoring_file.py +++ b/plugins/modules/foreman_scap_tailoring_file.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_scap_tailoring_file -short_description: Manage Foreman SCAP tailoring files. +short_description: Manage SCAP tailoring files. description: - Create, update and delete SCAP tailoring files. author: diff --git a/plugins/modules/foreman_scc_account.py b/plugins/modules/foreman_scc_account.py index 4220b478..545fe7b8 100644 --- a/plugins/modules/foreman_scc_account.py +++ b/plugins/modules/foreman_scc_account.py @@ -27,9 +27,9 @@ DOCUMENTATION = ''' --- module: foreman_scc_account -short_description: Manage Foreman SccAccount +short_description: Manage SccAccount description: - - "Manage Foreman Suse Customer Center Account Entities" + - "Manage Suse Customer Center Account Entities" - "This module requires the foreman_scc_manager plugin set up in the server" - "See: U(https://github.com/ATIX-AG/foreman_scc_manager)" author: diff --git a/plugins/modules/foreman_scc_product.py b/plugins/modules/foreman_scc_product.py index 8c93907d..84b2e626 100644 --- a/plugins/modules/foreman_scc_product.py +++ b/plugins/modules/foreman_scc_product.py @@ -29,7 +29,7 @@ module: foreman_scc_product short_description: Subscribe Foreman Suse Customer Center Account Product description: - - "Manage Foreman Suse Customer Center Product Entities" + - "Manage Suse Customer Center Product Entities" - "This module requires the foreman_scc_manager plugin set up in the server" - "See: U(https://github.com/ATIX-AG/foreman_scc_manager)" author: diff --git a/plugins/modules/foreman_setting.py b/plugins/modules/foreman_setting.py index 8da1058e..6debd5b6 100644 --- a/plugins/modules/foreman_setting.py +++ b/plugins/modules/foreman_setting.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_setting -short_description: Manage Foreman Settings +short_description: Manage Settings description: - - "Manage Foreman Setting Entities" + - "Manage Setting Entities" author: - "Matthias M Dellweg (@mdellweg) ATIX AG" options: diff --git a/plugins/modules/foreman_smart_class_parameter.py b/plugins/modules/foreman_smart_class_parameter.py index 27d14cb5..a839e185 100644 --- a/plugins/modules/foreman_smart_class_parameter.py +++ b/plugins/modules/foreman_smart_class_parameter.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_smart_class_parameter -short_description: Manage Foreman Smart Class Parameters +short_description: Manage Smart Class Parameters description: - Update Foreman Smart Class Parameters. - Smart Class Paramters are created/deleted at on Puppet classes import and cannot be created or deleted. diff --git a/plugins/modules/foreman_snapshot.py b/plugins/modules/foreman_snapshot.py index ad7e1734..f9a05b04 100644 --- a/plugins/modules/foreman_snapshot.py +++ b/plugins/modules/foreman_snapshot.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: foreman_snapshot -short_description: Manage Foreman Snapshots +short_description: Manage Snapshots description: - - "Manage Foreman Snapshots for Host Entities" + - "Manage Snapshots for Host Entities" - "This module can create, update, revert and delete snapshots" - "This module requires the foreman_snapshot_management plugin set up in the server" - "See: U(https://github.com/ATIX-AG/foreman_snapshot_management)" diff --git a/plugins/modules/foreman_subnet.py b/plugins/modules/foreman_subnet.py index 168596fa..1929de51 100644 --- a/plugins/modules/foreman_subnet.py +++ b/plugins/modules/foreman_subnet.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_subnet -short_description: Manage Foreman Subnets +short_description: Manage Subnets description: - Create, update and delete Subnets author: diff --git a/plugins/modules/foreman_user.py b/plugins/modules/foreman_user.py index 8250e5c8..f165df09 100644 --- a/plugins/modules/foreman_user.py +++ b/plugins/modules/foreman_user.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_user -short_description: Manage Foreman Users +short_description: Manage Users description: - Create, update and delete users author: diff --git a/plugins/modules/foreman_usergroup.py b/plugins/modules/foreman_usergroup.py index 88462418..f9b25fb6 100644 --- a/plugins/modules/foreman_usergroup.py +++ b/plugins/modules/foreman_usergroup.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_usergroup -short_description: Manage Foreman User groups +short_description: Manage User groups description: - Create, update and delete user groups author: From ef0abaf9e555937ec11014fca16cab7f3ebac52c Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 8 Jun 2020 11:59:50 +0200 Subject: [PATCH 13/91] drop "Foreman" from descriptions --- plugins/modules/foreman_host.py | 2 +- plugins/modules/foreman_host_power.py | 2 +- plugins/modules/foreman_location.py | 2 +- plugins/modules/foreman_model.py | 2 +- plugins/modules/foreman_organization.py | 6 +++--- plugins/modules/foreman_realm.py | 2 +- plugins/modules/foreman_scc_product.py | 2 +- plugins/modules/foreman_search_facts.py | 4 ++-- plugins/modules/foreman_smart_class_parameter.py | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/plugins/modules/foreman_host.py b/plugins/modules/foreman_host.py index 52960ed3..4f20dc0f 100644 --- a/plugins/modules/foreman_host.py +++ b/plugins/modules/foreman_host.py @@ -60,7 +60,7 @@ required: false enabled: description: - - Include this host within Foreman reporting + - Include this host within reporting type: bool required: false managed: diff --git a/plugins/modules/foreman_host_power.py b/plugins/modules/foreman_host_power.py index 8f4b10a7..8b7ef409 100644 --- a/plugins/modules/foreman_host_power.py +++ b/plugins/modules/foreman_host_power.py @@ -28,7 +28,7 @@ module: foreman_host_power short_description: Manage hosts power state description: - - "Manage power state of Foreman host" + - "Manage power state of a host" - "This beta version can start and stop an existing foreman host and question the current power state." author: - "Bernhard Hopfenmueller (@Fobhep) ATIX AG" diff --git a/plugins/modules/foreman_location.py b/plugins/modules/foreman_location.py index 36b7ecce..cbfd2228 100644 --- a/plugins/modules/foreman_location.py +++ b/plugins/modules/foreman_location.py @@ -34,7 +34,7 @@ options: name: description: - - Name or Title of the Foreman Location + - Name of the Location required: true type: str parent: diff --git a/plugins/modules/foreman_model.py b/plugins/modules/foreman_model.py index fd6dfc18..0cbd9d69 100644 --- a/plugins/modules/foreman_model.py +++ b/plugins/modules/foreman_model.py @@ -34,7 +34,7 @@ options: name: description: - - Name of the Foreman hardware model + - Name of the hardware model required: true type: str info: diff --git a/plugins/modules/foreman_organization.py b/plugins/modules/foreman_organization.py index f965a621..c27855a2 100644 --- a/plugins/modules/foreman_organization.py +++ b/plugins/modules/foreman_organization.py @@ -36,17 +36,17 @@ options: name: description: - - Name of the Foreman organization + - Name of the Organization required: true type: str description: description: - - Description of the Foreman organization + - Description of the Organization required: false type: str label: description: - - Label of the Foreman organization + - Label of the Organization type: str extends_documentation_fragment: - foreman diff --git a/plugins/modules/foreman_realm.py b/plugins/modules/foreman_realm.py index b37627e8..62a750ab 100644 --- a/plugins/modules/foreman_realm.py +++ b/plugins/modules/foreman_realm.py @@ -34,7 +34,7 @@ options: name: description: - - Name of the Foreman realm + - Name of the realm required: true type: str realm_proxy: diff --git a/plugins/modules/foreman_scc_product.py b/plugins/modules/foreman_scc_product.py index 84b2e626..643d4a23 100644 --- a/plugins/modules/foreman_scc_product.py +++ b/plugins/modules/foreman_scc_product.py @@ -27,7 +27,7 @@ DOCUMENTATION = ''' --- module: foreman_scc_product -short_description: Subscribe Foreman Suse Customer Center Account Product +short_description: Subscribe Suse Customer Center Account Product description: - "Manage Suse Customer Center Product Entities" - "This module requires the foreman_scc_manager plugin set up in the server" diff --git a/plugins/modules/foreman_search_facts.py b/plugins/modules/foreman_search_facts.py index 64955d25..c1e9b463 100644 --- a/plugins/modules/foreman_search_facts.py +++ b/plugins/modules/foreman_search_facts.py @@ -27,9 +27,9 @@ DOCUMENTATION = ''' --- module: foreman_search_facts -short_description: Gather facts about Foreman resources +short_description: Gather facts about resources description: - - "Gather facts about Foreman resources" + - "Gather facts about resources" author: - "Sean O'Keeffe (@sean797)" options: diff --git a/plugins/modules/foreman_smart_class_parameter.py b/plugins/modules/foreman_smart_class_parameter.py index a839e185..328b801a 100644 --- a/plugins/modules/foreman_smart_class_parameter.py +++ b/plugins/modules/foreman_smart_class_parameter.py @@ -28,7 +28,7 @@ module: foreman_smart_class_parameter short_description: Manage Smart Class Parameters description: - - Update Foreman Smart Class Parameters. + - Update Smart Class Parameters. - Smart Class Paramters are created/deleted at on Puppet classes import and cannot be created or deleted. author: - "Baptiste Agasse (@bagasse)" @@ -55,7 +55,7 @@ type: bool omit: description: - - Foreman will not send this parameter in classification output. + - Don't send this parameter in classification output. - Puppet will use the value defined in the Puppet manifest for this parameter. type: bool override_value_order: @@ -110,7 +110,7 @@ description: Override value, required if omit is false type: raw omit: - description: Foreman will not send this parameter in classification output, replaces use_puppet_default. + description: Don't send this parameter in classification output, replaces use_puppet_default. type: bool state: description: State of the entity. From 04250c6fe5ccdf7735e0c0c80aa78a002242c36e Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 8 Jun 2020 12:10:28 +0200 Subject: [PATCH 14/91] improve template docs --- plugins/modules/foreman_job_template.py | 13 ++++--------- plugins/modules/foreman_provisioning_template.py | 12 ++++-------- plugins/modules/foreman_ptable.py | 13 ++++--------- 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/plugins/modules/foreman_job_template.py b/plugins/modules/foreman_job_template.py index da709f6b..e7f4e288 100644 --- a/plugins/modules/foreman_job_template.py +++ b/plugins/modules/foreman_job_template.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_job_template -short_description: Manage Job Templates in Foreman +short_description: Manage Job Templates description: - "Manage Remote Execution Job Templates" author: @@ -59,14 +59,9 @@ type: bool name: description: - - | - The name a template should be assigned with in Foreman. - name must be provided. - Possible sources are, ordererd by preference: - The "name" parameter, config header (inline or in a file), - basename of a file. - The special name "*" (only possible as parameter) is used - to perform bulk actions (modify, delete) on all existing Job Templates. + - The name of the Job Template. + - If omited, will be determined from the C(name) header of the template or the filename (in that order). + - The special value "*" can be used to perform bulk actions (modify, delete) on all existing templates. type: str provider_type: description: diff --git a/plugins/modules/foreman_provisioning_template.py b/plugins/modules/foreman_provisioning_template.py index ccd50284..e4083696 100644 --- a/plugins/modules/foreman_provisioning_template.py +++ b/plugins/modules/foreman_provisioning_template.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_provisioning_template -short_description: Manage Provisioning Template in Foreman +short_description: Manage Provisioning Template description: - "Manage Provisioning Template" author: @@ -79,13 +79,9 @@ type: bool name: description: - - | - The name a template should be assigned with in Foreman. - A name must be provided. - Possible sources are, ordererd by preference: - The "name" parameter, config header (inline or in a file), basename of a file. - The special name "*" (only possible as parameter) is used - to perform bulk actions (modify, delete) on all existing templates. + - The name of the Provisioning Template. + - If omited, will be determined from the C(name) header of the template or the filename (in that order). + - The special value "*" can be used to perform bulk actions (modify, delete) on all existing templates. required: false type: str updated_name: diff --git a/plugins/modules/foreman_ptable.py b/plugins/modules/foreman_ptable.py index 9ebdf589..2aa754c6 100644 --- a/plugins/modules/foreman_ptable.py +++ b/plugins/modules/foreman_ptable.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- module: foreman_ptable -short_description: Manage Partition Table Template in Foreman +short_description: Manage Partition Table Template description: - "Manage Partition Table" author: @@ -55,14 +55,9 @@ type: bool name: description: - - | - The name a template should be assigned with in Foreman. - A name must be provided. - Possible sources are, ordererd by preference: - The "name" parameter, config header (inline or in a file), - basename of a file. - The special name "*" (only possible as parameter) is used - to perform bulk actions (modify, delete) on all existing partition tables. + - The name of the Partition Table. + - If omited, will be determined from the C(name) header of the template or the filename (in that order). + - The special value "*" can be used to perform bulk actions (modify, delete) on all existing Partition Tables. required: false type: str updated_name: From 9312405ac12a2606b31cd2f045261ee4d2de6f17 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 8 Jun 2020 12:18:25 +0200 Subject: [PATCH 15/91] Katello doc cleanup --- plugins/modules/katello_activation_key.py | 8 ++++---- plugins/modules/katello_content_credential.py | 4 ++-- plugins/modules/katello_content_view.py | 6 +++--- plugins/modules/katello_content_view_filter.py | 4 ++-- plugins/modules/katello_content_view_version.py | 4 ++-- plugins/modules/katello_lifecycle_environment.py | 4 ++-- plugins/modules/katello_manifest.py | 4 ++-- plugins/modules/katello_product.py | 6 +++--- plugins/modules/katello_repository.py | 4 ++-- plugins/modules/katello_repository_set.py | 4 ++-- plugins/modules/katello_sync.py | 4 ++-- plugins/modules/katello_sync_plan.py | 8 ++++---- plugins/modules/katello_upload.py | 4 ++-- 13 files changed, 32 insertions(+), 32 deletions(-) diff --git a/plugins/modules/katello_activation_key.py b/plugins/modules/katello_activation_key.py index 9daa7c7b..2abe12f6 100644 --- a/plugins/modules/katello_activation_key.py +++ b/plugins/modules/katello_activation_key.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: katello_activation_key -short_description: Create and Manage Katello activation keys +short_description: Create and manage activation keys description: - - Create and Manage Katello activation keys + - Create and manage activation keys author: "Andrew Kofink (@akofink)" options: name: @@ -148,12 +148,12 @@ ''' EXAMPLES = ''' -- name: "Create katello client activation key" +- name: "Create client activation key" katello_activation_key: username: "admin" password: "changeme" server_url: "https://foreman.example.com" - name: "Katello Clients" + name: "Clients" organization: "Default Organization" lifecycle_environment: "Library" content_view: 'client content view' diff --git a/plugins/modules/katello_content_credential.py b/plugins/modules/katello_content_credential.py index 45aa23dc..e2808c24 100644 --- a/plugins/modules/katello_content_credential.py +++ b/plugins/modules/katello_content_credential.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: katello_content_credential -short_description: Create and Manage Katello content credentials +short_description: Create and manage content credentials description: - - Create and Manage Katello content credentials + - Create and manage content credentials author: "Baptiste Agasse (@bagasse)" options: name: diff --git a/plugins/modules/katello_content_view.py b/plugins/modules/katello_content_view.py index 09eb40a5..05480169 100644 --- a/plugins/modules/katello_content_view.py +++ b/plugins/modules/katello_content_view.py @@ -26,14 +26,14 @@ DOCUMENTATION = ''' --- module: katello_content_view -short_description: Create and Manage Katello content views +short_description: Create and manage content views description: - - Create and Manage Katello content views + - Create and manage content views author: "Eric D Helms (@ehelms)" options: name: description: - - Name of the Katello Content View + - Name of the Content View required: true type: str description: diff --git a/plugins/modules/katello_content_view_filter.py b/plugins/modules/katello_content_view_filter.py index c4091ce6..59a1f604 100644 --- a/plugins/modules/katello_content_view_filter.py +++ b/plugins/modules/katello_content_view_filter.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: katello_content_view_filter -short_description: Create and Manage Katello content View filters +short_description: Create and manage content View filters description: - - Create and Manage Katello content View filters + - Create and manage content View filters author: "Sean O'Keeffe (@sean797)" options: architecture: diff --git a/plugins/modules/katello_content_view_version.py b/plugins/modules/katello_content_view_version.py index 2b53ce58..def773bd 100644 --- a/plugins/modules/katello_content_view_version.py +++ b/plugins/modules/katello_content_view_version.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: katello_content_view_version -short_description: Create, remove or interact with a Katello Content View Version +short_description: Create, remove or interact with a Content View Version description: - - Publish, Promote or Remove a Katello Content View Version + - Publish, Promote or Remove a Content View Version author: Sean O'Keeffe (@sean797) notes: - You cannot use this to remove a Content View Version from a Lifecycle environment, you should promote another version first. diff --git a/plugins/modules/katello_lifecycle_environment.py b/plugins/modules/katello_lifecycle_environment.py index 25484fb0..15a07b25 100644 --- a/plugins/modules/katello_lifecycle_environment.py +++ b/plugins/modules/katello_lifecycle_environment.py @@ -27,9 +27,9 @@ DOCUMENTATION = ''' --- module: katello_lifecycle_environment -short_description: Create and Manage Katello lifecycle environments +short_description: Create and manage lifecycle environments description: - - Create and Manage Katello lifecycle environments + - Create and manage lifecycle environments author: - "Andrew Kofink (@akofink)" - "Baptiste Agasse (@bagasse)" diff --git a/plugins/modules/katello_manifest.py b/plugins/modules/katello_manifest.py index 14a12b2e..bd4b5c60 100644 --- a/plugins/modules/katello_manifest.py +++ b/plugins/modules/katello_manifest.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: katello_manifest -short_description: Manage Katello manifests +short_description: Manage manifests description: - - Upload and Manage Katello manifests + - Upload and manage manifests author: "Andrew Kofink (@akofink)" options: manifest_path: diff --git a/plugins/modules/katello_product.py b/plugins/modules/katello_product.py index c7dc0428..53f2d1ef 100644 --- a/plugins/modules/katello_product.py +++ b/plugins/modules/katello_product.py @@ -26,16 +26,16 @@ DOCUMENTATION = ''' --- module: katello_product -short_description: Create and Manage Katello products +short_description: Create and manage products description: - - Create and Manage Katello products + - Create and manage products author: - "Eric D Helms (@ehelms)" - "Matthias Dellweg (@mdellweg) ATIX AG" options: name: description: - - Name of the Katello product + - Name of the product required: true type: str label: diff --git a/plugins/modules/katello_repository.py b/plugins/modules/katello_repository.py index 904efc2c..4e12cd85 100644 --- a/plugins/modules/katello_repository.py +++ b/plugins/modules/katello_repository.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: katello_repository -short_description: Create and manage Katello repository +short_description: Create and manage repositories description: - - Crate and manage a Katello repository + - Crate and manage repositories author: "Eric D Helms (@ehelms)" options: name: diff --git a/plugins/modules/katello_repository_set.py b/plugins/modules/katello_repository_set.py index a39300c1..743433f6 100644 --- a/plugins/modules/katello_repository_set.py +++ b/plugins/modules/katello_repository_set.py @@ -26,9 +26,9 @@ DOCUMENTATION = ''' --- module: katello_repository_set -short_description: Enable/disable repositories in Katello repository sets +short_description: Enable/disable repositories in repository sets description: - - Enable/disable repositories in Katello repository sets + - Enable/disable repositories in repository sets author: "Andrew Kofink (@akofink)" options: name: diff --git a/plugins/modules/katello_sync.py b/plugins/modules/katello_sync.py index 3dbcee91..68011500 100644 --- a/plugins/modules/katello_sync.py +++ b/plugins/modules/katello_sync.py @@ -27,9 +27,9 @@ DOCUMENTATION = ''' --- module: katello_sync -short_description: Sync a Katello repository or product +short_description: Sync a repository or product description: - - Sync a Katello repository or product + - Sync a repository or product author: - "Eric D Helms (@ehelms)" - "Matthias M Dellweg (@mdellweg) ATIX AG" diff --git a/plugins/modules/katello_sync_plan.py b/plugins/modules/katello_sync_plan.py index d9c07c1a..a59009b2 100644 --- a/plugins/modules/katello_sync_plan.py +++ b/plugins/modules/katello_sync_plan.py @@ -27,21 +27,21 @@ DOCUMENTATION = ''' --- module: katello_sync_plan -short_description: Manage Katello sync plans +short_description: Manage sync plans description: - - Manage Katello sync plans + - Manage sync plans author: - "Andrew Kofink (@akofink)" - "Matthis Dellweg (@mdellweg) ATIX-AG" options: name: description: - - Name of the Katello sync plan + - Name of the sync plan required: true type: str description: description: - - Description of the Katello sync plan + - Description of the sync plan type: str interval: description: diff --git a/plugins/modules/katello_upload.py b/plugins/modules/katello_upload.py index ea3e678c..37fc294b 100644 --- a/plugins/modules/katello_upload.py +++ b/plugins/modules/katello_upload.py @@ -27,9 +27,9 @@ DOCUMENTATION = ''' --- module: katello_upload -short_description: Upload content to Katello +short_description: Upload content description: - - Allows the upload of content to a Katello repository + - Allows the upload of content to a repository author: "Eric D Helms (@ehelms)" requirements: - python-debian (For deb Package upload) From fd23b566f33c377be782ba803b38f663b711fe19 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 8 Jun 2020 12:41:24 +0200 Subject: [PATCH 16/91] update ansible-doc test after Foreman drop --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8666b265..a535e810 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ tests/test_playbooks/vars/server.yml: dist-test: $(MANIFEST) ANSIBLE_COLLECTIONS_PATHS=build/collections ansible -m $(NAMESPACE).$(NAME).foreman_organization -a "username=admin password=changeme server_url=https://foreman.example.test name=collectiontest" localhost | grep -q "Failed to connect to Foreman server" - ANSIBLE_COLLECTIONS_PATHS=build/collections ansible-doc $(NAMESPACE).$(NAME).foreman_organization | grep -q "Manage Foreman Organization" + ANSIBLE_COLLECTIONS_PATHS=build/collections ansible-doc $(NAMESPACE).$(NAME).foreman_organization | grep -q "Manage Organization" $(MANIFEST): $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz ansible-galaxy collection install -p build/collections $< --force From 624b513fd4c814cb293869a00fa3eb01c950d54b Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 8 Jun 2020 13:52:15 +0200 Subject: [PATCH 17/91] improve smart class docs Co-authored-by: William Bradford Clark --- plugins/modules/foreman_smart_class_parameter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/foreman_smart_class_parameter.py b/plugins/modules/foreman_smart_class_parameter.py index 328b801a..a72ee91c 100644 --- a/plugins/modules/foreman_smart_class_parameter.py +++ b/plugins/modules/foreman_smart_class_parameter.py @@ -29,7 +29,7 @@ short_description: Manage Smart Class Parameters description: - Update Smart Class Parameters. - - Smart Class Paramters are created/deleted at on Puppet classes import and cannot be created or deleted. + - Smart Class Parameters are created/deleted for Puppet classes during import and cannot be created or deleted otherwise. author: - "Baptiste Agasse (@bagasse)" options: From 77b832848156d4486055c3e80caada03343cd343 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 8 Jun 2020 14:30:47 +0200 Subject: [PATCH 18/91] oxford comma --- plugins/modules/foreman_architecture.py | 2 +- plugins/modules/foreman_auth_source_ldap.py | 2 +- plugins/modules/foreman_compute_profile.py | 2 +- plugins/modules/foreman_compute_resource.py | 2 +- plugins/modules/foreman_config_group.py | 2 +- plugins/modules/foreman_domain.py | 2 +- plugins/modules/foreman_environment.py | 2 +- plugins/modules/foreman_external_usergroup.py | 2 +- plugins/modules/foreman_hostgroup.py | 2 +- plugins/modules/foreman_image.py | 2 +- plugins/modules/foreman_installation_medium.py | 2 +- plugins/modules/foreman_role.py | 2 +- plugins/modules/foreman_scap_content.py | 2 +- plugins/modules/foreman_scap_tailoring_file.py | 2 +- plugins/modules/foreman_subnet.py | 2 +- plugins/modules/foreman_user.py | 2 +- plugins/modules/foreman_usergroup.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/plugins/modules/foreman_architecture.py b/plugins/modules/foreman_architecture.py index b024d13b..b3821203 100644 --- a/plugins/modules/foreman_architecture.py +++ b/plugins/modules/foreman_architecture.py @@ -28,7 +28,7 @@ module: foreman_architecture short_description: Manage Architectures description: - - Create, update and delete Architectures + - Create, update, and delete Architectures author: - "Manisha Singhal (@Manisha15) ATIX AG" options: diff --git a/plugins/modules/foreman_auth_source_ldap.py b/plugins/modules/foreman_auth_source_ldap.py index 913b83c6..45377a3b 100644 --- a/plugins/modules/foreman_auth_source_ldap.py +++ b/plugins/modules/foreman_auth_source_ldap.py @@ -28,7 +28,7 @@ module: foreman_auth_source_ldap short_description: Manage LDAP authentication sources description: - - Create, update and delete LDAP authentication sources + - Create, update, and delete LDAP authentication sources author: - "Christoffer Reijer (@ephracis) Basalt AB" options: diff --git a/plugins/modules/foreman_compute_profile.py b/plugins/modules/foreman_compute_profile.py index 202db03c..57dbe44b 100644 --- a/plugins/modules/foreman_compute_profile.py +++ b/plugins/modules/foreman_compute_profile.py @@ -29,7 +29,7 @@ module: foreman_compute_profile short_description: Manage Compute Profiles description: - - Create, update and delete Compute Profiles + - Create, update, and delete Compute Profiles author: - "Philipp Joos (@philippj)" - "Baptiste Agasse (@bagasse)" diff --git a/plugins/modules/foreman_compute_resource.py b/plugins/modules/foreman_compute_resource.py index 9f3b4499..f5a730ae 100644 --- a/plugins/modules/foreman_compute_resource.py +++ b/plugins/modules/foreman_compute_resource.py @@ -30,7 +30,7 @@ module: foreman_compute_resource short_description: Manage Compute resources description: - - Create, update and delete Compute Resources + - Create, update, and delete Compute Resources author: - "Philipp Joos (@philippj)" - "Baptiste Agasse (@bagasse)" diff --git a/plugins/modules/foreman_config_group.py b/plugins/modules/foreman_config_group.py index a594dee9..f7f8cbb9 100644 --- a/plugins/modules/foreman_config_group.py +++ b/plugins/modules/foreman_config_group.py @@ -28,7 +28,7 @@ module: foreman_config_group short_description: Manage (Puppet) config groups description: - - Create, update and delete (Puppet) config groups + - Create, update, and delete (Puppet) config groups author: - "Baptiste Agasse (@bagasse)" options: diff --git a/plugins/modules/foreman_domain.py b/plugins/modules/foreman_domain.py index d1476413..7e33035c 100644 --- a/plugins/modules/foreman_domain.py +++ b/plugins/modules/foreman_domain.py @@ -28,7 +28,7 @@ module: foreman_domain short_description: Manage Domains description: - - Create, update and delete Domains + - Create, update, and delete Domains author: - "Markus Bucher (@m-bucher) ATIX AG" options: diff --git a/plugins/modules/foreman_environment.py b/plugins/modules/foreman_environment.py index 869ee350..5b4dbea3 100644 --- a/plugins/modules/foreman_environment.py +++ b/plugins/modules/foreman_environment.py @@ -29,7 +29,7 @@ module: foreman_environment short_description: Manage Environment (Puppet) description: - - Create, update and delete Environment + - Create, update, and delete Environment author: - "Bernhard Suttner (@_sbernhard) ATIX AG" - "Christoffer Reijer (@ephracis) Basalt AB" diff --git a/plugins/modules/foreman_external_usergroup.py b/plugins/modules/foreman_external_usergroup.py index 290257a7..fc245fd6 100644 --- a/plugins/modules/foreman_external_usergroup.py +++ b/plugins/modules/foreman_external_usergroup.py @@ -28,7 +28,7 @@ module: foreman_external_usergroup short_description: Manage external user groups description: - - Create, update and delete external user groups + - Create, update, and delete external user groups author: - "Kirill Shirinkin (@Fodoj)" options: diff --git a/plugins/modules/foreman_hostgroup.py b/plugins/modules/foreman_hostgroup.py index 12694600..4b4f3a19 100644 --- a/plugins/modules/foreman_hostgroup.py +++ b/plugins/modules/foreman_hostgroup.py @@ -28,7 +28,7 @@ module: foreman_hostgroup short_description: Manage Hostgroups description: - - Create, update and delete Hostgroups + - Create, update, and delete Hostgroups author: - "Manisha Singhal (@Manisha15) ATIX AG" - "Baptiste Agasse (@bagasse)" diff --git a/plugins/modules/foreman_image.py b/plugins/modules/foreman_image.py index fc4c3764..594f0a9b 100644 --- a/plugins/modules/foreman_image.py +++ b/plugins/modules/foreman_image.py @@ -28,7 +28,7 @@ module: foreman_image short_description: Manage Images description: - - Create, update and delete Images + - Create, update, and delete Images author: - "Mark Hlawatschek (@hlawatschek) ATIX AG" options: diff --git a/plugins/modules/foreman_installation_medium.py b/plugins/modules/foreman_installation_medium.py index 8f33512a..efd4cd8c 100644 --- a/plugins/modules/foreman_installation_medium.py +++ b/plugins/modules/foreman_installation_medium.py @@ -28,7 +28,7 @@ module: foreman_installation_medium short_description: Manage Installation Medium description: - - Create, update and delete Installation Medium + - Create, update, and delete Installation Medium author: - "Manuel Bonk(@manuelbonk) ATIX AG" options: diff --git a/plugins/modules/foreman_role.py b/plugins/modules/foreman_role.py index b98a1ec1..2721fc38 100644 --- a/plugins/modules/foreman_role.py +++ b/plugins/modules/foreman_role.py @@ -28,7 +28,7 @@ module: foreman_role short_description: Manage Roles description: - - Create, update and delete Roles + - Create, update, and delete Roles author: - "Christoffer Reijer (@ephracis) Basalt AB" options: diff --git a/plugins/modules/foreman_scap_content.py b/plugins/modules/foreman_scap_content.py index abb62d94..b8b3ad46 100644 --- a/plugins/modules/foreman_scap_content.py +++ b/plugins/modules/foreman_scap_content.py @@ -28,7 +28,7 @@ module: foreman_scap_content short_description: Manage SCAP content. description: - - Create, update and delete SCAP content. + - Create, update, and delete SCAP content. author: - "Jameer Pathan (@jameerpathan111)" options: diff --git a/plugins/modules/foreman_scap_tailoring_file.py b/plugins/modules/foreman_scap_tailoring_file.py index 902df332..b70360ac 100644 --- a/plugins/modules/foreman_scap_tailoring_file.py +++ b/plugins/modules/foreman_scap_tailoring_file.py @@ -28,7 +28,7 @@ module: foreman_scap_tailoring_file short_description: Manage SCAP tailoring files. description: - - Create, update and delete SCAP tailoring files. + - Create, update, and delete SCAP tailoring files. author: - "Evgeni Golov (@evgeni)" options: diff --git a/plugins/modules/foreman_subnet.py b/plugins/modules/foreman_subnet.py index 1929de51..13d9f6cd 100644 --- a/plugins/modules/foreman_subnet.py +++ b/plugins/modules/foreman_subnet.py @@ -28,7 +28,7 @@ module: foreman_subnet short_description: Manage Subnets description: - - Create, update and delete Subnets + - Create, update, and delete Subnets author: - "Baptiste Agasse (@bagasse)" requirements: diff --git a/plugins/modules/foreman_user.py b/plugins/modules/foreman_user.py index f165df09..e19dc2ca 100644 --- a/plugins/modules/foreman_user.py +++ b/plugins/modules/foreman_user.py @@ -28,7 +28,7 @@ module: foreman_user short_description: Manage Users description: - - Create, update and delete users + - Create, update, and delete users author: - "Christoffer Reijer (@ephracis) Basalt AB" options: diff --git a/plugins/modules/foreman_usergroup.py b/plugins/modules/foreman_usergroup.py index f9b25fb6..a6f73435 100644 --- a/plugins/modules/foreman_usergroup.py +++ b/plugins/modules/foreman_usergroup.py @@ -28,7 +28,7 @@ module: foreman_usergroup short_description: Manage User groups description: - - Create, update and delete user groups + - Create, update, and delete user groups author: - "Baptiste Agasse (@bagasse)" options: From fa2d10a9e6f70090fa3fc83e92468fb4ccb0e76c Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Tue, 9 Jun 2020 12:59:24 +0200 Subject: [PATCH 19/91] drop deprecated verify_ssl Fixes: #830 --- plugins/doc_fragments/foreman.py | 1 - plugins/module_utils/foreman_helper.py | 5 +---- tests/test_playbooks/tasks/katello_manifest.yml | 2 +- tests/test_playbooks/tasks/setting_fact.yml | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/plugins/doc_fragments/foreman.py b/plugins/doc_fragments/foreman.py index 59bfc7ae..4c54a019 100644 --- a/plugins/doc_fragments/foreman.py +++ b/plugins/doc_fragments/foreman.py @@ -38,7 +38,6 @@ class ModuleDocFragment(object): required: true type: str validate_certs: - aliases: [ verify_ssl ] description: Whether or not to verify the TLS certificates of the Foreman server default: true type: bool diff --git a/plugins/module_utils/foreman_helper.py b/plugins/module_utils/foreman_helper.py index be2629a9..ac972f09 100644 --- a/plugins/module_utils/foreman_helper.py +++ b/plugins/module_utils/foreman_helper.py @@ -268,7 +268,7 @@ def __init__(self, **kwargs): server_url=dict(required=True), username=dict(required=True), password=dict(required=True, no_log=True), - validate_certs=dict(type='bool', default=True, aliases=['verify_ssl']), + validate_certs=dict(type='bool', default=True), ) argument_spec.update(gen_args) argument_spec.update(kwargs.pop('argument_spec', {})) @@ -278,9 +278,6 @@ def __init__(self, **kwargs): super(ForemanAnsibleModule, self).__init__(argument_spec=argument_spec, supports_check_mode=supports_check_mode, **kwargs) - if 'verify_ssl' in self.params: - self.warn("Please use 'validate_certs' instead of deprecated 'verify_ssl'.") - aliases = {alias for arg in argument_spec.values() for alias in arg.get('aliases', [])} self.foreman_params = {k: v for (k, v) in self.params.items() if v is not None and k not in aliases} diff --git a/tests/test_playbooks/tasks/katello_manifest.yml b/tests/test_playbooks/tasks/katello_manifest.yml index 52479f81..f0f137f1 100644 --- a/tests/test_playbooks/tasks/katello_manifest.yml +++ b/tests/test_playbooks/tasks/katello_manifest.yml @@ -7,7 +7,7 @@ username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" - verify_ssl: "{{ foreman_validate_certs }}" + validate_certs: "{{ foreman_validate_certs }}" organization: "{{ organization_name }}" manifest_path: "{{ manifest_path | default(omit) }}" repository_url: "{{ manifest_repository_url | default(omit) }}" diff --git a/tests/test_playbooks/tasks/setting_fact.yml b/tests/test_playbooks/tasks/setting_fact.yml index cdb87cf2..746a9515 100644 --- a/tests/test_playbooks/tasks/setting_fact.yml +++ b/tests/test_playbooks/tasks/setting_fact.yml @@ -4,7 +4,7 @@ username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" - verify_ssl: "{{ foreman_validate_certs }}" + validate_certs: "{{ foreman_validate_certs }}" resource: 'settings' search: "{{ setting_name | default(omit) }}" register: result From c4e486c2b4cec407ea6f6f4262cf1d37544d127b Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 10 Jun 2020 12:21:30 +0200 Subject: [PATCH 20/91] pull in the right sanity requirements the files got renamed --- requirements-dev.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 8911f481..cacb21e9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,4 +8,5 @@ rpm-py-installer docker git+https://github.com/Apipie/apypie.git@master#egg=apypie -r requirements-common.txt --r https://github.com/ansible/ansible/raw/devel/test/lib/ansible_test/_data/requirements/sanity.txt +-r https://github.com/ansible/ansible/raw/devel/test/lib/ansible_test/_data/requirements/sanity.pylint.txt +-r https://github.com/ansible/ansible/raw/devel/test/lib/ansible_test/_data/requirements/sanity.validate-modules.txt From 850888cb5f17aa9116bb0f37b6adf3ef883ba585 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 10 Jun 2020 15:37:25 +0200 Subject: [PATCH 21/91] use generic name in documentation examples --- plugins/modules/foreman_compute_resource.py | 14 +++++++------- plugins/modules/foreman_domain.py | 2 +- plugins/modules/foreman_environment.py | 2 +- plugins/modules/foreman_installation_medium.py | 2 +- plugins/modules/foreman_role.py | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/modules/foreman_compute_resource.py b/plugins/modules/foreman_compute_resource.py index f5a730ae..a8173e83 100644 --- a/plugins/modules/foreman_compute_resource.py +++ b/plugins/modules/foreman_compute_resource.py @@ -132,7 +132,7 @@ locations: - Munich organizations: - - ATIX + - ACME provider: libvirt provider_params: url: libvirt.example.com @@ -149,7 +149,7 @@ locations: - Munich organizations: - - ATIX + - ACME provider: libvirt provider_params: url: libvirt.example.com @@ -173,7 +173,7 @@ locations: - Munich organizations: - - ATIX + - ACME provider: vmware provider_params: url: vsphere.example.com @@ -211,7 +211,7 @@ locations: - Munich organizations: - - ATIX + - ACME provider: proxmox provider_params: url: https://proxmox.example.com:8006/api2/json @@ -230,7 +230,7 @@ locations: - AWS organizations: - - ATIX + - ACME provider: EC2 provider_params: user: AWS_ACCESS_KEY @@ -248,7 +248,7 @@ locations: - Azure organizations: - - ATIX + - ACME provider: AzureRm provider_params: user: SUBSCRIPTION_ID @@ -268,7 +268,7 @@ locations: - GCE organizations: - - ATIX + - ACME provider: GCE provider_params: project: orcharhino diff --git a/plugins/modules/foreman_domain.py b/plugins/modules/foreman_domain.py index 7e33035c..b7d751e4 100644 --- a/plugins/modules/foreman_domain.py +++ b/plugins/modules/foreman_domain.py @@ -69,7 +69,7 @@ locations: - "Munich" organizations: - - "ATIX" + - "ACME" server_url: "https://foreman.example.com" username: "admin" password: "secret" diff --git a/plugins/modules/foreman_environment.py b/plugins/modules/foreman_environment.py index 5b4dbea3..9308a218 100644 --- a/plugins/modules/foreman_environment.py +++ b/plugins/modules/foreman_environment.py @@ -51,7 +51,7 @@ locations: - "Munich" organizations: - - "ATIX" + - "ACME" server_url: "https://foreman.example.com" username: "admin" password: "secret" diff --git a/plugins/modules/foreman_installation_medium.py b/plugins/modules/foreman_installation_medium.py index efd4cd8c..0cfc28c4 100644 --- a/plugins/modules/foreman_installation_medium.py +++ b/plugins/modules/foreman_installation_medium.py @@ -68,7 +68,7 @@ locations: - "Munich" organizations: - - "ATIX" + - "ACME" operatingsystems: - "Debian" path: "http://debian.org/mirror/" diff --git a/plugins/modules/foreman_role.py b/plugins/modules/foreman_role.py index 2721fc38..6df17c15 100644 --- a/plugins/modules/foreman_role.py +++ b/plugins/modules/foreman_role.py @@ -69,7 +69,7 @@ locations: - "Uppsala" organizations: - - "Basalt" + - "ACME" filters: - permissions: - view_hosts From ccefdbc0867de709f324f19d001ea2ee55ac21ca Mon Sep 17 00:00:00 2001 From: Matthias Dellweg Date: Mon, 8 Jul 2019 15:17:00 +0200 Subject: [PATCH 22/91] Use 'missing_required_lib' to report import errors Fixes #326 --- plugins/module_utils/foreman_helper.py | 6 +++--- plugins/modules/foreman_subnet.py | 4 ++-- plugins/modules/katello_upload.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/module_utils/foreman_helper.py b/plugins/module_utils/foreman_helper.py index ac972f09..2ec65e35 100644 --- a/plugins/module_utils/foreman_helper.py +++ b/plugins/module_utils/foreman_helper.py @@ -17,7 +17,7 @@ from collections import defaultdict from functools import wraps -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils._text import to_bytes, to_native from ansible.module_utils import six @@ -376,7 +376,7 @@ def _patch_subnet_rex_api(self): def check_requirements(self): if not HAS_APYPIE: - self.fail_json(msg='The apypie Python module is required', exception=APYPIE_IMP_ERR) + self.fail_json(msg=missing_required_lib("apypie"), exception=APYPIE_IMP_ERR) @_exception2fail_json(msg="Failed to connect to Foreman server: {0}") def connect(self): @@ -1170,7 +1170,7 @@ def parameter_value_to_str(value, parameter_type): # Helper for templates def parse_template(template_content, module): if not HAS_PYYAML: - module.fail_json(msg='The PyYAML Python module is required', exception=PYYAML_IMP_ERR) + module.fail_json(msg=missing_required_lib("PyYAML"), exception=PYYAML_IMP_ERR) try: template_dict = {} diff --git a/plugins/modules/foreman_subnet.py b/plugins/modules/foreman_subnet.py index 13d9f6cd..d5671838 100644 --- a/plugins/modules/foreman_subnet.py +++ b/plugins/modules/foreman_subnet.py @@ -185,7 +185,7 @@ RETURN = ''' # ''' import traceback -from ansible.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule, NestedParametersMixin +from ansible.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule, NestedParametersMixin, missing_required_lib try: import ipaddress HAS_IPADDRESS = True @@ -233,7 +233,7 @@ def main(): ) if not HAS_IPADDRESS: - module.fail_json(msg='The ipaddress Python module is required', exception=IPADDRESS_IMP_ERR) + module.fail_json(msg=missing_required_lib("ipaddress"), exception=IPADDRESS_IMP_ERR) module_params = module.foreman_params diff --git a/plugins/modules/katello_upload.py b/plugins/modules/katello_upload.py index 37fc294b..b70e18c1 100644 --- a/plugins/modules/katello_upload.py +++ b/plugins/modules/katello_upload.py @@ -78,7 +78,7 @@ import traceback from ansible.module_utils._text import to_bytes -from ansible.module_utils.foreman_helper import KatelloAnsibleModule +from ansible.module_utils.foreman_helper import KatelloAnsibleModule, missing_required_lib try: from debian import debfile @@ -145,14 +145,14 @@ def main(): content_unit = None if module.foreman_params['repository']['content_type'] == 'deb': if not HAS_DEBFILE: - module.fail_json(msg='The python-debian module is required', exception=DEBFILE_IMP_ERR) + module.fail_json(msg=missing_required_lib("python-debian"), exception=DEBFILE_IMP_ERR) name, version, architecture = get_deb_info(b_src) query = 'name = "{0}" and version = "{1}" and architecture = "{2}"'.format(name, version, architecture) content_unit = module.find_resource('debs', query, params=repository_scope, failsafe=True) elif module.foreman_params['repository']['content_type'] == 'yum': if not HAS_RPM: - module.fail_json(msg='The rpm Python module is required', exception=RPM_IMP_ERR) + module.fail_json(msg=missing_required_lib("rpm"), exception=RPM_IMP_ERR) name, epoch, version, release, arch = get_rpm_info(b_src) query = 'name = "{0}" and epoch = "{1}" and version = "{2}" and release = "{3}" and arch = "{4}"'.format(name, epoch, version, release, arch) From 51e6ad9026400fd66b316cfc350314bcdef2734d Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 15:11:12 +0200 Subject: [PATCH 23/91] drop tests for ansible 2.7 --- .github/workflows/main.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0ca137cb..6a7c2945 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,25 +15,18 @@ jobs: matrix: python: ["2.7", "3.5", "3.6", "3.7"] ansible: - - stable-2.7 - stable-2.8 - stable-2.9 - devel exclude: - - python: "2.7" - ansible: "stable-2.7" - python: "2.7" ansible: "stable-2.8" - python: "2.7" ansible: "stable-2.9" - - python: "3.5" - ansible: "stable-2.7" - python: "3.5" ansible: "stable-2.8" - python: "3.5" ansible: "stable-2.9" - - python: "3.6" - ansible: "stable-2.7" - python: "3.6" ansible: "stable-2.8" - python: "3.6" From caf851221a74239fbfe491d3640e3dbf4edd006a Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 15:50:38 +0200 Subject: [PATCH 24/91] fix import too long --- plugins/modules/foreman_subnet.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/modules/foreman_subnet.py b/plugins/modules/foreman_subnet.py index d5671838..3d5cb4ea 100644 --- a/plugins/modules/foreman_subnet.py +++ b/plugins/modules/foreman_subnet.py @@ -185,7 +185,9 @@ RETURN = ''' # ''' import traceback -from ansible.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule, NestedParametersMixin, missing_required_lib +from ansible.module_utils.foreman_helper import ( + ForemanTaxonomicEntityAnsibleModule, NestedParametersMixin, missing_required_lib +) try: import ipaddress HAS_IPADDRESS = True From 212221b57fa018243615aa04f017c382a549e907 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Tue, 9 Jun 2020 15:57:39 +0200 Subject: [PATCH 25/91] update docs test --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a535e810..a78c8455 100644 --- a/Makefile +++ b/Makefile @@ -74,8 +74,8 @@ tests/test_playbooks/vars/server.yml: @echo "For recording, please adjust $@ to match your reference server." dist-test: $(MANIFEST) - ANSIBLE_COLLECTIONS_PATHS=build/collections ansible -m $(NAMESPACE).$(NAME).foreman_organization -a "username=admin password=changeme server_url=https://foreman.example.test name=collectiontest" localhost | grep -q "Failed to connect to Foreman server" - ANSIBLE_COLLECTIONS_PATHS=build/collections ansible-doc $(NAMESPACE).$(NAME).foreman_organization | grep -q "Manage Organization" + ANSIBLE_COLLECTIONS_PATHS=build/collections ansible -m $(NAMESPACE).$(NAME).organization -a "username=admin password=changeme server_url=https://foreman.example.test name=collectiontest" localhost | grep -q "Failed to connect to Foreman server" + ANSIBLE_COLLECTIONS_PATHS=build/collections ansible-doc $(NAMESPACE).$(NAME).organization | grep -q "Manage Organization" $(MANIFEST): $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz ansible-galaxy collection install -p build/collections $< --force From e6af483de44700424966fe9b843b4ed3cf356cc9 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 10 Jun 2020 12:59:30 +0200 Subject: [PATCH 26/91] drop the prefix from the testsuite --- tests/test_module_state.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/test_module_state.py b/tests/test_module_state.py index 5ddf41a4..c608a3f3 100644 --- a/tests/test_module_state.py +++ b/tests/test_module_state.py @@ -26,18 +26,13 @@ def find_all_modules(): ALL_MODULES = list(find_all_modules()) -def _strip_module_prefix(module): - return module.replace('foreman_', '').replace('katello_', '') - - def _module_file_path(module): module_file_name = "{}.py".format(module) return MODULES_PATH / module_file_name def _module_is_tested(module): - short_module = _strip_module_prefix(module) - return short_module in TEST_PLAYBOOKS or module in TEST_PLAYBOOKS + return module in TEST_PLAYBOOKS def _module_framework(module): From 3fe3a58f173f29ab1d5f1f50f7e0d5670dab39eb Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Tue, 16 Jun 2020 13:37:34 +0200 Subject: [PATCH 27/91] add runtime --- Makefile | 4 ++-- meta/runtime.yml | 0 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 meta/runtime.yml diff --git a/Makefile b/Makefile index a78c8455..f642e8d6 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ VERSION := $(shell python -c 'import yaml; print(yaml.safe_load(open("galaxy.yml MANIFEST := build/collections/ansible_collections/$(NAMESPACE)/$(NAME)/MANIFEST.json PLUGIN_TYPES := $(filter-out __%,$(notdir $(wildcard plugins/*))) -METADATA := galaxy.yml LICENSE README.md +METADATA := galaxy.yml LICENSE README.md meta/runtime.yml $(foreach PLUGIN_TYPE,$(PLUGIN_TYPES),$(eval _$(PLUGIN_TYPE) := $(filter-out %__init__.py,$(wildcard plugins/$(PLUGIN_TYPE)/*.py)))) DEPENDENCIES := $(METADATA) $(foreach PLUGIN_TYPE,$(PLUGIN_TYPES),$(_$(PLUGIN_TYPE))) @@ -97,7 +97,7 @@ build/src/%: % | build cp $< $@ build: - -mkdir build build/src build/src/plugins $(addprefix build/src/plugins/,$(PLUGIN_TYPES)) + -mkdir build build/src build/src/meta build/src/plugins $(addprefix build/src/plugins/,$(PLUGIN_TYPES)) $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz: $(addprefix build/src/,$(DEPENDENCIES)) | build ansible-galaxy collection build build/src --force diff --git a/meta/runtime.yml b/meta/runtime.yml new file mode 100644 index 00000000..e69de29b From 29a94b44a4b94d903213db7e5893d6d57eb8a9ac Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 12:56:35 +0200 Subject: [PATCH 28/91] dont' rename manifest test --- tests/test_module_state.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_module_state.py b/tests/test_module_state.py index c608a3f3..0ef5d4db 100644 --- a/tests/test_module_state.py +++ b/tests/test_module_state.py @@ -32,6 +32,8 @@ def _module_file_path(module): def _module_is_tested(module): + if module == 'subscription_manifest': + module = 'katello_manifest' return module in TEST_PLAYBOOKS From 29e20eed51ec9b82291f36a9d2254a3010d909a5 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:51 +0200 Subject: [PATCH 29/91] rename foreman_architecture to architecture --- meta/runtime.yml | 4 ++++ .../modules/{foreman_architecture.py => architecture.py} | 8 ++++---- tests/test_playbooks/tasks/architecture.yml | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) rename plugins/modules/{foreman_architecture.py => architecture.py} (96%) diff --git a/meta/runtime.yml b/meta/runtime.yml index e69de29b..61238fc6 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -0,0 +1,4 @@ +plugin_routing: + modules: + foreman_architecture: + redirect: architecture diff --git a/plugins/modules/foreman_architecture.py b/plugins/modules/architecture.py similarity index 96% rename from plugins/modules/foreman_architecture.py rename to plugins/modules/architecture.py index b3821203..57e11d1b 100644 --- a/plugins/modules/foreman_architecture.py +++ b/plugins/modules/architecture.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_architecture +module: architecture short_description: Manage Architectures description: - Create, update, and delete Architectures @@ -51,7 +51,7 @@ EXAMPLES = ''' - name: "Create an Architecture" - foreman_architecture: + architecture: name: "i386" operatingsystems: - "TestOS1" @@ -62,7 +62,7 @@ state: present - name: "Update an Architecture" - foreman_architecture: + architecture: name: "i386" operatingsystems: - "TestOS3" @@ -73,7 +73,7 @@ state: present - name: "Delete an Architecture" - foreman_architecture: + architecture: name: "i386" server_url: "https://foreman.example.com" username: "admin" diff --git a/tests/test_playbooks/tasks/architecture.yml b/tests/test_playbooks/tasks/architecture.yml index 87f70f01..20e467c6 100644 --- a/tests/test_playbooks/tasks/architecture.yml +++ b/tests/test_playbooks/tasks/architecture.yml @@ -3,7 +3,7 @@ vars: architecture_name: "rüsc256" architecture_state: present - foreman_architecture: + architecture: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From ff93aac22b9dbeedbf1216a6bf274a0f11ebdda2 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:51 +0200 Subject: [PATCH 30/91] rename foreman_auth_source_ldap to auth_source_ldap --- meta/runtime.yml | 2 ++ .../{foreman_auth_source_ldap.py => auth_source_ldap.py} | 6 +++--- tests/test_playbooks/tasks/auth_source_ldap.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) rename plugins/modules/{foreman_auth_source_ldap.py => auth_source_ldap.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 61238fc6..bb1fa606 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -2,3 +2,5 @@ plugin_routing: modules: foreman_architecture: redirect: architecture + foreman_auth_source_ldap: + redirect: auth_source_ldap diff --git a/plugins/modules/foreman_auth_source_ldap.py b/plugins/modules/auth_source_ldap.py similarity index 98% rename from plugins/modules/foreman_auth_source_ldap.py rename to plugins/modules/auth_source_ldap.py index 45377a3b..5d7a47e5 100644 --- a/plugins/modules/foreman_auth_source_ldap.py +++ b/plugins/modules/auth_source_ldap.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_auth_source_ldap +module: auth_source_ldap short_description: Manage LDAP authentication sources description: - Create, update, and delete LDAP authentication sources @@ -125,7 +125,7 @@ EXAMPLES = ''' - name: LDAP Authentication source - foreman_auth_source_ldap: + auth_source_ldap: name: "Example LDAP" host: "ldap.example.org" server_url: "https://foreman.example.com" @@ -138,7 +138,7 @@ state: present - name: LDAP Authentication with automatic registration - foreman_auth_source_ldap: + auth_source_ldap: name: "Example LDAP" host: "ldap.example.org" onthefly_register: True diff --git a/tests/test_playbooks/tasks/auth_source_ldap.yml b/tests/test_playbooks/tasks/auth_source_ldap.yml index aa60a077..5cbde264 100644 --- a/tests/test_playbooks/tasks/auth_source_ldap.yml +++ b/tests/test_playbooks/tasks/auth_source_ldap.yml @@ -21,7 +21,7 @@ - 'Test Location' auth_source_ldap_organizations: - 'Test Organization' - foreman_auth_source_ldap: + auth_source_ldap: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From b24eed7577a7874d1747dba75150b3b98cc10a5d Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:51 +0200 Subject: [PATCH 31/91] rename foreman_bookmark to bookmark --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_bookmark.py => bookmark.py} | 8 ++++---- tests/test_playbooks/tasks/bookmark.yml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) rename plugins/modules/{foreman_bookmark.py => bookmark.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index bb1fa606..cb31c3c9 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -4,3 +4,5 @@ plugin_routing: redirect: architecture foreman_auth_source_ldap: redirect: auth_source_ldap + foreman_bookmark: + redirect: bookmark diff --git a/plugins/modules/foreman_bookmark.py b/plugins/modules/bookmark.py similarity index 97% rename from plugins/modules/foreman_bookmark.py rename to plugins/modules/bookmark.py index e78c20c5..b0d1d499 100644 --- a/plugins/modules/foreman_bookmark.py +++ b/plugins/modules/bookmark.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_bookmark +module: bookmark short_description: Manage Bookmarks description: - "Manage Bookmark Entities" @@ -60,7 +60,7 @@ EXAMPLES = ''' - name: "Create a Bookmark" - foreman_bookmark: + bookmark: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -70,7 +70,7 @@ state: present_with_defaults - name: "Update a Bookmark" - foreman_bookmark: + bookmark: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -80,7 +80,7 @@ state: present - name: "Delete a Bookmark" - foreman_bookmark: + bookmark: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/bookmark.yml b/tests/test_playbooks/tasks/bookmark.yml index 35d2a8d5..95ed61ca 100644 --- a/tests/test_playbooks/tasks/bookmark.yml +++ b/tests/test_playbooks/tasks/bookmark.yml @@ -6,7 +6,7 @@ bookmark_public: true bookmark_query: "started_at > 24 hours ago" bookmark_state: present - foreman_bookmark: + bookmark: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 3f3ccce5f6d917e92e826f03e7f310959c61fb61 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:51 +0200 Subject: [PATCH 32/91] rename foreman_compute_attribute to compute_attribute --- meta/runtime.yml | 2 ++ .../{foreman_compute_attribute.py => compute_attribute.py} | 6 +++--- tests/test_playbooks/tasks/compute_attribute.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) rename plugins/modules/{foreman_compute_attribute.py => compute_attribute.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index cb31c3c9..42c1b9df 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -6,3 +6,5 @@ plugin_routing: redirect: auth_source_ldap foreman_bookmark: redirect: bookmark + foreman_compute_attribute: + redirect: compute_attribute diff --git a/plugins/modules/foreman_compute_attribute.py b/plugins/modules/compute_attribute.py similarity index 97% rename from plugins/modules/foreman_compute_attribute.py rename to plugins/modules/compute_attribute.py index 4866d289..4d43fc58 100644 --- a/plugins/modules/foreman_compute_attribute.py +++ b/plugins/modules/compute_attribute.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_compute_attribute +module: compute_attribute short_description: Manage Compute Attributes description: - "Manage Compute Attributes" @@ -57,7 +57,7 @@ EXAMPLES = ''' - name: "Create compute attribute" - foreman_compute_attribute: + compute_attribute: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -69,7 +69,7 @@ state: present - name: "Update compute attribute" - foreman_compute_attribute: + compute_attribute: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/compute_attribute.yml b/tests/test_playbooks/tasks/compute_attribute.yml index 765bdde5..46ab7990 100644 --- a/tests/test_playbooks/tasks/compute_attribute.yml +++ b/tests/test_playbooks/tasks/compute_attribute.yml @@ -4,7 +4,7 @@ - compute_profile_name: "Test Compute Profile" - compute_resource_name: "Test Compute Resource" - compute_attribute_state: "present" - foreman_compute_attribute: + compute_attribute: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 79b62d61d6676034169d709e67d6ca7ffd9016f4 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:51 +0200 Subject: [PATCH 33/91] rename foreman_compute_profile to compute_profile --- meta/runtime.yml | 2 ++ .../{foreman_compute_profile.py => compute_profile.py} | 10 +++++----- tests/test_playbooks/tasks/compute_profile.yml | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) rename plugins/modules/{foreman_compute_profile.py => compute_profile.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 42c1b9df..c2dc6d52 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -8,3 +8,5 @@ plugin_routing: redirect: bookmark foreman_compute_attribute: redirect: compute_attribute + foreman_compute_profile: + redirect: compute_profile diff --git a/plugins/modules/foreman_compute_profile.py b/plugins/modules/compute_profile.py similarity index 97% rename from plugins/modules/foreman_compute_profile.py rename to plugins/modules/compute_profile.py index 57dbe44b..1401a7d7 100644 --- a/plugins/modules/foreman_compute_profile.py +++ b/plugins/modules/compute_profile.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- -module: foreman_compute_profile +module: compute_profile short_description: Manage Compute Profiles description: - Create, update, and delete Compute Profiles @@ -65,7 +65,7 @@ EXAMPLES = ''' - name: compute profile - foreman_compute_profile: + compute_profile: name: example_compute_profile server_url: "https://foreman.example.com" username: admin @@ -73,7 +73,7 @@ state: present - name: another compute profile - foreman_compute_profile: + compute_profile: name: another_example_compute_profile compute_attributes: - compute_resource: ovirt_compute_resource1 @@ -87,7 +87,7 @@ state: present - name: compute profile2 - foreman_compute_profile: + compute_profile: name: example_compute_profile2 compute_attributes: - compute_resource: ovirt_compute_resource01 @@ -131,7 +131,7 @@ state: present - name: Remove compute profile - foreman_compute_profile: + compute_profile: name: example_compute_profile2 server_url: "https://foreman.example.com" username: admin diff --git a/tests/test_playbooks/tasks/compute_profile.yml b/tests/test_playbooks/tasks/compute_profile.yml index de73586f..9f4bdc33 100644 --- a/tests/test_playbooks/tasks/compute_profile.yml +++ b/tests/test_playbooks/tasks/compute_profile.yml @@ -3,7 +3,7 @@ vars: - compute_profile_name: "Test Compute Profile" - compute_profile_state: "present" - foreman_compute_profile: + compute_profile: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 6e9c86a7fcc27b02e3bfb0b5c3b47b306b59d8e1 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:51 +0200 Subject: [PATCH 34/91] rename foreman_compute_resource to compute_resource --- meta/runtime.yml | 2 ++ ...ompute_resource.py => compute_resource.py} | 20 +++++++++---------- .../test_playbooks/tasks/compute_resource.yml | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) rename plugins/modules/{foreman_compute_resource.py => compute_resource.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index c2dc6d52..9dc0b80f 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -10,3 +10,5 @@ plugin_routing: redirect: compute_attribute foreman_compute_profile: redirect: compute_profile + foreman_compute_resource: + redirect: compute_resource diff --git a/plugins/modules/foreman_compute_resource.py b/plugins/modules/compute_resource.py similarity index 97% rename from plugins/modules/foreman_compute_resource.py rename to plugins/modules/compute_resource.py index a8173e83..06a6e357 100644 --- a/plugins/modules/foreman_compute_resource.py +++ b/plugins/modules/compute_resource.py @@ -27,7 +27,7 @@ DOCUMENTATION = ''' --- -module: foreman_compute_resource +module: compute_resource short_description: Manage Compute resources description: - Create, update, and delete Compute Resources @@ -127,7 +127,7 @@ EXAMPLES = ''' - name: Create livirt compute resource - foreman_compute_resource: + compute_resource: name: example_compute_resource locations: - Munich @@ -143,7 +143,7 @@ state: present - name: Update libvirt compute resource - foreman_compute_resource: + compute_resource: name: example_compute_resource description: updated compute resource locations: @@ -160,7 +160,7 @@ state: present - name: Delete libvirt compute resource - foreman_compute_resource: + compute_resource: name: example_compute_resource server_url: "https://foreman.example.com" username: admin @@ -168,7 +168,7 @@ state: absent - name: Create vmware compute resource - foreman_compute_resource: + compute_resource: name: example_compute_resource locations: - Munich @@ -186,7 +186,7 @@ state: present - name: Create ovirt compute resource - foreman_compute_resource: + compute_resource: name: ovirt_compute_resource locations: - France/Toulouse @@ -206,7 +206,7 @@ state: present - name: Create proxmox compute resource - foreman_compute_resource: + compute_resource: name: proxmox_compute_resource locations: - Munich @@ -224,7 +224,7 @@ state: present - name: create EC2 compute resource - foreman_compute_resource: + compute_resource: name: EC2_compute_resource description: EC2 locations: @@ -242,7 +242,7 @@ state: present - name: create Azure compute resource - foreman_compute_resource: + compute_resource: name: AzureRm_compute_resource description: AzureRm locations: @@ -262,7 +262,7 @@ state: present - name: create GCE compute resource - foreman_compute_resource: + compute_resource: name: GCE compute resource description: Google Cloud Engine locations: diff --git a/tests/test_playbooks/tasks/compute_resource.yml b/tests/test_playbooks/tasks/compute_resource.yml index 9b04157e..db1e85d8 100644 --- a/tests/test_playbooks/tasks/compute_resource.yml +++ b/tests/test_playbooks/tasks/compute_resource.yml @@ -2,7 +2,7 @@ - name: Create/update compute resource vars: compute_resource_name: "Test Compute Resource" - foreman_compute_resource: + compute_resource: server_url: "{{ foreman_server_url }}" username: "{{ foreman_username }}" password: "{{ foreman_password }}" From edef223316c43f5ed7ccc39700f466beaec91e55 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:51 +0200 Subject: [PATCH 35/91] rename foreman_config_group to config_group --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_config_group.py => config_group.py} | 4 ++-- tests/test_playbooks/tasks/config_group.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{foreman_config_group.py => config_group.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 9dc0b80f..b1aa7d79 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -12,3 +12,5 @@ plugin_routing: redirect: compute_profile foreman_compute_resource: redirect: compute_resource + foreman_config_group: + redirect: config_group diff --git a/plugins/modules/foreman_config_group.py b/plugins/modules/config_group.py similarity index 97% rename from plugins/modules/foreman_config_group.py rename to plugins/modules/config_group.py index f7f8cbb9..447a6155 100644 --- a/plugins/modules/foreman_config_group.py +++ b/plugins/modules/config_group.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_config_group +module: config_group short_description: Manage (Puppet) config groups description: - Create, update, and delete (Puppet) config groups @@ -51,7 +51,7 @@ EXAMPLES = ''' - name: create new config group - foreman_config_group: + config_group: name: "My config group" puppetclasses: - ntp diff --git a/tests/test_playbooks/tasks/config_group.yml b/tests/test_playbooks/tasks/config_group.yml index 5dc78596..c4010516 100644 --- a/tests/test_playbooks/tasks/config_group.yml +++ b/tests/test_playbooks/tasks/config_group.yml @@ -2,7 +2,7 @@ - name: "Ensure config group '{{ config_group_name }}' is '{{ config_group_state }}' }}'" vars: - config_group_name: "Test config group" - foreman_config_group: + config_group: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 80e0856cc31d1b9100bead0b793c65264f28c642 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:52 +0200 Subject: [PATCH 36/91] rename foreman_domain to domain --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_domain.py => domain.py} | 4 ++-- tests/test_playbooks/tasks/domain.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{foreman_domain.py => domain.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index b1aa7d79..54e9177f 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -14,3 +14,5 @@ plugin_routing: redirect: compute_resource foreman_config_group: redirect: config_group + foreman_domain: + redirect: domain diff --git a/plugins/modules/foreman_domain.py b/plugins/modules/domain.py similarity index 98% rename from plugins/modules/foreman_domain.py rename to plugins/modules/domain.py index b7d751e4..c6ed45dc 100644 --- a/plugins/modules/foreman_domain.py +++ b/plugins/modules/domain.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_domain +module: domain short_description: Manage Domains description: - Create, update, and delete Domains @@ -63,7 +63,7 @@ EXAMPLES = ''' - name: domain - foreman_domain: + domain: name: "example.org" description: "Example Domain" locations: diff --git a/tests/test_playbooks/tasks/domain.yml b/tests/test_playbooks/tasks/domain.yml index 7a2031fb..52244c96 100644 --- a/tests/test_playbooks/tasks/domain.yml +++ b/tests/test_playbooks/tasks/domain.yml @@ -2,7 +2,7 @@ - name: "Create/Update/Delete domain" vars: domain_state: "present" - foreman_domain: + domain: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 7c034c7a35c029697ab58a4520c84fd777255344 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:52 +0200 Subject: [PATCH 37/91] rename foreman_environment to puppet_environment --- meta/runtime.yml | 2 ++ .../modules/{foreman_environment.py => puppet_environment.py} | 4 ++-- tests/conftest.py | 2 +- .../apidoc/{environment.json => puppet_environment.json} | 0 .../fixtures/{environment-0.yml => puppet_environment-0.yml} | 0 .../fixtures/{environment-1.yml => puppet_environment-1.yml} | 0 .../fixtures/{environment-2.yml => puppet_environment-2.yml} | 0 .../fixtures/{environment-3.yml => puppet_environment-3.yml} | 0 .../fixtures/{environment-4.yml => puppet_environment-4.yml} | 0 .../fixtures/{environment-5.yml => puppet_environment-5.yml} | 0 .../{environment.yml => puppet_environment.yml} | 0 tests/test_playbooks/tasks/environment.yml | 2 +- 12 files changed, 6 insertions(+), 4 deletions(-) rename plugins/modules/{foreman_environment.py => puppet_environment.py} (97%) rename tests/fixtures/apidoc/{environment.json => puppet_environment.json} (100%) rename tests/test_playbooks/fixtures/{environment-0.yml => puppet_environment-0.yml} (100%) rename tests/test_playbooks/fixtures/{environment-1.yml => puppet_environment-1.yml} (100%) rename tests/test_playbooks/fixtures/{environment-2.yml => puppet_environment-2.yml} (100%) rename tests/test_playbooks/fixtures/{environment-3.yml => puppet_environment-3.yml} (100%) rename tests/test_playbooks/fixtures/{environment-4.yml => puppet_environment-4.yml} (100%) rename tests/test_playbooks/fixtures/{environment-5.yml => puppet_environment-5.yml} (100%) rename tests/test_playbooks/{environment.yml => puppet_environment.yml} (100%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 54e9177f..9a065e22 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -16,3 +16,5 @@ plugin_routing: redirect: config_group foreman_domain: redirect: domain + foreman_environment: + redirect: puppet_environment diff --git a/plugins/modules/foreman_environment.py b/plugins/modules/puppet_environment.py similarity index 97% rename from plugins/modules/foreman_environment.py rename to plugins/modules/puppet_environment.py index 9308a218..a7c742da 100644 --- a/plugins/modules/foreman_environment.py +++ b/plugins/modules/puppet_environment.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- -module: foreman_environment +module: puppet_environment short_description: Manage Environment (Puppet) description: - Create, update, and delete Environment @@ -46,7 +46,7 @@ EXAMPLES = ''' - name: create new environment - foreman_environment: + puppet_environment: name: "testing" locations: - "Munich" diff --git a/tests/conftest.py b/tests/conftest.py index 9f91add1..bdd38f14 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,7 +14,7 @@ 'content_view_filter', 'content_view_version', 'domain', - 'environment', + 'puppet_environment', 'external_usergroup', 'config_group', 'filters', diff --git a/tests/fixtures/apidoc/environment.json b/tests/fixtures/apidoc/puppet_environment.json similarity index 100% rename from tests/fixtures/apidoc/environment.json rename to tests/fixtures/apidoc/puppet_environment.json diff --git a/tests/test_playbooks/fixtures/environment-0.yml b/tests/test_playbooks/fixtures/puppet_environment-0.yml similarity index 100% rename from tests/test_playbooks/fixtures/environment-0.yml rename to tests/test_playbooks/fixtures/puppet_environment-0.yml diff --git a/tests/test_playbooks/fixtures/environment-1.yml b/tests/test_playbooks/fixtures/puppet_environment-1.yml similarity index 100% rename from tests/test_playbooks/fixtures/environment-1.yml rename to tests/test_playbooks/fixtures/puppet_environment-1.yml diff --git a/tests/test_playbooks/fixtures/environment-2.yml b/tests/test_playbooks/fixtures/puppet_environment-2.yml similarity index 100% rename from tests/test_playbooks/fixtures/environment-2.yml rename to tests/test_playbooks/fixtures/puppet_environment-2.yml diff --git a/tests/test_playbooks/fixtures/environment-3.yml b/tests/test_playbooks/fixtures/puppet_environment-3.yml similarity index 100% rename from tests/test_playbooks/fixtures/environment-3.yml rename to tests/test_playbooks/fixtures/puppet_environment-3.yml diff --git a/tests/test_playbooks/fixtures/environment-4.yml b/tests/test_playbooks/fixtures/puppet_environment-4.yml similarity index 100% rename from tests/test_playbooks/fixtures/environment-4.yml rename to tests/test_playbooks/fixtures/puppet_environment-4.yml diff --git a/tests/test_playbooks/fixtures/environment-5.yml b/tests/test_playbooks/fixtures/puppet_environment-5.yml similarity index 100% rename from tests/test_playbooks/fixtures/environment-5.yml rename to tests/test_playbooks/fixtures/puppet_environment-5.yml diff --git a/tests/test_playbooks/environment.yml b/tests/test_playbooks/puppet_environment.yml similarity index 100% rename from tests/test_playbooks/environment.yml rename to tests/test_playbooks/puppet_environment.yml diff --git a/tests/test_playbooks/tasks/environment.yml b/tests/test_playbooks/tasks/environment.yml index 214fb5f7..e329cbe0 100644 --- a/tests/test_playbooks/tasks/environment.yml +++ b/tests/test_playbooks/tasks/environment.yml @@ -6,7 +6,7 @@ - "Test Location" - environment_organizations: - "Test Organization" - foreman_environment: + puppet_environment: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 4b33277e977e03ff4ebd1ea68a4cdd64477305fe Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:52 +0200 Subject: [PATCH 38/91] rename foreman_external_usergroup to external_usergroup --- meta/runtime.yml | 2 ++ .../{foreman_external_usergroup.py => external_usergroup.py} | 4 ++-- tests/test_playbooks/tasks/external_usergroup.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{foreman_external_usergroup.py => external_usergroup.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 9a065e22..3c17f49c 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -18,3 +18,5 @@ plugin_routing: redirect: domain foreman_environment: redirect: puppet_environment + foreman_external_usergroup: + redirect: external_usergroup diff --git a/plugins/modules/foreman_external_usergroup.py b/plugins/modules/external_usergroup.py similarity index 97% rename from plugins/modules/foreman_external_usergroup.py rename to plugins/modules/external_usergroup.py index fc245fd6..eedc5166 100644 --- a/plugins/modules/foreman_external_usergroup.py +++ b/plugins/modules/external_usergroup.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_external_usergroup +module: external_usergroup short_description: Manage external user groups description: - Create, update, and delete external user groups @@ -54,7 +54,7 @@ EXAMPLES = ''' - name: Create an external user group - foreman_external_usergroup: + external_usergroup: name: test auth_source_ldap: "My LDAP server" usergroup: "Internal Usergroup" diff --git a/tests/test_playbooks/tasks/external_usergroup.yml b/tests/test_playbooks/tasks/external_usergroup.yml index c0103467..b6b3322f 100644 --- a/tests/test_playbooks/tasks/external_usergroup.yml +++ b/tests/test_playbooks/tasks/external_usergroup.yml @@ -3,7 +3,7 @@ vars: external_usergroup_name: "admins" external_usergroup_state: present - foreman_external_usergroup: + external_usergroup: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 9c16ab9aaa66aa9bc5ba87a715f8c85157ba48e4 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:52 +0200 Subject: [PATCH 39/91] rename foreman_global_parameter to global_parameter --- meta/runtime.yml | 2 ++ .../{foreman_global_parameter.py => global_parameter.py} | 8 ++++---- tests/test_playbooks/tasks/global_parameter.yml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) rename plugins/modules/{foreman_global_parameter.py => global_parameter.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 3c17f49c..0846a667 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -20,3 +20,5 @@ plugin_routing: redirect: puppet_environment foreman_external_usergroup: redirect: external_usergroup + foreman_global_parameter: + redirect: global_parameter diff --git a/plugins/modules/foreman_global_parameter.py b/plugins/modules/global_parameter.py similarity index 97% rename from plugins/modules/foreman_global_parameter.py rename to plugins/modules/global_parameter.py index df5e8085..7b9ab4c0 100644 --- a/plugins/modules/foreman_global_parameter.py +++ b/plugins/modules/global_parameter.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- -module: foreman_global_parameter +module: global_parameter short_description: Manage Global Parameters description: - "Manage Global Parameter Entities" @@ -72,7 +72,7 @@ EXAMPLES = ''' - name: "Create a Global Parameter" - foreman_global_parameter: + global_parameter: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -81,7 +81,7 @@ state: present_with_defaults - name: "Update a Global Parameter" - foreman_global_parameter: + global_parameter: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -90,7 +90,7 @@ state: present - name: "Delete a Global Parameter" - foreman_global_parameter: + global_parameter: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/global_parameter.yml b/tests/test_playbooks/tasks/global_parameter.yml index fffd1b45..3e15cf01 100644 --- a/tests/test_playbooks/tasks/global_parameter.yml +++ b/tests/test_playbooks/tasks/global_parameter.yml @@ -5,7 +5,7 @@ global_parameter_state: present block: - name: "Ensure Global Parameter '{{ global_parameter_name }}' is {{ global_parameter_state }}" - foreman_global_parameter: + global_parameter: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From a6470ff526da487261a8be28e4a57299bf090458 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:52 +0200 Subject: [PATCH 40/91] rename foreman_hostgroup to hostgroup --- meta/runtime.yml | 2 ++ .../modules/{foreman_hostgroup.py => hostgroup.py} | 14 +++++++------- tests/test_playbooks/inventory_plugin.yml | 2 +- tests/test_playbooks/tasks/hostgroup.yml | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) rename plugins/modules/{foreman_hostgroup.py => hostgroup.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 0846a667..7abbc09a 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -22,3 +22,5 @@ plugin_routing: redirect: external_usergroup foreman_global_parameter: redirect: global_parameter + foreman_hostgroup: + redirect: hostgroup diff --git a/plugins/modules/foreman_hostgroup.py b/plugins/modules/hostgroup.py similarity index 97% rename from plugins/modules/foreman_hostgroup.py rename to plugins/modules/hostgroup.py index 4b4f3a19..0cebfb36 100644 --- a/plugins/modules/foreman_hostgroup.py +++ b/plugins/modules/hostgroup.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_hostgroup +module: hostgroup short_description: Manage Hostgroups description: - Create, update, and delete Hostgroups @@ -68,7 +68,7 @@ EXAMPLES = ''' - name: "Create a Hostgroup" - foreman_hostgroup: + hostgroup: name: "new_hostgroup" architecture: "architecture_name" operatingsystem: "operatingsystem_name" @@ -80,7 +80,7 @@ state: present - name: "Update a Hostgroup" - foreman_hostgroup: + hostgroup: name: "new_hostgroup" architecture: "updated_architecture_name" operatingsystem: "updated_operatingsystem_name" @@ -100,12 +100,12 @@ state: present - name: "My nested hostgroup" - foreman_hostgroup: + hostgroup: parent: "new_hostgroup" name: "my nested hostgroup" - name: "My hostgroup with some proxies" - foreman_hostgroup: + hostgroup: name: "my hostgroup" environment: production puppet_proxy: puppet-proxy.example.com @@ -113,7 +113,7 @@ openscap_proxy: openscap-proxy.example.com - name: "My katello related hostgroup" - foreman_hostgroup: + hostgroup: organization: "My Org" name: "kt hostgroup" content_source: capsule.example.com @@ -124,7 +124,7 @@ value: "my_prod_ak" - name: "Delete a Hostgroup" - foreman_hostgroup: + hostgroup: name: "new_hostgroup" server_url: "https://foreman.example.com" username: "admin" diff --git a/tests/test_playbooks/inventory_plugin.yml b/tests/test_playbooks/inventory_plugin.yml index 56f30439..4118d3fb 100644 --- a/tests/test_playbooks/inventory_plugin.yml +++ b/tests/test_playbooks/inventory_plugin.yml @@ -40,7 +40,7 @@ delay: 10 - name: create test hostgroups - foreman_hostgroup: + hostgroup: username: admin password: changeme server_url: http://127.0.0.1:3000/ diff --git a/tests/test_playbooks/tasks/hostgroup.yml b/tests/test_playbooks/tasks/hostgroup.yml index 0a4235e1..a0e675f5 100644 --- a/tests/test_playbooks/tasks/hostgroup.yml +++ b/tests/test_playbooks/tasks/hostgroup.yml @@ -3,7 +3,7 @@ vars: hostgroup_name: "test_hostgroup" hostgroup_state: present - foreman_hostgroup: + hostgroup: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 1bae6c77b9521ba516bdd36a0a3dc573bbee553e Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:52 +0200 Subject: [PATCH 41/91] rename foreman_host_power to host_power --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_host_power.py => host_power.py} | 8 ++++---- tests/test_playbooks/tasks/host_power.yml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) rename plugins/modules/{foreman_host_power.py => host_power.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 7abbc09a..195760a6 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -24,3 +24,5 @@ plugin_routing: redirect: global_parameter foreman_hostgroup: redirect: hostgroup + foreman_host_power: + redirect: host_power diff --git a/plugins/modules/foreman_host_power.py b/plugins/modules/host_power.py similarity index 97% rename from plugins/modules/foreman_host_power.py rename to plugins/modules/host_power.py index 8b7ef409..92b3e847 100644 --- a/plugins/modules/foreman_host_power.py +++ b/plugins/modules/host_power.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_host_power +module: host_power short_description: Manage hosts power state description: - "Manage power state of a host" @@ -61,7 +61,7 @@ EXAMPLES = ''' - name: "Switch a host on" - foreman_host_power: + host_power: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -69,7 +69,7 @@ state: on - name: "Switch a host off" - foreman_host_power: + host_power: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -77,7 +77,7 @@ state: off - name: "Query host power state" - foreman_host_power: + host_power: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/host_power.yml b/tests/test_playbooks/tasks/host_power.yml index 84b7e833..50abb7dd 100644 --- a/tests/test_playbooks/tasks/host_power.yml +++ b/tests/test_playbooks/tasks/host_power.yml @@ -1,6 +1,6 @@ --- - name: "Ensure host '{{ host_power_name }}' is {{ host_power_state }}" - foreman_host_power: + host_power: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 47087fd48c2e0f24668952d12625f10f4ba1f233 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:52 +0200 Subject: [PATCH 42/91] rename foreman_host to host --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_host.py => host.py} | 10 +++++----- tests/test_playbooks/inventory_plugin.yml | 2 +- tests/test_playbooks/tasks/host.yml | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) rename plugins/modules/{foreman_host.py => host.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 195760a6..54f6cdc7 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -26,3 +26,5 @@ plugin_routing: redirect: hostgroup foreman_host_power: redirect: host_power + foreman_host: + redirect: host diff --git a/plugins/modules/foreman_host.py b/plugins/modules/host.py similarity index 98% rename from plugins/modules/foreman_host.py rename to plugins/modules/host.py index 4f20dc0f..a81dcfce 100644 --- a/plugins/modules/foreman_host.py +++ b/plugins/modules/host.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_host +module: host short_description: Manage hosts description: - "Manage host Entities" @@ -122,7 +122,7 @@ EXAMPLES = ''' - name: "Create a host" - foreman_host: + host: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -131,7 +131,7 @@ state: present - name: "Create a host with build context" - foreman_host: + host: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -141,7 +141,7 @@ state: present - name: "Create an unmanaged host" - foreman_host: + host: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -150,7 +150,7 @@ state: present - name: "Delete a host" - foreman_host: + host: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/inventory_plugin.yml b/tests/test_playbooks/inventory_plugin.yml index 4118d3fb..9df73c4e 100644 --- a/tests/test_playbooks/inventory_plugin.yml +++ b/tests/test_playbooks/inventory_plugin.yml @@ -52,7 +52,7 @@ with_items: "{{ foreman_groups }}" - name: create test hosts - foreman_host: + host: username: admin password: changeme server_url: http://127.0.0.1:3000/ diff --git a/tests/test_playbooks/tasks/host.yml b/tests/test_playbooks/tasks/host.yml index 1c182dfd..19c03eae 100644 --- a/tests/test_playbooks/tasks/host.yml +++ b/tests/test_playbooks/tasks/host.yml @@ -1,6 +1,6 @@ --- - name: "Ensure host '{{ host_name }}' is {{ host_state }}" - foreman_host: + host: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 2ade858d22ba9e6d4ced7f0271aee46eef6f92d8 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:52 +0200 Subject: [PATCH 43/91] rename foreman_image to image --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_image.py => image.py} | 4 ++-- tests/test_playbooks/tasks/image.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{foreman_image.py => image.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 54f6cdc7..9a69c2c4 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -28,3 +28,5 @@ plugin_routing: redirect: host_power foreman_host: redirect: host + foreman_image: + redirect: image diff --git a/plugins/modules/foreman_image.py b/plugins/modules/image.py similarity index 98% rename from plugins/modules/foreman_image.py rename to plugins/modules/image.py index 594f0a9b..39fb4091 100644 --- a/plugins/modules/foreman_image.py +++ b/plugins/modules/image.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_image +module: image short_description: Manage Images description: - Create, update, and delete Images @@ -73,7 +73,7 @@ EXAMPLES = ''' - name: create Image for EC2 - foreman_image: + image: name: CentOS image_uuid: "ami-0ff760d16d9497662" image_username: "centos" diff --git a/tests/test_playbooks/tasks/image.yml b/tests/test_playbooks/tasks/image.yml index 0ccf8d1c..2be79777 100644 --- a/tests/test_playbooks/tasks/image.yml +++ b/tests/test_playbooks/tasks/image.yml @@ -3,7 +3,7 @@ vars: compute_resource_name: "Test Compute Resource" image_name: "MYIMAGE" - foreman_image: + image: server_url: "{{ foreman_server_url }}" username: "{{ foreman_username }}" password: "{{ foreman_password }}" From 99b02989dd64972b222b53395c5d57444fae6b26 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:52 +0200 Subject: [PATCH 44/91] rename foreman_installation_medium to installation_medium --- meta/runtime.yml | 2 ++ ...{foreman_installation_medium.py => installation_medium.py} | 4 ++-- tests/test_playbooks/tasks/installation_medium.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{foreman_installation_medium.py => installation_medium.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 9a69c2c4..178816fb 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -30,3 +30,5 @@ plugin_routing: redirect: host foreman_image: redirect: image + foreman_installation_medium: + redirect: installation_medium diff --git a/plugins/modules/foreman_installation_medium.py b/plugins/modules/installation_medium.py similarity index 98% rename from plugins/modules/foreman_installation_medium.py rename to plugins/modules/installation_medium.py index 0cfc28c4..f3392e1f 100644 --- a/plugins/modules/foreman_installation_medium.py +++ b/plugins/modules/installation_medium.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_installation_medium +module: installation_medium short_description: Manage Installation Medium description: - Create, update, and delete Installation Medium @@ -63,7 +63,7 @@ EXAMPLES = ''' - name: create new debian medium - foreman_installation_medium: + installation_medium: name: "wheezy" locations: - "Munich" diff --git a/tests/test_playbooks/tasks/installation_medium.yml b/tests/test_playbooks/tasks/installation_medium.yml index 6c2fb2d8..c451db1f 100644 --- a/tests/test_playbooks/tasks/installation_medium.yml +++ b/tests/test_playbooks/tasks/installation_medium.yml @@ -10,7 +10,7 @@ - "Test Organization" - installation_medium_path: "https://templeos.org/TempleOS.ISO" - installation_medium_os_family: "{{ omit }}" - foreman_installation_medium: + installation_medium: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From f8887bb0e85a4aa6c2379123376ae249cda4ef4d Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:52 +0200 Subject: [PATCH 45/91] rename foreman_job_template to job_template --- meta/runtime.yml | 2 ++ .../{foreman_job_template.py => job_template.py} | 16 ++++++++-------- tests/test_playbooks/tasks/job_template.yml | 2 +- .../tasks/job_template_from_file.yml | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) rename plugins/modules/{foreman_job_template.py => job_template.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 178816fb..3ea0c054 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -32,3 +32,5 @@ plugin_routing: redirect: image foreman_installation_medium: redirect: installation_medium + foreman_job_template: + redirect: job_template diff --git a/plugins/modules/foreman_job_template.py b/plugins/modules/job_template.py similarity index 98% rename from plugins/modules/foreman_job_template.py rename to plugins/modules/job_template.py index e7f4e288..e38a9921 100644 --- a/plugins/modules/foreman_job_template.py +++ b/plugins/modules/job_template.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_job_template +module: job_template short_description: Manage Job Templates description: - "Manage Remote Execution Job Templates" @@ -155,7 +155,7 @@ EXAMPLES = ''' - name: "Create a Job Template inline" - foreman_job_template: + job_template: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -175,7 +175,7 @@ - TARDIS INC - name: "Create a Job Template from a file" - foreman_job_template: + job_template: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -191,7 +191,7 @@ - TARDIS INC - name: "remove a job template's template inputs" - foreman_job_template: + job_template: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -204,7 +204,7 @@ - TARDIS INC - name: "Delete a Job Template" - foreman_job_template: + job_template: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -212,7 +212,7 @@ state: absent - name: "Create a Job Template from a file and modify with parameter(s)" - foreman_job_template: + job_template: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -227,7 +227,7 @@ # Providing a name in this case wouldn't be very sensible. # Alternatively make use of with_filetree to parse recursively with filter. - name: Parsing a directory of Job templates - foreman_job_template: + job_template: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -242,7 +242,7 @@ # If the templates are stored locally and the ansible module is executed on a remote host - name: Ensure latest version of all your Job Templates - foreman_job_template: + job_template: server_url: "https://foreman.example.com" username: "admin" password: "changeme" diff --git a/tests/test_playbooks/tasks/job_template.yml b/tests/test_playbooks/tasks/job_template.yml index f5d11088..fa47b2a7 100644 --- a/tests/test_playbooks/tasks/job_template.yml +++ b/tests/test_playbooks/tasks/job_template.yml @@ -16,7 +16,7 @@ - name: "another input" input_type: "variable" variable_name: "lolwtf" - foreman_job_template: + job_template: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" diff --git a/tests/test_playbooks/tasks/job_template_from_file.yml b/tests/test_playbooks/tasks/job_template_from_file.yml index 0dea7c83..1fceb06a 100644 --- a/tests/test_playbooks/tasks/job_template_from_file.yml +++ b/tests/test_playbooks/tasks/job_template_from_file.yml @@ -1,6 +1,6 @@ --- - name: "Ensure job template from file '{{ job_template_file_name }}' is '{{ job_template_state }}'" - foreman_job_template: + job_template: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 920daacea4c44a1df05acf7f954496288b2fd955 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:52 +0200 Subject: [PATCH 46/91] rename foreman_location to location --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_location.py => location.py} | 10 +++++----- tests/test_playbooks/tasks/location.yml | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) rename plugins/modules/{foreman_location.py => location.py} (96%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 3ea0c054..8957ec0d 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -34,3 +34,5 @@ plugin_routing: redirect: installation_medium foreman_job_template: redirect: job_template + foreman_location: + redirect: location diff --git a/plugins/modules/foreman_location.py b/plugins/modules/location.py similarity index 96% rename from plugins/modules/foreman_location.py rename to plugins/modules/location.py index cbfd2228..939ecfb1 100644 --- a/plugins/modules/foreman_location.py +++ b/plugins/modules/location.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_location +module: location short_description: Manage Location description: - Manage Location @@ -55,7 +55,7 @@ EXAMPLES = ''' # Create a simple location - name: "Create CI Location" - foreman_location: + location: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -66,7 +66,7 @@ # Create a nested location - name: "Create Nested CI Location" - foreman_location: + location: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -76,7 +76,7 @@ # Create a new nested location with parent included in name - name: "Create New Nested Location" - foreman_location: + location: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -85,7 +85,7 @@ # Move a nested location to another parent - name: "Create Nested CI Location" - foreman_location: + location: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/location.yml b/tests/test_playbooks/tasks/location.yml index 070b2e47..cc041426 100644 --- a/tests/test_playbooks/tasks/location.yml +++ b/tests/test_playbooks/tasks/location.yml @@ -2,7 +2,7 @@ - name: "Ensure location '{{ location_name }}' is {{ location_state }}" vars: - location_name: "Test Location" - foreman_location: + location: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 16ef16ad1ea57fc840e15070363261f11a74e3de Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:53 +0200 Subject: [PATCH 47/91] rename foreman_model to hardware_model --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_model.py => hardware_model.py} | 4 ++-- tests/conftest.py | 2 +- tests/fixtures/apidoc/{model.json => hardware_model.json} | 0 .../fixtures/{model-0.yml => hardware_model-0.yml} | 0 .../fixtures/{model-1.yml => hardware_model-1.yml} | 0 .../fixtures/{model-2.yml => hardware_model-2.yml} | 0 .../fixtures/{model-3.yml => hardware_model-3.yml} | 0 .../fixtures/{model-4.yml => hardware_model-4.yml} | 0 .../fixtures/{model-5.yml => hardware_model-5.yml} | 0 tests/test_playbooks/{model.yml => hardware_model.yml} | 0 tests/test_playbooks/tasks/model.yml | 2 +- 12 files changed, 6 insertions(+), 4 deletions(-) rename plugins/modules/{foreman_model.py => hardware_model.py} (98%) rename tests/fixtures/apidoc/{model.json => hardware_model.json} (100%) rename tests/test_playbooks/fixtures/{model-0.yml => hardware_model-0.yml} (100%) rename tests/test_playbooks/fixtures/{model-1.yml => hardware_model-1.yml} (100%) rename tests/test_playbooks/fixtures/{model-2.yml => hardware_model-2.yml} (100%) rename tests/test_playbooks/fixtures/{model-3.yml => hardware_model-3.yml} (100%) rename tests/test_playbooks/fixtures/{model-4.yml => hardware_model-4.yml} (100%) rename tests/test_playbooks/fixtures/{model-5.yml => hardware_model-5.yml} (100%) rename tests/test_playbooks/{model.yml => hardware_model.yml} (100%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 8957ec0d..8befe2f2 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -36,3 +36,5 @@ plugin_routing: redirect: job_template foreman_location: redirect: location + foreman_model: + redirect: hardware_model diff --git a/plugins/modules/foreman_model.py b/plugins/modules/hardware_model.py similarity index 98% rename from plugins/modules/foreman_model.py rename to plugins/modules/hardware_model.py index 0cbd9d69..e53f8fc9 100644 --- a/plugins/modules/foreman_model.py +++ b/plugins/modules/hardware_model.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_model +module: hardware_model short_description: Manage hardware models description: - Manage hardware models @@ -58,7 +58,7 @@ EXAMPLES = ''' - name: "Create ACME Laptop model" - foreman_model: + hardware_model: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/conftest.py b/tests/conftest.py index bdd38f14..fc956b0d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -33,7 +33,7 @@ 'katello_sync', 'lifecycle_environment', 'location', - 'model', + 'hardware_model', 'operatingsystem', 'organization', 'os_default_template', diff --git a/tests/fixtures/apidoc/model.json b/tests/fixtures/apidoc/hardware_model.json similarity index 100% rename from tests/fixtures/apidoc/model.json rename to tests/fixtures/apidoc/hardware_model.json diff --git a/tests/test_playbooks/fixtures/model-0.yml b/tests/test_playbooks/fixtures/hardware_model-0.yml similarity index 100% rename from tests/test_playbooks/fixtures/model-0.yml rename to tests/test_playbooks/fixtures/hardware_model-0.yml diff --git a/tests/test_playbooks/fixtures/model-1.yml b/tests/test_playbooks/fixtures/hardware_model-1.yml similarity index 100% rename from tests/test_playbooks/fixtures/model-1.yml rename to tests/test_playbooks/fixtures/hardware_model-1.yml diff --git a/tests/test_playbooks/fixtures/model-2.yml b/tests/test_playbooks/fixtures/hardware_model-2.yml similarity index 100% rename from tests/test_playbooks/fixtures/model-2.yml rename to tests/test_playbooks/fixtures/hardware_model-2.yml diff --git a/tests/test_playbooks/fixtures/model-3.yml b/tests/test_playbooks/fixtures/hardware_model-3.yml similarity index 100% rename from tests/test_playbooks/fixtures/model-3.yml rename to tests/test_playbooks/fixtures/hardware_model-3.yml diff --git a/tests/test_playbooks/fixtures/model-4.yml b/tests/test_playbooks/fixtures/hardware_model-4.yml similarity index 100% rename from tests/test_playbooks/fixtures/model-4.yml rename to tests/test_playbooks/fixtures/hardware_model-4.yml diff --git a/tests/test_playbooks/fixtures/model-5.yml b/tests/test_playbooks/fixtures/hardware_model-5.yml similarity index 100% rename from tests/test_playbooks/fixtures/model-5.yml rename to tests/test_playbooks/fixtures/hardware_model-5.yml diff --git a/tests/test_playbooks/model.yml b/tests/test_playbooks/hardware_model.yml similarity index 100% rename from tests/test_playbooks/model.yml rename to tests/test_playbooks/hardware_model.yml diff --git a/tests/test_playbooks/tasks/model.yml b/tests/test_playbooks/tasks/model.yml index bf023445..93523ef4 100644 --- a/tests/test_playbooks/tasks/model.yml +++ b/tests/test_playbooks/tasks/model.yml @@ -3,7 +3,7 @@ vars: model_name: "acme_laptop" model_state: "present" - foreman_model: + hardware_model: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 0a6b2481f65b3da88ebd7bd2431e75e6e42355a0 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:53 +0200 Subject: [PATCH 48/91] rename foreman_operatingsystem to operatingsystem --- meta/runtime.yml | 2 ++ .../{foreman_operatingsystem.py => operatingsystem.py} | 8 ++++---- tests/test_playbooks/tasks/operatingsystem.yml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) rename plugins/modules/{foreman_operatingsystem.py => operatingsystem.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 8befe2f2..7166adac 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -38,3 +38,5 @@ plugin_routing: redirect: location foreman_model: redirect: hardware_model + foreman_operatingsystem: + redirect: operatingsystem diff --git a/plugins/modules/foreman_operatingsystem.py b/plugins/modules/operatingsystem.py similarity index 98% rename from plugins/modules/foreman_operatingsystem.py rename to plugins/modules/operatingsystem.py index e7ccba91..acbceaa3 100644 --- a/plugins/modules/foreman_operatingsystem.py +++ b/plugins/modules/operatingsystem.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- -module: foreman_operatingsystem +module: operatingsystem short_description: Manage Operating Systems description: - "Manage Operating System Entities" @@ -117,7 +117,7 @@ EXAMPLES = ''' - name: "Create an Operating System" - foreman_operatingsystem: + operatingsystem: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -131,7 +131,7 @@ state: present - name: "Ensure existence of an Operating System (provide default values)" - foreman_operatingsystem: + operatingsystem: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -142,7 +142,7 @@ state: present_with_defaults - name: "Delete an Operating System" - foreman_operatingsystem: + operatingsystem: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/operatingsystem.yml b/tests/test_playbooks/tasks/operatingsystem.yml index 5a103bd9..6b06a5f2 100644 --- a/tests/test_playbooks/tasks/operatingsystem.yml +++ b/tests/test_playbooks/tasks/operatingsystem.yml @@ -8,7 +8,7 @@ - operatingsystem_family: "Debian" - operatingsystem_password_hash: "SHA256" - operatingsystem_state: "present" - foreman_operatingsystem: + operatingsystem: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From e4230df4e1fd9537b98359ba0a78d93c7a13acb6 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:53 +0200 Subject: [PATCH 49/91] rename foreman_organization to organization --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_organization.py => organization.py} | 4 ++-- tests/test_playbooks/tasks/organization.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{foreman_organization.py => organization.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 7166adac..94370c7c 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -40,3 +40,5 @@ plugin_routing: redirect: hardware_model foreman_operatingsystem: redirect: operatingsystem + foreman_organization: + redirect: organization diff --git a/plugins/modules/foreman_organization.py b/plugins/modules/organization.py similarity index 97% rename from plugins/modules/foreman_organization.py rename to plugins/modules/organization.py index c27855a2..3113e974 100644 --- a/plugins/modules/foreman_organization.py +++ b/plugins/modules/organization.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- -module: foreman_organization +module: organization short_description: Manage Organization description: - Manage Organization @@ -56,7 +56,7 @@ EXAMPLES = ''' - name: "Create CI Organization" - foreman_organization: + organization: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/organization.yml b/tests/test_playbooks/tasks/organization.yml index 8936a0d1..87785822 100644 --- a/tests/test_playbooks/tasks/organization.yml +++ b/tests/test_playbooks/tasks/organization.yml @@ -3,7 +3,7 @@ vars: - organization_name: "Test Organization" - organization_description: "A test organization" - foreman_organization: + organization: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From f21fb5f9b6c0a48f5f003fc9df4fa03ab37202d6 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:53 +0200 Subject: [PATCH 50/91] rename foreman_os_default_template to os_default_template --- meta/runtime.yml | 2 ++ ...oreman_os_default_template.py => os_default_template.py} | 6 +++--- tests/test_playbooks/tasks/os_default_template.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) rename plugins/modules/{foreman_os_default_template.py => os_default_template.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 94370c7c..1d5ffdbf 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -42,3 +42,5 @@ plugin_routing: redirect: operatingsystem foreman_organization: redirect: organization + foreman_os_default_template: + redirect: os_default_template diff --git a/plugins/modules/foreman_os_default_template.py b/plugins/modules/os_default_template.py similarity index 97% rename from plugins/modules/foreman_os_default_template.py rename to plugins/modules/os_default_template.py index 3db6aa7f..fe431198 100644 --- a/plugins/modules/foreman_os_default_template.py +++ b/plugins/modules/os_default_template.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_os_default_template +module: os_default_template short_description: Manage Default Template Associations To Operating Systems description: - "Manage OSDefaultTemplate Entities" @@ -54,7 +54,7 @@ EXAMPLES = ''' - name: "Create an Association" - foreman_os_default_template: + os_default_template: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -64,7 +64,7 @@ state: present - name: "Delete an Association" - foreman_os_default_template: + os_default_template: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/os_default_template.yml b/tests/test_playbooks/tasks/os_default_template.yml index 94c070df..2c3b706b 100644 --- a/tests/test_playbooks/tasks/os_default_template.yml +++ b/tests/test_playbooks/tasks/os_default_template.yml @@ -5,7 +5,7 @@ - provisioning_template_name: "Timetravel finish" - os_default_template_kind: "finish" - os_default_template_state: present - foreman_os_default_template: + os_default_template: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 844e5e7de369e7d3ef692b6b58d4474acb945a0c Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:53 +0200 Subject: [PATCH 51/91] rename foreman_provisioning_template to provisioning_template --- meta/runtime.yml | 2 ++ ...ioning_template.py => provisioning_template.py} | 14 +++++++------- .../test_playbooks/tasks/provisioning_template.yml | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) rename plugins/modules/{foreman_provisioning_template.py => provisioning_template.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 1d5ffdbf..858617ab 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -44,3 +44,5 @@ plugin_routing: redirect: organization foreman_os_default_template: redirect: os_default_template + foreman_provisioning_template: + redirect: provisioning_template diff --git a/plugins/modules/foreman_provisioning_template.py b/plugins/modules/provisioning_template.py similarity index 97% rename from plugins/modules/foreman_provisioning_template.py rename to plugins/modules/provisioning_template.py index e4083696..37fddbca 100644 --- a/plugins/modules/foreman_provisioning_template.py +++ b/plugins/modules/provisioning_template.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_provisioning_template +module: provisioning_template short_description: Manage Provisioning Template description: - "Manage Provisioning Template" @@ -102,7 +102,7 @@ # Keep in mind, that in this case, the inline parameters will be overwritten - name: "Create a Provisioning Template inline" - foreman_provisioning_template: + provisioning_template: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -122,7 +122,7 @@ - TARDIS INC - name: "Create a Provisioning Template from a file" - foreman_provisioning_template: + provisioning_template: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -136,7 +136,7 @@ # Due to the module logic, deleting requires a template dummy, # either inline or from a file. - name: "Delete a Provisioning Template" - foreman_provisioning_template: + provisioning_template: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -148,7 +148,7 @@ state: absent - name: "Create a Provisioning Template from a file and modify with parameter" - foreman_provisioning_template: + provisioning_template: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -163,7 +163,7 @@ # Providing a name in this case wouldn't be very sensible. # Alternatively make use of with_filetree to parse recursively with filter. - name: "Parsing a directory of provisioning templates" - foreman_provisioning_template: + provisioning_template: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -178,7 +178,7 @@ # If the templates are stored locally and the ansible module is executed on a remote host - name: Ensure latest version of all Provisioning Community Templates - foreman_provisioning_template: + provisioning_template: server_url: "https://foreman.example.com" username: "admin" password: "changeme" diff --git a/tests/test_playbooks/tasks/provisioning_template.yml b/tests/test_playbooks/tasks/provisioning_template.yml index 8142767a..b7c292a8 100644 --- a/tests/test_playbooks/tasks/provisioning_template.yml +++ b/tests/test_playbooks/tasks/provisioning_template.yml @@ -14,7 +14,7 @@ %> cd / rm -rf * - foreman_provisioning_template: + provisioning_template: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From c612db2874baa2bcede11c90dd4bd5f889e3c635 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:53 +0200 Subject: [PATCH 52/91] rename foreman_ptable to partition_table --- meta/runtime.yml | 2 ++ .../{foreman_ptable.py => partition_table.py} | 14 +++++++------- tests/conftest.py | 2 +- .../apidoc/{ptable.json => partition_table.json} | 0 .../{ptable-0.yml => partition_table-0.yml} | 0 .../{ptable-1.yml => partition_table-1.yml} | 0 .../{ptable-10.yml => partition_table-10.yml} | 0 .../{ptable-11.yml => partition_table-11.yml} | 0 .../{ptable-12.yml => partition_table-12.yml} | 0 .../{ptable-13.yml => partition_table-13.yml} | 0 .../{ptable-14.yml => partition_table-14.yml} | 0 .../{ptable-15.yml => partition_table-15.yml} | 0 .../{ptable-16.yml => partition_table-16.yml} | 0 .../{ptable-17.yml => partition_table-17.yml} | 0 .../{ptable-18.yml => partition_table-18.yml} | 0 .../{ptable-19.yml => partition_table-19.yml} | 0 .../{ptable-2.yml => partition_table-2.yml} | 0 .../{ptable-20.yml => partition_table-20.yml} | 0 .../{ptable-3.yml => partition_table-3.yml} | 0 .../{ptable-4.yml => partition_table-4.yml} | 0 .../{ptable-5.yml => partition_table-5.yml} | 0 .../{ptable-6.yml => partition_table-6.yml} | 0 .../{ptable-7.yml => partition_table-7.yml} | 0 .../{ptable-8.yml => partition_table-8.yml} | 0 .../{ptable-9.yml => partition_table-9.yml} | 0 .../{ptable.yml => partition_table.yml} | 0 tests/test_playbooks/tasks/ptable.yml | 2 +- 27 files changed, 11 insertions(+), 9 deletions(-) rename plugins/modules/{foreman_ptable.py => partition_table.py} (98%) rename tests/fixtures/apidoc/{ptable.json => partition_table.json} (100%) rename tests/test_playbooks/fixtures/{ptable-0.yml => partition_table-0.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-1.yml => partition_table-1.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-10.yml => partition_table-10.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-11.yml => partition_table-11.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-12.yml => partition_table-12.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-13.yml => partition_table-13.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-14.yml => partition_table-14.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-15.yml => partition_table-15.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-16.yml => partition_table-16.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-17.yml => partition_table-17.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-18.yml => partition_table-18.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-19.yml => partition_table-19.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-2.yml => partition_table-2.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-20.yml => partition_table-20.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-3.yml => partition_table-3.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-4.yml => partition_table-4.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-5.yml => partition_table-5.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-6.yml => partition_table-6.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-7.yml => partition_table-7.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-8.yml => partition_table-8.yml} (100%) rename tests/test_playbooks/fixtures/{ptable-9.yml => partition_table-9.yml} (100%) rename tests/test_playbooks/{ptable.yml => partition_table.yml} (100%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 858617ab..7db37f54 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -46,3 +46,5 @@ plugin_routing: redirect: os_default_template foreman_provisioning_template: redirect: provisioning_template + foreman_ptable: + redirect: partition_table diff --git a/plugins/modules/foreman_ptable.py b/plugins/modules/partition_table.py similarity index 98% rename from plugins/modules/foreman_ptable.py rename to plugins/modules/partition_table.py index 2aa754c6..785c216a 100644 --- a/plugins/modules/foreman_ptable.py +++ b/plugins/modules/partition_table.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_ptable +module: partition_table short_description: Manage Partition Table Template description: - "Manage Partition Table" @@ -78,7 +78,7 @@ # Keep in mind, that in this case, the inline parameters will be overwritten - name: "Create a Partition Table inline" - foreman_ptable: + partition_table: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -97,7 +97,7 @@ - TARDIS INC - name: "Create a Partition Template from a file" - foreman_ptable: + partition_table: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -109,7 +109,7 @@ - TARDIS INC - name: "Delete a Partition Template" - foreman_ptable: + partition_table: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -121,7 +121,7 @@ state: absent - name: "Create a Partition Template from a file and modify with parameter(s)" - foreman_ptable: + partition_table: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -136,7 +136,7 @@ # Providing a name in this case wouldn't be very sensible. # Alternatively make use of with_filetree to parse recursively with filter. - name: "Parsing a directory of partition templates" - foreman_ptable: + partition_table: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -151,7 +151,7 @@ # If the templates are stored locally and the ansible module is executed on a remote host - name: Ensure latest version of all Ptable Community Templates - foreman_ptable: + partition_table: server_url: "https://foreman.example.com" username: "admin" password: "changeme" diff --git a/tests/conftest.py b/tests/conftest.py index fc956b0d..dc0348eb 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -39,7 +39,7 @@ 'os_default_template', 'product', 'provisioning_template', - 'ptable', + 'partition_table', 'realm', 'redhat_manifest', 'repository', diff --git a/tests/fixtures/apidoc/ptable.json b/tests/fixtures/apidoc/partition_table.json similarity index 100% rename from tests/fixtures/apidoc/ptable.json rename to tests/fixtures/apidoc/partition_table.json diff --git a/tests/test_playbooks/fixtures/ptable-0.yml b/tests/test_playbooks/fixtures/partition_table-0.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-0.yml rename to tests/test_playbooks/fixtures/partition_table-0.yml diff --git a/tests/test_playbooks/fixtures/ptable-1.yml b/tests/test_playbooks/fixtures/partition_table-1.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-1.yml rename to tests/test_playbooks/fixtures/partition_table-1.yml diff --git a/tests/test_playbooks/fixtures/ptable-10.yml b/tests/test_playbooks/fixtures/partition_table-10.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-10.yml rename to tests/test_playbooks/fixtures/partition_table-10.yml diff --git a/tests/test_playbooks/fixtures/ptable-11.yml b/tests/test_playbooks/fixtures/partition_table-11.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-11.yml rename to tests/test_playbooks/fixtures/partition_table-11.yml diff --git a/tests/test_playbooks/fixtures/ptable-12.yml b/tests/test_playbooks/fixtures/partition_table-12.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-12.yml rename to tests/test_playbooks/fixtures/partition_table-12.yml diff --git a/tests/test_playbooks/fixtures/ptable-13.yml b/tests/test_playbooks/fixtures/partition_table-13.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-13.yml rename to tests/test_playbooks/fixtures/partition_table-13.yml diff --git a/tests/test_playbooks/fixtures/ptable-14.yml b/tests/test_playbooks/fixtures/partition_table-14.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-14.yml rename to tests/test_playbooks/fixtures/partition_table-14.yml diff --git a/tests/test_playbooks/fixtures/ptable-15.yml b/tests/test_playbooks/fixtures/partition_table-15.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-15.yml rename to tests/test_playbooks/fixtures/partition_table-15.yml diff --git a/tests/test_playbooks/fixtures/ptable-16.yml b/tests/test_playbooks/fixtures/partition_table-16.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-16.yml rename to tests/test_playbooks/fixtures/partition_table-16.yml diff --git a/tests/test_playbooks/fixtures/ptable-17.yml b/tests/test_playbooks/fixtures/partition_table-17.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-17.yml rename to tests/test_playbooks/fixtures/partition_table-17.yml diff --git a/tests/test_playbooks/fixtures/ptable-18.yml b/tests/test_playbooks/fixtures/partition_table-18.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-18.yml rename to tests/test_playbooks/fixtures/partition_table-18.yml diff --git a/tests/test_playbooks/fixtures/ptable-19.yml b/tests/test_playbooks/fixtures/partition_table-19.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-19.yml rename to tests/test_playbooks/fixtures/partition_table-19.yml diff --git a/tests/test_playbooks/fixtures/ptable-2.yml b/tests/test_playbooks/fixtures/partition_table-2.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-2.yml rename to tests/test_playbooks/fixtures/partition_table-2.yml diff --git a/tests/test_playbooks/fixtures/ptable-20.yml b/tests/test_playbooks/fixtures/partition_table-20.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-20.yml rename to tests/test_playbooks/fixtures/partition_table-20.yml diff --git a/tests/test_playbooks/fixtures/ptable-3.yml b/tests/test_playbooks/fixtures/partition_table-3.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-3.yml rename to tests/test_playbooks/fixtures/partition_table-3.yml diff --git a/tests/test_playbooks/fixtures/ptable-4.yml b/tests/test_playbooks/fixtures/partition_table-4.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-4.yml rename to tests/test_playbooks/fixtures/partition_table-4.yml diff --git a/tests/test_playbooks/fixtures/ptable-5.yml b/tests/test_playbooks/fixtures/partition_table-5.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-5.yml rename to tests/test_playbooks/fixtures/partition_table-5.yml diff --git a/tests/test_playbooks/fixtures/ptable-6.yml b/tests/test_playbooks/fixtures/partition_table-6.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-6.yml rename to tests/test_playbooks/fixtures/partition_table-6.yml diff --git a/tests/test_playbooks/fixtures/ptable-7.yml b/tests/test_playbooks/fixtures/partition_table-7.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-7.yml rename to tests/test_playbooks/fixtures/partition_table-7.yml diff --git a/tests/test_playbooks/fixtures/ptable-8.yml b/tests/test_playbooks/fixtures/partition_table-8.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-8.yml rename to tests/test_playbooks/fixtures/partition_table-8.yml diff --git a/tests/test_playbooks/fixtures/ptable-9.yml b/tests/test_playbooks/fixtures/partition_table-9.yml similarity index 100% rename from tests/test_playbooks/fixtures/ptable-9.yml rename to tests/test_playbooks/fixtures/partition_table-9.yml diff --git a/tests/test_playbooks/ptable.yml b/tests/test_playbooks/partition_table.yml similarity index 100% rename from tests/test_playbooks/ptable.yml rename to tests/test_playbooks/partition_table.yml diff --git a/tests/test_playbooks/tasks/ptable.yml b/tests/test_playbooks/tasks/ptable.yml index a5ed71c3..81285fff 100644 --- a/tests/test_playbooks/tasks/ptable.yml +++ b/tests/test_playbooks/tasks/ptable.yml @@ -13,7 +13,7 @@ zerombr clearpart --all --initlabel autopart - foreman_ptable: + partition_table: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From a7d30c2c9ed940058575171f9f23c1d298fe9e11 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:53 +0200 Subject: [PATCH 53/91] rename foreman_realm to realm --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_realm.py => realm.py} | 4 ++-- tests/test_playbooks/tasks/realm.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{foreman_realm.py => realm.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 7db37f54..b10dec3a 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -48,3 +48,5 @@ plugin_routing: redirect: provisioning_template foreman_ptable: redirect: partition_table + foreman_realm: + redirect: realm diff --git a/plugins/modules/foreman_realm.py b/plugins/modules/realm.py similarity index 98% rename from plugins/modules/foreman_realm.py rename to plugins/modules/realm.py index 62a750ab..afffa99b 100644 --- a/plugins/modules/foreman_realm.py +++ b/plugins/modules/realm.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_realm +module: realm short_description: Manage Realms description: - Manage Realms @@ -59,7 +59,7 @@ EXAMPLES = ''' - name: "Create EXAMPLE.LOCAL Realm" - foreman_realm: + realm: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/realm.yml b/tests/test_playbooks/tasks/realm.yml index a35b676b..04bc7fb4 100644 --- a/tests/test_playbooks/tasks/realm.yml +++ b/tests/test_playbooks/tasks/realm.yml @@ -4,7 +4,7 @@ - realm_name: "EXAMPLE.LOCAL" - realm_proxy: "{{ foreman_proxy }}" - realm_type: "FreeIPA" - foreman_realm: + realm: server_url: "{{ foreman_server_url }}" username: "{{ foreman_username }}" password: "{{ foreman_password }}" From f39b9b1a8c7736cc977aaf8cf74fd703f5022982 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:53 +0200 Subject: [PATCH 54/91] rename foreman_role to role --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_role.py => role.py} | 4 ++-- tests/test_playbooks/tasks/role.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{foreman_role.py => role.py} (99%) diff --git a/meta/runtime.yml b/meta/runtime.yml index b10dec3a..a2b8b516 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -50,3 +50,5 @@ plugin_routing: redirect: partition_table foreman_realm: redirect: realm + foreman_role: + redirect: role diff --git a/plugins/modules/foreman_role.py b/plugins/modules/role.py similarity index 99% rename from plugins/modules/foreman_role.py rename to plugins/modules/role.py index 6df17c15..89ccea95 100644 --- a/plugins/modules/foreman_role.py +++ b/plugins/modules/role.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_role +module: role short_description: Manage Roles description: - Create, update, and delete Roles @@ -63,7 +63,7 @@ EXAMPLES = ''' - name: role - foreman_role: + role: name: "Provisioner" description: "Only provision on libvirt" locations: diff --git a/tests/test_playbooks/tasks/role.yml b/tests/test_playbooks/tasks/role.yml index 4781a733..a8b90756 100644 --- a/tests/test_playbooks/tasks/role.yml +++ b/tests/test_playbooks/tasks/role.yml @@ -8,7 +8,7 @@ role_organizations: - Test Organization role_state: present - foreman_role: + role: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From d4ebfa4aa7068be7bedfe9d844825c3f67e2a6bc Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:53 +0200 Subject: [PATCH 55/91] rename foreman_scap_content to scap_content --- meta/runtime.yml | 2 ++ .../modules/{foreman_scap_content.py => scap_content.py} | 8 ++++---- tests/test_playbooks/tasks/scap_content.yml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) rename plugins/modules/{foreman_scap_content.py => scap_content.py} (96%) diff --git a/meta/runtime.yml b/meta/runtime.yml index a2b8b516..f4a6edc0 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -52,3 +52,5 @@ plugin_routing: redirect: realm foreman_role: redirect: role + foreman_scap_content: + redirect: scap_content diff --git a/plugins/modules/foreman_scap_content.py b/plugins/modules/scap_content.py similarity index 96% rename from plugins/modules/foreman_scap_content.py rename to plugins/modules/scap_content.py index b8b3ad46..11a632d2 100644 --- a/plugins/modules/foreman_scap_content.py +++ b/plugins/modules/scap_content.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_scap_content +module: scap_content short_description: Manage SCAP content. description: - Create, update, and delete SCAP content. @@ -51,7 +51,7 @@ EXAMPLES = ''' - name: Create SCAP content - foreman_scap_content: + scap_content: title: "Red Hat firefox default content" scap_file: "/home/user/Downloads/ssg-firefox-ds.xml" original_filename: "ssg-firefox-ds.xml" @@ -65,7 +65,7 @@ state: present - name: Update SCAP content - foreman_scap_content: + scap_content: title: "Red Hat firefox default content" updated_title: "Updated scap content title" scap_file: "/home/user/Downloads/updated-ssg-firefox-ds.xml" @@ -82,7 +82,7 @@ state: present - name: Delete SCAP content - foreman_scap_content: + scap_content: title: "Red Hat firefox default content" server_url: "https://foreman.example.com" username: "admin" diff --git a/tests/test_playbooks/tasks/scap_content.yml b/tests/test_playbooks/tasks/scap_content.yml index 7d193daf..aff4470b 100644 --- a/tests/test_playbooks/tasks/scap_content.yml +++ b/tests/test_playbooks/tasks/scap_content.yml @@ -2,7 +2,7 @@ - name: "Create/Update/Delete SCAP content." vars: scap_content_state: "present" - foreman_scap_content: + scap_content: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From b7fa015dd438491e0948e8aea37f20bcaf8b5a79 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:54 +0200 Subject: [PATCH 56/91] rename foreman_scap_tailoring_file to scap_tailoring_file --- meta/runtime.yml | 2 ++ ...eman_scap_tailoring_file.py => scap_tailoring_file.py} | 8 ++++---- tests/test_playbooks/tasks/scap_tailoring_file.yml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) rename plugins/modules/{foreman_scap_tailoring_file.py => scap_tailoring_file.py} (96%) diff --git a/meta/runtime.yml b/meta/runtime.yml index f4a6edc0..c858892e 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -54,3 +54,5 @@ plugin_routing: redirect: role foreman_scap_content: redirect: scap_content + foreman_scap_tailoring_file: + redirect: scap_tailoring_file diff --git a/plugins/modules/foreman_scap_tailoring_file.py b/plugins/modules/scap_tailoring_file.py similarity index 96% rename from plugins/modules/foreman_scap_tailoring_file.py rename to plugins/modules/scap_tailoring_file.py index b70360ac..521972f9 100644 --- a/plugins/modules/foreman_scap_tailoring_file.py +++ b/plugins/modules/scap_tailoring_file.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_scap_tailoring_file +module: scap_tailoring_file short_description: Manage SCAP tailoring files. description: - Create, update, and delete SCAP tailoring files. @@ -51,7 +51,7 @@ EXAMPLES = ''' - name: Create SCAP tailoring file - foreman_scap_tailoring_file: + scap_tailoring_file: name: "Red Hat firefox default content" scap_file: "/home/user/Downloads/ssg-firefox-ds-tailoring.xml" original_filename: "ssg-firefox-ds-tailoring.xml" @@ -65,7 +65,7 @@ state: present - name: Update SCAP tailoring file - foreman_scap_tailoring_file: + scap_tailoring_file: name: "Red Hat firefox default content" updated_name: "Updated tailoring file name" scap_file: "/home/user/Downloads/updated-ssg-firefox-ds-tailoring.xml" @@ -82,7 +82,7 @@ state: present - name: Delete SCAP tailoring file - foreman_scap_tailoring_file: + scap_tailoring_file: name: "Red Hat firefox default content" server_url: "https://foreman.example.com" username: "admin" diff --git a/tests/test_playbooks/tasks/scap_tailoring_file.yml b/tests/test_playbooks/tasks/scap_tailoring_file.yml index ca55b850..7d8be3bd 100644 --- a/tests/test_playbooks/tasks/scap_tailoring_file.yml +++ b/tests/test_playbooks/tasks/scap_tailoring_file.yml @@ -2,7 +2,7 @@ - name: "Create/Update/Delete tailoring file." vars: scap_tailoring_file_state: "present" - foreman_scap_tailoring_file: + scap_tailoring_file: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 1c5a6dbc1d9d81024ecce53e7c6e6734350a398b Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:54 +0200 Subject: [PATCH 57/91] rename foreman_scc_account to scc_account --- meta/runtime.yml | 2 ++ .../modules/{foreman_scc_account.py => scc_account.py} | 8 ++++---- tests/test_playbooks/tasks/scc_account.yml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) rename plugins/modules/{foreman_scc_account.py => scc_account.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index c858892e..eb7e9bc7 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -56,3 +56,5 @@ plugin_routing: redirect: scap_content foreman_scap_tailoring_file: redirect: scap_tailoring_file + foreman_scc_account: + redirect: scc_account diff --git a/plugins/modules/foreman_scc_account.py b/plugins/modules/scc_account.py similarity index 98% rename from plugins/modules/foreman_scc_account.py rename to plugins/modules/scc_account.py index 545fe7b8..233ef3ef 100644 --- a/plugins/modules/foreman_scc_account.py +++ b/plugins/modules/scc_account.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- -module: foreman_scc_account +module: scc_account short_description: Manage SccAccount description: - "Manage Suse Customer Center Account Entities" @@ -84,7 +84,7 @@ EXAMPLES = ''' - name: "Create a suse customer center account" - foreman_scc_account: + scc_account: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -95,7 +95,7 @@ state: present - name: "Update a suse customer center account" - foreman_scc_account: + scc_account: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -103,7 +103,7 @@ state: present - name: "Delete a suse customer center account" - foreman_scc_account: + scc_account: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/scc_account.yml b/tests/test_playbooks/tasks/scc_account.yml index 57fac57e..34525534 100644 --- a/tests/test_playbooks/tasks/scc_account.yml +++ b/tests/test_playbooks/tasks/scc_account.yml @@ -4,7 +4,7 @@ scc_account_state: "present" scc_account_name: 'Test' organization_name: 'Test Organization' - foreman_scc_account: + scc_account: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 1a2468812d789ddcf1e0171f04a7fd66ad3b441c Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:54 +0200 Subject: [PATCH 58/91] rename foreman_scc_product to scc_product --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_scc_product.py => scc_product.py} | 4 ++-- tests/test_playbooks/tasks/scc_product.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{foreman_scc_product.py => scc_product.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index eb7e9bc7..4cd08bc4 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -58,3 +58,5 @@ plugin_routing: redirect: scap_tailoring_file foreman_scc_account: redirect: scc_account + foreman_scc_product: + redirect: scc_product diff --git a/plugins/modules/foreman_scc_product.py b/plugins/modules/scc_product.py similarity index 98% rename from plugins/modules/foreman_scc_product.py rename to plugins/modules/scc_product.py index 643d4a23..434f48a7 100644 --- a/plugins/modules/foreman_scc_product.py +++ b/plugins/modules/scc_product.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- -module: foreman_scc_product +module: scc_product short_description: Subscribe Suse Customer Center Account Product description: - "Manage Suse Customer Center Product Entities" @@ -52,7 +52,7 @@ EXAMPLES = ''' - name: "Subscribe to suse customer center product" - foreman_scc_product: + scc_product: friendly_name: "Product1" scc_account: "Test" organization: "Test Organization" diff --git a/tests/test_playbooks/tasks/scc_product.yml b/tests/test_playbooks/tasks/scc_product.yml index ddae8e9a..feea9bab 100644 --- a/tests/test_playbooks/tasks/scc_product.yml +++ b/tests/test_playbooks/tasks/scc_product.yml @@ -2,7 +2,7 @@ - name: "Ensure scc_product '{{ scc_product_name }}' change: {{ expected_change }} " vars: organization_name: 'Test Organization' - foreman_scc_product: + scc_product: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From ca5c31b16f3a93fb131027f4b5bc285ff5f53260 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:54 +0200 Subject: [PATCH 59/91] rename foreman_search_facts to resource_info --- meta/runtime.yml | 2 ++ plugins/modules/katello_repository_set.py | 4 ++-- plugins/modules/katello_sync.py | 2 +- .../{foreman_search_facts.py => resource_info.py} | 12 ++++++------ tests/conftest.py | 2 +- .../apidoc/{search_facts.json => resource_info.json} | 0 .../{search_facts-0.yml => resource_info-0.yml} | 0 .../{search_facts-1.yml => resource_info-1.yml} | 0 .../{search_facts-2.yml => resource_info-2.yml} | 0 .../{search_facts-3.yml => resource_info-3.yml} | 0 .../{search_facts-4.yml => resource_info-4.yml} | 0 .../{search_facts-5.yml => resource_info-5.yml} | 0 .../{search_facts-6.yml => resource_info-6.yml} | 0 .../{search_facts.yml => resource_info.yml} | 4 ++-- tests/test_playbooks/tasks/search_facts.yml | 2 +- tests/test_playbooks/tasks/setting_fact.yml | 2 +- 16 files changed, 16 insertions(+), 14 deletions(-) rename plugins/modules/{foreman_search_facts.py => resource_info.py} (97%) rename tests/fixtures/apidoc/{search_facts.json => resource_info.json} (100%) rename tests/test_playbooks/fixtures/{search_facts-0.yml => resource_info-0.yml} (100%) rename tests/test_playbooks/fixtures/{search_facts-1.yml => resource_info-1.yml} (100%) rename tests/test_playbooks/fixtures/{search_facts-2.yml => resource_info-2.yml} (100%) rename tests/test_playbooks/fixtures/{search_facts-3.yml => resource_info-3.yml} (100%) rename tests/test_playbooks/fixtures/{search_facts-4.yml => resource_info-4.yml} (100%) rename tests/test_playbooks/fixtures/{search_facts-5.yml => resource_info-5.yml} (100%) rename tests/test_playbooks/fixtures/{search_facts-6.yml => resource_info-6.yml} (100%) rename tests/test_playbooks/{search_facts.yml => resource_info.yml} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 4cd08bc4..dce92eeb 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -60,3 +60,5 @@ plugin_routing: redirect: scc_account foreman_scc_product: redirect: scc_product + foreman_search_facts: + redirect: resource_info diff --git a/plugins/modules/katello_repository_set.py b/plugins/modules/katello_repository_set.py index 743433f6..6f6fcfec 100644 --- a/plugins/modules/katello_repository_set.py +++ b/plugins/modules/katello_repository_set.py @@ -166,7 +166,7 @@ state: enabled - name: "Search for possible repository sets of a product" - foreman_search_facts: + resource_info: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -179,7 +179,7 @@ var: data - name: "Search for possible repository sets by label" - foreman_search_facts: + resource_info: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/plugins/modules/katello_sync.py b/plugins/modules/katello_sync.py index 68011500..f2d8b2e7 100644 --- a/plugins/modules/katello_sync.py +++ b/plugins/modules/katello_sync.py @@ -61,7 +61,7 @@ # Sync all repositories - name: Get all repositories - foreman_search_facts: + resource_info: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/plugins/modules/foreman_search_facts.py b/plugins/modules/resource_info.py similarity index 97% rename from plugins/modules/foreman_search_facts.py rename to plugins/modules/resource_info.py index c1e9b463..4c78fbb1 100644 --- a/plugins/modules/foreman_search_facts.py +++ b/plugins/modules/resource_info.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- -module: foreman_search_facts +module: resource_info short_description: Gather facts about resources description: - "Gather facts about resources" @@ -67,7 +67,7 @@ EXAMPLES = ''' - name: "Read a Setting" - foreman_search_facts: + resource_info: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -78,7 +78,7 @@ var: result.resources[0].value - name: "Read all Registries (Katello)" - foreman_search_facts: + resource_info: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -89,7 +89,7 @@ with_items: "{{ result.resources }}" - name: "Read all Organizations with full details" - foreman_search_facts: + resource_info: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -100,7 +100,7 @@ var: result.resources - name: Get all existing subscriptions for organization with id 1 (Katello) - foreman_search_facts: + resource_info: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -112,7 +112,7 @@ var: result - name: Get all existing activation keys for organization ACME (Katello) - foreman_search_facts: + resource_info: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/conftest.py b/tests/conftest.py index dc0348eb..51255b77 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -49,7 +49,7 @@ 'scc_product', 'scap_content', 'scap_tailoring_file', - 'search_facts', + 'resource_info', 'setting', 'smart_class_parameter', 'snapshot', diff --git a/tests/fixtures/apidoc/search_facts.json b/tests/fixtures/apidoc/resource_info.json similarity index 100% rename from tests/fixtures/apidoc/search_facts.json rename to tests/fixtures/apidoc/resource_info.json diff --git a/tests/test_playbooks/fixtures/search_facts-0.yml b/tests/test_playbooks/fixtures/resource_info-0.yml similarity index 100% rename from tests/test_playbooks/fixtures/search_facts-0.yml rename to tests/test_playbooks/fixtures/resource_info-0.yml diff --git a/tests/test_playbooks/fixtures/search_facts-1.yml b/tests/test_playbooks/fixtures/resource_info-1.yml similarity index 100% rename from tests/test_playbooks/fixtures/search_facts-1.yml rename to tests/test_playbooks/fixtures/resource_info-1.yml diff --git a/tests/test_playbooks/fixtures/search_facts-2.yml b/tests/test_playbooks/fixtures/resource_info-2.yml similarity index 100% rename from tests/test_playbooks/fixtures/search_facts-2.yml rename to tests/test_playbooks/fixtures/resource_info-2.yml diff --git a/tests/test_playbooks/fixtures/search_facts-3.yml b/tests/test_playbooks/fixtures/resource_info-3.yml similarity index 100% rename from tests/test_playbooks/fixtures/search_facts-3.yml rename to tests/test_playbooks/fixtures/resource_info-3.yml diff --git a/tests/test_playbooks/fixtures/search_facts-4.yml b/tests/test_playbooks/fixtures/resource_info-4.yml similarity index 100% rename from tests/test_playbooks/fixtures/search_facts-4.yml rename to tests/test_playbooks/fixtures/resource_info-4.yml diff --git a/tests/test_playbooks/fixtures/search_facts-5.yml b/tests/test_playbooks/fixtures/resource_info-5.yml similarity index 100% rename from tests/test_playbooks/fixtures/search_facts-5.yml rename to tests/test_playbooks/fixtures/resource_info-5.yml diff --git a/tests/test_playbooks/fixtures/search_facts-6.yml b/tests/test_playbooks/fixtures/resource_info-6.yml similarity index 100% rename from tests/test_playbooks/fixtures/search_facts-6.yml rename to tests/test_playbooks/fixtures/resource_info-6.yml diff --git a/tests/test_playbooks/search_facts.yml b/tests/test_playbooks/resource_info.yml similarity index 97% rename from tests/test_playbooks/search_facts.yml rename to tests/test_playbooks/resource_info.yml index 650e2ecb..5dfde542 100644 --- a/tests/test_playbooks/search_facts.yml +++ b/tests/test_playbooks/resource_info.yml @@ -45,7 +45,7 @@ organization: "Facts Organization" return_length: 1 - name: find organization id - foreman_search_facts: + resource_info: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" @@ -60,7 +60,7 @@ organization_id: "{{ org_search.resources[0]['id'] }}" return_length: 1 - name: Run with invalid resource - foreman_search_facts: + resource_info: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" diff --git a/tests/test_playbooks/tasks/search_facts.yml b/tests/test_playbooks/tasks/search_facts.yml index 7bfee86d..5ac7ea69 100644 --- a/tests/test_playbooks/tasks/search_facts.yml +++ b/tests/test_playbooks/tasks/search_facts.yml @@ -1,6 +1,6 @@ --- - name: "Find '{{ resource }}' resources" - foreman_search_facts: + resource_info: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" diff --git a/tests/test_playbooks/tasks/setting_fact.yml b/tests/test_playbooks/tasks/setting_fact.yml index 746a9515..3a544cc5 100644 --- a/tests/test_playbooks/tasks/setting_fact.yml +++ b/tests/test_playbooks/tasks/setting_fact.yml @@ -1,6 +1,6 @@ --- - name: "Read setting '{{ setting_name }}'" - foreman_search_facts: + resource_info: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 4b8f127140052ade535c549e8466ac7faa02d1c5 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:54 +0200 Subject: [PATCH 60/91] rename foreman_setting to setting --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_setting.py => setting.py} | 6 +++--- tests/test_playbooks/tasks/setting.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) rename plugins/modules/{foreman_setting.py => setting.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index dce92eeb..24306560 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -62,3 +62,5 @@ plugin_routing: redirect: scc_product foreman_search_facts: redirect: resource_info + foreman_setting: + redirect: setting diff --git a/plugins/modules/foreman_setting.py b/plugins/modules/setting.py similarity index 98% rename from plugins/modules/foreman_setting.py rename to plugins/modules/setting.py index 6debd5b6..479e9fbb 100644 --- a/plugins/modules/foreman_setting.py +++ b/plugins/modules/setting.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_setting +module: setting short_description: Manage Settings description: - "Manage Setting Entities" @@ -49,7 +49,7 @@ EXAMPLES = ''' - name: "Set a Setting" - foreman_setting: + setting: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -57,7 +57,7 @@ value: "http://localhost:8088" - name: "Reset a Setting" - foreman_setting: + setting: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/setting.yml b/tests/test_playbooks/tasks/setting.yml index 6d0a8427..b6525f9c 100644 --- a/tests/test_playbooks/tasks/setting.yml +++ b/tests/test_playbooks/tasks/setting.yml @@ -2,7 +2,7 @@ - name: "Ensure setting '{{ setting_name }}' is {{ setting_value | default(false) | ternary(\"'\" + (setting_value | string) | default('') + \"'\", 'undefined') }}" vars: - setting_name: 'login_text' - foreman_setting: + setting: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 1653185b4f355351e093e2ab763547ede99a8dc5 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:54 +0200 Subject: [PATCH 61/91] rename foreman_smart_class_parameter to smart_class_parameter --- meta/runtime.yml | 2 ++ ...an_smart_class_parameter.py => smart_class_parameter.py} | 6 +++--- tests/test_playbooks/tasks/smart_class_parameter.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) rename plugins/modules/{foreman_smart_class_parameter.py => smart_class_parameter.py} (99%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 24306560..2a759e85 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -64,3 +64,5 @@ plugin_routing: redirect: resource_info foreman_setting: redirect: setting + foreman_smart_class_parameter: + redirect: smart_class_parameter diff --git a/plugins/modules/foreman_smart_class_parameter.py b/plugins/modules/smart_class_parameter.py similarity index 99% rename from plugins/modules/foreman_smart_class_parameter.py rename to plugins/modules/smart_class_parameter.py index a72ee91c..25bc49da 100644 --- a/plugins/modules/foreman_smart_class_parameter.py +++ b/plugins/modules/smart_class_parameter.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_smart_class_parameter +module: smart_class_parameter short_description: Manage Smart Class Parameters description: - Update Smart Class Parameters. @@ -125,7 +125,7 @@ EXAMPLES = ''' - name: "Update prometheus::server alertmanagers_config param default value" - foreman_smart_class_parameter: + smart_class_parameter: puppetclass_name: "prometheus::server" parameter: alertmanagers_config override: true @@ -137,7 +137,7 @@ state: present - name: "Update prometheus::server alertmanagers_config param default value" - foreman_smart_class_parameter: + smart_class_parameter: puppetclass_name: "prometheus::server" parameter: alertmanagers_config override: true diff --git a/tests/test_playbooks/tasks/smart_class_parameter.yml b/tests/test_playbooks/tasks/smart_class_parameter.yml index dbc494bd..31925787 100644 --- a/tests/test_playbooks/tasks/smart_class_parameter.yml +++ b/tests/test_playbooks/tasks/smart_class_parameter.yml @@ -2,7 +2,7 @@ - name: "Ensure SmartClassParameter '{{ smart_class_parameter_puppetclass_name }}::{{ smart_class_parameter_parameter }}' is {{ smart_class_parameter_state }}" vars: smart_class_parameter_state: present - foreman_smart_class_parameter: + smart_class_parameter: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 15b6f2f7a04e06f704b97ff29b5628a859202d56 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:54 +0200 Subject: [PATCH 62/91] rename foreman_snapshot to snapshot --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_snapshot.py => snapshot.py} | 10 +++++----- tests/test_playbooks/tasks/snapshot.yml | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) rename plugins/modules/{foreman_snapshot.py => snapshot.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 2a759e85..c6e7fa2f 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -66,3 +66,5 @@ plugin_routing: redirect: setting foreman_smart_class_parameter: redirect: smart_class_parameter + foreman_snapshot: + redirect: snapshot diff --git a/plugins/modules/foreman_snapshot.py b/plugins/modules/snapshot.py similarity index 97% rename from plugins/modules/foreman_snapshot.py rename to plugins/modules/snapshot.py index f9a05b04..d3d9801c 100644 --- a/plugins/modules/foreman_snapshot.py +++ b/plugins/modules/snapshot.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_snapshot +module: snapshot short_description: Manage Snapshots description: - "Manage Snapshots for Host Entities" @@ -62,7 +62,7 @@ EXAMPLES = ''' - name: "Create a Snapshot" - foreman_snapshot: + snapshot: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -71,7 +71,7 @@ state: present - name: "Update a Snapshot" - foreman_snapshot: + snapshot: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -81,7 +81,7 @@ state: present - name: "Revert a Snapshot" - foreman_snapshot: + snapshot: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -90,7 +90,7 @@ state: reverted - name: "Delete a Snapshot" - foreman_snapshot: + snapshot: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/snapshot.yml b/tests/test_playbooks/tasks/snapshot.yml index 56d24a41..bb023452 100644 --- a/tests/test_playbooks/tasks/snapshot.yml +++ b/tests/test_playbooks/tasks/snapshot.yml @@ -3,7 +3,7 @@ vars: snapshot_name: "ansible" snapshot_state: present - foreman_snapshot: + snapshot: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 6d143979f069f41eb65d8c2ba0c1b72d4bcd5360 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:54 +0200 Subject: [PATCH 63/91] rename foreman_subnet to subnet --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_subnet.py => subnet.py} | 4 ++-- tests/test_playbooks/tasks/subnet.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{foreman_subnet.py => subnet.py} (99%) diff --git a/meta/runtime.yml b/meta/runtime.yml index c6e7fa2f..24cefe0f 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -68,3 +68,5 @@ plugin_routing: redirect: smart_class_parameter foreman_snapshot: redirect: snapshot + foreman_subnet: + redirect: subnet diff --git a/plugins/modules/foreman_subnet.py b/plugins/modules/subnet.py similarity index 99% rename from plugins/modules/foreman_subnet.py rename to plugins/modules/subnet.py index 3d5cb4ea..98a7a8ec 100644 --- a/plugins/modules/foreman_subnet.py +++ b/plugins/modules/subnet.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_subnet +module: subnet short_description: Manage Subnets description: - Create, update, and delete Subnets @@ -154,7 +154,7 @@ EXAMPLES = ''' - name: My subnet - foreman_subnet: + subnet: name: "My subnet" description: "My description" network: "192.168.0.0" diff --git a/tests/test_playbooks/tasks/subnet.yml b/tests/test_playbooks/tasks/subnet.yml index ee36972c..e5a3ec20 100644 --- a/tests/test_playbooks/tasks/subnet.yml +++ b/tests/test_playbooks/tasks/subnet.yml @@ -4,7 +4,7 @@ subnet_name: "Test Subnet" subnet_network: '192.168.200.0' subnet_state: present - foreman_subnet: + subnet: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 64d96afefb8dc682ce4fa1862f8bf4a7cdc13665 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:54 +0200 Subject: [PATCH 64/91] rename foreman_templates_import to templates_import --- meta/runtime.yml | 2 ++ .../{foreman_templates_import.py => templates_import.py} | 4 ++-- tests/test_playbooks/tasks/templates_import.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{foreman_templates_import.py => templates_import.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 24cefe0f..97867d58 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -70,3 +70,5 @@ plugin_routing: redirect: snapshot foreman_subnet: redirect: subnet + foreman_templates_import: + redirect: templates_import diff --git a/plugins/modules/foreman_templates_import.py b/plugins/modules/templates_import.py similarity index 98% rename from plugins/modules/foreman_templates_import.py rename to plugins/modules/templates_import.py index 6bf2f484..eaf81024 100644 --- a/plugins/modules/foreman_templates_import.py +++ b/plugins/modules/templates_import.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_templates_import +module: templates_import short_description: Sync templates from a repository description: - Sync provisioning templates, report_templates, partition tables and job templates from external git repository or file system. @@ -100,7 +100,7 @@ EXAMPLES = ''' - name: Sync templates from git repo - foreman_templates_import: + templates_import: repo: https://github.com/theforeman/community-templates.git branch: 1.24-stable associate: new diff --git a/tests/test_playbooks/tasks/templates_import.yml b/tests/test_playbooks/tasks/templates_import.yml index 0e83afad..475ee7bf 100644 --- a/tests/test_playbooks/tasks/templates_import.yml +++ b/tests/test_playbooks/tasks/templates_import.yml @@ -1,5 +1,5 @@ - name: Sync templates in from a git repo - foreman_templates_import: + templates_import: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From d420015c920899bed2054d2a70d7163686d16bf8 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:55 +0200 Subject: [PATCH 65/91] rename foreman_usergroup to usergroup --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_usergroup.py => usergroup.py} | 4 ++-- tests/test_playbooks/tasks/usergroup.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{foreman_usergroup.py => usergroup.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 97867d58..956c06da 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -72,3 +72,5 @@ plugin_routing: redirect: subnet foreman_templates_import: redirect: templates_import + foreman_usergroup: + redirect: usergroup diff --git a/plugins/modules/foreman_usergroup.py b/plugins/modules/usergroup.py similarity index 98% rename from plugins/modules/foreman_usergroup.py rename to plugins/modules/usergroup.py index a6f73435..dda52f51 100644 --- a/plugins/modules/foreman_usergroup.py +++ b/plugins/modules/usergroup.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_usergroup +module: usergroup short_description: Manage User groups description: - Create, update, and delete user groups @@ -73,7 +73,7 @@ EXAMPLES = ''' - name: Create a user group - foreman_usergroup: + usergroup: name: test admin: no roles: diff --git a/tests/test_playbooks/tasks/usergroup.yml b/tests/test_playbooks/tasks/usergroup.yml index 2d3e8c4b..95ee260f 100644 --- a/tests/test_playbooks/tasks/usergroup.yml +++ b/tests/test_playbooks/tasks/usergroup.yml @@ -3,7 +3,7 @@ vars: usergroup_name: "testgroup" usergroup__state: present - foreman_usergroup: + usergroup: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 59f0241b5d4de90ce10cd12c093b6a13de1beb20 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:55 +0200 Subject: [PATCH 66/91] rename foreman_user to user --- meta/runtime.yml | 2 ++ plugins/modules/{foreman_user.py => user.py} | 8 ++++---- tests/test_playbooks/tasks/user.yml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) rename plugins/modules/{foreman_user.py => user.py} (99%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 956c06da..69deb649 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -74,3 +74,5 @@ plugin_routing: redirect: templates_import foreman_usergroup: redirect: usergroup + foreman_user: + redirect: user diff --git a/plugins/modules/foreman_user.py b/plugins/modules/user.py similarity index 99% rename from plugins/modules/foreman_user.py rename to plugins/modules/user.py index e19dc2ca..a81d6194 100644 --- a/plugins/modules/foreman_user.py +++ b/plugins/modules/user.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: foreman_user +module: user short_description: Manage Users description: - Create, update, and delete users @@ -281,7 +281,7 @@ EXAMPLES = ''' - name: Create a user - foreman_user: + user: name: test firstname: Test lastname: Userson @@ -303,13 +303,13 @@ state: present - name: Update a user - foreman_user: + user: name: test firstname: Tester state: present - name: Change password - foreman_user: + user: name: test user_password: newp@ss diff --git a/tests/test_playbooks/tasks/user.yml b/tests/test_playbooks/tasks/user.yml index b712c3c7..f9d57592 100644 --- a/tests/test_playbooks/tasks/user.yml +++ b/tests/test_playbooks/tasks/user.yml @@ -19,7 +19,7 @@ user_organizations: - Test Organization user_state: present - foreman_user: + user: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 8478f109298ab017ddb37431ff174364d868443a Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:55 +0200 Subject: [PATCH 67/91] rename katello_activation_key to activation_key --- meta/runtime.yml | 2 ++ .../modules/{katello_activation_key.py => activation_key.py} | 4 ++-- tests/test_playbooks/tasks/activation_key.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{katello_activation_key.py => activation_key.py} (99%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 69deb649..813ab2fe 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -76,3 +76,5 @@ plugin_routing: redirect: usergroup foreman_user: redirect: user + katello_activation_key: + redirect: activation_key diff --git a/plugins/modules/katello_activation_key.py b/plugins/modules/activation_key.py similarity index 99% rename from plugins/modules/katello_activation_key.py rename to plugins/modules/activation_key.py index 2abe12f6..2e3a92b5 100644 --- a/plugins/modules/katello_activation_key.py +++ b/plugins/modules/activation_key.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: katello_activation_key +module: activation_key short_description: Create and manage activation keys description: - Create and manage activation keys @@ -149,7 +149,7 @@ EXAMPLES = ''' - name: "Create client activation key" - katello_activation_key: + activation_key: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/activation_key.yml b/tests/test_playbooks/tasks/activation_key.yml index a81f9e17..45d07c48 100644 --- a/tests/test_playbooks/tasks/activation_key.yml +++ b/tests/test_playbooks/tasks/activation_key.yml @@ -4,7 +4,7 @@ activation_key_name: "Test Activation Key" activation_key_state: "present" activation_key_organization: "Test Organization" - katello_activation_key: + activation_key: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From efcbbc85d9d57fec4ef9f945649fda4c3cf6a1f4 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:55 +0200 Subject: [PATCH 68/91] rename katello_content_credential to content_credential --- meta/runtime.yml | 2 ++ .../{katello_content_credential.py => content_credential.py} | 4 ++-- tests/test_playbooks/tasks/content_credential.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{katello_content_credential.py => content_credential.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 813ab2fe..4a4f2748 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -78,3 +78,5 @@ plugin_routing: redirect: user katello_activation_key: redirect: activation_key + katello_content_credential: + redirect: content_credential diff --git a/plugins/modules/katello_content_credential.py b/plugins/modules/content_credential.py similarity index 97% rename from plugins/modules/katello_content_credential.py rename to plugins/modules/content_credential.py index e2808c24..b1a47a52 100644 --- a/plugins/modules/katello_content_credential.py +++ b/plugins/modules/content_credential.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: katello_content_credential +module: content_credential short_description: Create and manage content credentials description: - Create and manage content credentials @@ -57,7 +57,7 @@ EXAMPLES = ''' - name: "Create katello client GPG key" - katello_content_credential: + content_credential: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/content_credential.yml b/tests/test_playbooks/tasks/content_credential.yml index b3537e8e..c8ce023e 100644 --- a/tests/test_playbooks/tasks/content_credential.yml +++ b/tests/test_playbooks/tasks/content_credential.yml @@ -6,7 +6,7 @@ - content_credential_type: "gpg_key" - content_credential_content: "{{ lookup('file', 'data/gpg_key.asc') }}" - content_credential_state: present - katello_content_credential: + content_credential: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 1a27a2156ad187239f63f618d894f55084ebfb91 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:55 +0200 Subject: [PATCH 69/91] rename katello_content_view_filter to content_view_filter --- meta/runtime.yml | 2 ++ ...atello_content_view_filter.py => content_view_filter.py} | 6 +++--- tests/test_playbooks/tasks/content_view_filter_docker.yml | 2 +- .../tasks/content_view_filter_errata_date.yml | 2 +- .../test_playbooks/tasks/content_view_filter_errata_id.yml | 2 +- tests/test_playbooks/tasks/content_view_filter_package.yml | 2 +- .../tasks/content_view_filter_package_group.yml | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) rename plugins/modules/{katello_content_view_filter.py => content_view_filter.py} (99%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 4a4f2748..f4347ced 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -80,3 +80,5 @@ plugin_routing: redirect: activation_key katello_content_credential: redirect: content_credential + katello_content_view_filter: + redirect: content_view_filter diff --git a/plugins/modules/katello_content_view_filter.py b/plugins/modules/content_view_filter.py similarity index 99% rename from plugins/modules/katello_content_view_filter.py rename to plugins/modules/content_view_filter.py index 59a1f604..97dc7eb2 100644 --- a/plugins/modules/katello_content_view_filter.py +++ b/plugins/modules/content_view_filter.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: katello_content_view_filter +module: content_view_filter short_description: Create and manage content View filters description: - Create and manage content View filters @@ -146,7 +146,7 @@ EXAMPLES = ''' - name: Exclude csh - katello_content_view_filter: + content_view_filter: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -157,7 +157,7 @@ package_name: tcsh - name: Include newer csh versions - katello_content_view_filter: + content_view_filter: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/content_view_filter_docker.yml b/tests/test_playbooks/tasks/content_view_filter_docker.yml index b717487c..97201f0b 100644 --- a/tests/test_playbooks/tasks/content_view_filter_docker.yml +++ b/tests/test_playbooks/tasks/content_view_filter_docker.yml @@ -6,7 +6,7 @@ organization_name: "Test Organization" tag: "birds" filter_state: present - katello_content_view_filter: + content_view_filter: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" diff --git a/tests/test_playbooks/tasks/content_view_filter_errata_date.yml b/tests/test_playbooks/tasks/content_view_filter_errata_date.yml index 05857052..524b283a 100644 --- a/tests/test_playbooks/tasks/content_view_filter_errata_date.yml +++ b/tests/test_playbooks/tasks/content_view_filter_errata_date.yml @@ -10,7 +10,7 @@ end_date: "2018-01-03" start_date: "2017-01-03" filter_state: present - katello_content_view_filter: + content_view_filter: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" diff --git a/tests/test_playbooks/tasks/content_view_filter_errata_id.yml b/tests/test_playbooks/tasks/content_view_filter_errata_id.yml index aa8b5ddc..c4631f4f 100644 --- a/tests/test_playbooks/tasks/content_view_filter_errata_id.yml +++ b/tests/test_playbooks/tasks/content_view_filter_errata_id.yml @@ -6,7 +6,7 @@ organization_name: "Test Organization" errata_id: RHEA-2012:0003 filter_state: present - katello_content_view_filter: + content_view_filter: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" diff --git a/tests/test_playbooks/tasks/content_view_filter_package.yml b/tests/test_playbooks/tasks/content_view_filter_package.yml index f32fc0d7..4fda2972 100644 --- a/tests/test_playbooks/tasks/content_view_filter_package.yml +++ b/tests/test_playbooks/tasks/content_view_filter_package.yml @@ -9,7 +9,7 @@ product: "Test Product" package_name: "bear" filter_state: present - katello_content_view_filter: + content_view_filter: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" diff --git a/tests/test_playbooks/tasks/content_view_filter_package_group.yml b/tests/test_playbooks/tasks/content_view_filter_package_group.yml index a86a0444..430ea618 100644 --- a/tests/test_playbooks/tasks/content_view_filter_package_group.yml +++ b/tests/test_playbooks/tasks/content_view_filter_package_group.yml @@ -6,7 +6,7 @@ organization_name: "Test Organization" package_group: "birds" filter_state: present - katello_content_view_filter: + content_view_filter: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 68ed9ad80ad1e4313bb7ff29bdf9cfbe17beec48 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:55 +0200 Subject: [PATCH 70/91] rename katello_content_view to content_view --- meta/runtime.yml | 2 ++ .../modules/{katello_content_view.py => content_view.py} | 6 +++--- plugins/modules/katello_content_view_version.py | 2 +- tests/test_playbooks/tasks/content_view.yml | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename plugins/modules/{katello_content_view.py => content_view.py} (99%) diff --git a/meta/runtime.yml b/meta/runtime.yml index f4347ced..bfd17611 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -82,3 +82,5 @@ plugin_routing: redirect: content_credential katello_content_view_filter: redirect: content_view_filter + katello_content_view: + redirect: content_view diff --git a/plugins/modules/katello_content_view.py b/plugins/modules/content_view.py similarity index 99% rename from plugins/modules/katello_content_view.py rename to plugins/modules/content_view.py index 05480169..45e88167 100644 --- a/plugins/modules/katello_content_view.py +++ b/plugins/modules/content_view.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: katello_content_view +module: content_view short_description: Create and manage content views description: - Create and manage content views @@ -103,7 +103,7 @@ EXAMPLES = ''' - name: "Create or update Fedora content view" - katello_content_view: + content_view: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -114,7 +114,7 @@ product: 'Fedora' - name: "Create a composite content view" - katello_content_view: + content_view: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/plugins/modules/katello_content_view_version.py b/plugins/modules/katello_content_view_version.py index def773bd..5769bf39 100644 --- a/plugins/modules/katello_content_view_version.py +++ b/plugins/modules/katello_content_view_version.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: katello_content_view_version +module: content_view_version short_description: Create, remove or interact with a Content View Version description: - Publish, Promote or Remove a Content View Version diff --git a/tests/test_playbooks/tasks/content_view.yml b/tests/test_playbooks/tasks/content_view.yml index 3bb78834..0114d113 100644 --- a/tests/test_playbooks/tasks/content_view.yml +++ b/tests/test_playbooks/tasks/content_view.yml @@ -3,7 +3,7 @@ vars: - content_view_name: "Test Content View" - organization_name: "Test Organization" - katello_content_view: + content_view: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 8515999df95d61f32642d5295b88fc411102da0e Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:55 +0200 Subject: [PATCH 71/91] rename katello_content_view_version to content_view_version --- meta/runtime.yml | 2 ++ ...content_view_version.py => content_view_version.py} | 10 +++++----- tests/test_playbooks/tasks/content_view_version.yml | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) rename plugins/modules/{katello_content_view_version.py => content_view_version.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index bfd17611..79bc2667 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -84,3 +84,5 @@ plugin_routing: redirect: content_view_filter katello_content_view: redirect: content_view + katello_content_view_version: + redirect: content_view_version diff --git a/plugins/modules/katello_content_view_version.py b/plugins/modules/content_view_version.py similarity index 98% rename from plugins/modules/katello_content_view_version.py rename to plugins/modules/content_view_version.py index 5769bf39..6da51bf1 100644 --- a/plugins/modules/katello_content_view_version.py +++ b/plugins/modules/content_view_version.py @@ -77,7 +77,7 @@ EXAMPLES = ''' - name: "Ensure content view version 2.0 is in Test & Pre Prod" - katello_content_view_version: + content_view_version: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -89,7 +89,7 @@ - Pre Prod - name: "Ensure content view version in Test is also in Pre Prod" - katello_content_view_version: + content_view_version: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -100,7 +100,7 @@ - Pre Prod - name: "Publish a content view, not idempotent" - katello_content_view_version: + content_view_version: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -108,7 +108,7 @@ organization: "Default Organization" - name: "Publish a content view and promote that version to Library & Dev, not idempotent" - katello_content_view_version: + content_view_version: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -119,7 +119,7 @@ - Dev - name: "Ensure content view version 1.0 doesn't exist" - katello_content_view_version: + content_view_version: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/content_view_version.yml b/tests/test_playbooks/tasks/content_view_version.yml index cd63ac6c..037b67ba 100644 --- a/tests/test_playbooks/tasks/content_view_version.yml +++ b/tests/test_playbooks/tasks/content_view_version.yml @@ -4,7 +4,7 @@ - content_view_name: "Test Content View" - organization_name: "Test Organization" - lifecycle_environments: Library - katello_content_view_version: + content_view_version: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 8fa34ca189985714e886666ad8ce5339ab81fe1f Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:55 +0200 Subject: [PATCH 72/91] rename katello_host_collection to host_collection --- meta/runtime.yml | 2 ++ .../{katello_host_collection.py => host_collection.py} | 4 ++-- tests/test_playbooks/tasks/host_collection.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{katello_host_collection.py => host_collection.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 79bc2667..706d6929 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -86,3 +86,5 @@ plugin_routing: redirect: content_view katello_content_view_version: redirect: content_view_version + katello_host_collection: + redirect: host_collection diff --git a/plugins/modules/katello_host_collection.py b/plugins/modules/host_collection.py similarity index 97% rename from plugins/modules/katello_host_collection.py rename to plugins/modules/host_collection.py index 6f421907..cf86bd06 100644 --- a/plugins/modules/katello_host_collection.py +++ b/plugins/modules/host_collection.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: katello_host_collection +module: host_collection short_description: Create and Manage host collections description: - Create and Manage host collections @@ -55,7 +55,7 @@ EXAMPLES = ''' - name: "Create Foo host collection" - katello_host_collection: + host_collection: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/host_collection.yml b/tests/test_playbooks/tasks/host_collection.yml index 171e2789..ffcbc998 100644 --- a/tests/test_playbooks/tasks/host_collection.yml +++ b/tests/test_playbooks/tasks/host_collection.yml @@ -5,7 +5,7 @@ - host_collection_description: "Foo host collection for Foo servers" - host_collection_state: present - host_collection_organization: "Test Organization" - katello_host_collection: + host_collection: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 73110512224cf8309881cbce5379bc9a4aba2807 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:55 +0200 Subject: [PATCH 73/91] rename katello_lifecycle_environment to lifecycle_environment --- meta/runtime.yml | 2 ++ ...ello_lifecycle_environment.py => lifecycle_environment.py} | 4 ++-- tests/test_playbooks/tasks/lifecycle_environment.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{katello_lifecycle_environment.py => lifecycle_environment.py} (97%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 706d6929..6604d9fe 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -88,3 +88,5 @@ plugin_routing: redirect: content_view_version katello_host_collection: redirect: host_collection + katello_lifecycle_environment: + redirect: lifecycle_environment diff --git a/plugins/modules/katello_lifecycle_environment.py b/plugins/modules/lifecycle_environment.py similarity index 97% rename from plugins/modules/katello_lifecycle_environment.py rename to plugins/modules/lifecycle_environment.py index 15a07b25..819438e2 100644 --- a/plugins/modules/katello_lifecycle_environment.py +++ b/plugins/modules/lifecycle_environment.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- -module: katello_lifecycle_environment +module: lifecycle_environment short_description: Create and manage lifecycle environments description: - Create and manage lifecycle environments @@ -59,7 +59,7 @@ EXAMPLES = ''' - name: "Add a production lifecycle environment" - katello_lifecycle_environment: + lifecycle_environment: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/lifecycle_environment.yml b/tests/test_playbooks/tasks/lifecycle_environment.yml index bef33445..d3f6cff3 100644 --- a/tests/test_playbooks/tasks/lifecycle_environment.yml +++ b/tests/test_playbooks/tasks/lifecycle_environment.yml @@ -3,7 +3,7 @@ vars: lifecycle_environment_name: "Dev" organization_name: "Test Organization" - katello_lifecycle_environment: + lifecycle_environment: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From fca221b86a9c84b49c4caeb6dfb24ce20490887b Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:55 +0200 Subject: [PATCH 74/91] rename katello_manifest to subscription_manifest --- meta/runtime.yml | 2 ++ .../modules/{katello_manifest.py => subscription_manifest.py} | 4 ++-- tests/test_playbooks/tasks/katello_manifest.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{katello_manifest.py => subscription_manifest.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 6604d9fe..9129de6c 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -90,3 +90,5 @@ plugin_routing: redirect: host_collection katello_lifecycle_environment: redirect: lifecycle_environment + katello_manifest: + redirect: subscription_manifest diff --git a/plugins/modules/katello_manifest.py b/plugins/modules/subscription_manifest.py similarity index 98% rename from plugins/modules/katello_manifest.py rename to plugins/modules/subscription_manifest.py index bd4b5c60..784ae42f 100644 --- a/plugins/modules/katello_manifest.py +++ b/plugins/modules/subscription_manifest.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: katello_manifest +module: subscription_manifest short_description: Manage manifests description: - Upload and manage manifests @@ -57,7 +57,7 @@ EXAMPLES = ''' - name: "Upload the RHEL developer edition manifest" - katello_manifest: + subscription_manifest: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/katello_manifest.yml b/tests/test_playbooks/tasks/katello_manifest.yml index f0f137f1..5c07cdc4 100644 --- a/tests/test_playbooks/tasks/katello_manifest.yml +++ b/tests/test_playbooks/tasks/katello_manifest.yml @@ -3,7 +3,7 @@ vars: organization_name: "Test Organization" manifest_state: "present" - katello_manifest: + subscription_manifest: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From ea9476ba21950fa152ae5e0b1092b6ffeef6f97b Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:55 +0200 Subject: [PATCH 75/91] rename katello_product to product --- meta/runtime.yml | 2 ++ plugins/modules/{katello_product.py => product.py} | 6 +++--- tests/test_playbooks/tasks/product.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) rename plugins/modules/{katello_product.py => product.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 9129de6c..783bd0b9 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -92,3 +92,5 @@ plugin_routing: redirect: lifecycle_environment katello_manifest: redirect: subscription_manifest + katello_product: + redirect: product diff --git a/plugins/modules/katello_product.py b/plugins/modules/product.py similarity index 98% rename from plugins/modules/katello_product.py rename to plugins/modules/product.py index 53f2d1ef..77d5835c 100644 --- a/plugins/modules/katello_product.py +++ b/plugins/modules/product.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: katello_product +module: product short_description: Create and manage products description: - Create and manage products @@ -81,7 +81,7 @@ EXAMPLES = ''' - name: "Create Fedora product with a sync plan" - katello_product: + product: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -91,7 +91,7 @@ state: present - name: "Create CentOS 7 product with content credentials" - katello_product: + product: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/product.yml b/tests/test_playbooks/tasks/product.yml index ecd9d771..3807f7b0 100644 --- a/tests/test_playbooks/tasks/product.yml +++ b/tests/test_playbooks/tasks/product.yml @@ -5,7 +5,7 @@ - product_name: "Test Product" - product_description: "A happy little test product" - product_state: present - katello_product: + product: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From b02ec139c35e15078cf697b3e4fba081c1a6d554 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:56 +0200 Subject: [PATCH 76/91] rename katello_repository to repository --- meta/runtime.yml | 2 ++ plugins/modules/katello_repository_set.py | 2 +- plugins/modules/{katello_repository.py => repository.py} | 6 +++--- tests/test_playbooks/tasks/repository.yml | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename plugins/modules/{katello_repository.py => repository.py} (99%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 783bd0b9..06477933 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -94,3 +94,5 @@ plugin_routing: redirect: subscription_manifest katello_product: redirect: product + katello_repository: + redirect: repository diff --git a/plugins/modules/katello_repository_set.py b/plugins/modules/katello_repository_set.py index 6f6fcfec..b9988d59 100644 --- a/plugins/modules/katello_repository_set.py +++ b/plugins/modules/katello_repository_set.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: katello_repository_set +module: repository_set short_description: Enable/disable repositories in repository sets description: - Enable/disable repositories in repository sets diff --git a/plugins/modules/katello_repository.py b/plugins/modules/repository.py similarity index 99% rename from plugins/modules/katello_repository.py rename to plugins/modules/repository.py index 4e12cd85..4651ae3f 100644 --- a/plugins/modules/katello_repository.py +++ b/plugins/modules/repository.py @@ -25,7 +25,7 @@ DOCUMENTATION = ''' --- -module: katello_repository +module: repository short_description: Create and manage repositories description: - Crate and manage repositories @@ -168,7 +168,7 @@ EXAMPLES = ''' - name: "Create repository" - katello_repository: + repository: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -182,7 +182,7 @@ download_policy: background - name: "Create repository with content credentials" - katello_repository: + repository: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/repository.yml b/tests/test_playbooks/tasks/repository.yml index 0977cf6c..809452cc 100644 --- a/tests/test_playbooks/tasks/repository.yml +++ b/tests/test_playbooks/tasks/repository.yml @@ -6,7 +6,7 @@ repository_name: "Test Repository" repository_content_type: "yum" repository_state: present - katello_repository: + repository: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From ebe4534dbca7526766d466da2f841a825758bbaa Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:56 +0200 Subject: [PATCH 77/91] rename katello_repository_set to repository_set --- meta/runtime.yml | 2 ++ .../{katello_repository_set.py => repository_set.py} | 12 ++++++------ tests/test_playbooks/tasks/repository_set.yml | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) rename plugins/modules/{katello_repository_set.py => repository_set.py} (98%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 06477933..559147aa 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -96,3 +96,5 @@ plugin_routing: redirect: product katello_repository: redirect: repository + katello_repository_set: + redirect: repository_set diff --git a/plugins/modules/katello_repository_set.py b/plugins/modules/repository_set.py similarity index 98% rename from plugins/modules/katello_repository_set.py rename to plugins/modules/repository_set.py index b9988d59..c606f698 100644 --- a/plugins/modules/katello_repository_set.py +++ b/plugins/modules/repository_set.py @@ -86,7 +86,7 @@ EXAMPLES = ''' - name: "Enable RHEL 7 RPMs repositories" - katello_repository_set: + repository_set: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -105,7 +105,7 @@ state: enabled - name: "Enable RHEL 7 RPMs repositories with label" - katello_repository_set: + repository_set: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -123,7 +123,7 @@ state: enabled - name: "Disable RHEL 7 Extras RPMs repository" - katello_repository_set: + repository_set: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -135,7 +135,7 @@ - basearch: x86_64 - name: "Enable RHEL 8 BaseOS RPMs repository with label" - katello_repository_set: + repository_set: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -145,7 +145,7 @@ - releasever: "8" - name: "Enable Red Hat Virtualization Manager RPMs repository with label" - katello_repository_set: + repository_set: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -156,7 +156,7 @@ state: enabled - name: "Enable Red Hat Virtualization Manager RPMs repository without specifying basearch" - katello_repository_set: + repository_set: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/repository_set.yml b/tests/test_playbooks/tasks/repository_set.yml index 49532214..ad15f814 100644 --- a/tests/test_playbooks/tasks/repository_set.yml +++ b/tests/test_playbooks/tasks/repository_set.yml @@ -3,7 +3,7 @@ vars: organization: Test Organization state: enabled - katello_repository_set: + repository_set: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 78b1b35d543a8264a6fbcd6f44070f643a246370 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:56 +0200 Subject: [PATCH 78/91] rename katello_sync_plan to sync_plan --- meta/runtime.yml | 2 ++ plugins/modules/{katello_sync_plan.py => sync_plan.py} | 4 ++-- tests/test_playbooks/tasks/sync_plan.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename plugins/modules/{katello_sync_plan.py => sync_plan.py} (99%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 559147aa..32d9f2f7 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -98,3 +98,5 @@ plugin_routing: redirect: repository katello_repository_set: redirect: repository_set + katello_sync_plan: + redirect: sync_plan diff --git a/plugins/modules/katello_sync_plan.py b/plugins/modules/sync_plan.py similarity index 99% rename from plugins/modules/katello_sync_plan.py rename to plugins/modules/sync_plan.py index a59009b2..5b5215c8 100644 --- a/plugins/modules/katello_sync_plan.py +++ b/plugins/modules/sync_plan.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- -module: katello_sync_plan +module: sync_plan short_description: Manage sync plans description: - Manage sync plans @@ -82,7 +82,7 @@ EXAMPLES = ''' - name: "Create or update weekly RHEL sync plan" - katello_sync_plan: + sync_plan: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/test_playbooks/tasks/sync_plan.yml b/tests/test_playbooks/tasks/sync_plan.yml index adfeb335..02acc3de 100644 --- a/tests/test_playbooks/tasks/sync_plan.yml +++ b/tests/test_playbooks/tasks/sync_plan.yml @@ -7,7 +7,7 @@ sync_plan_enabled: false sync_plan_sync_date: "2017-01-01 00:00:00 UTC" sync_plan_state: present - katello_sync_plan: + sync_plan: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From b30102455cd97602da299394e790ec89c84d1d3e Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:56 +0200 Subject: [PATCH 79/91] rename katello_sync to repository_sync --- meta/runtime.yml | 2 ++ plugins/modules/{katello_sync.py => repository_sync.py} | 6 +++--- tests/conftest.py | 2 +- .../apidoc/{katello_sync.json => repository_sync.json} | 0 .../fixtures/{katello_sync-0.yml => repository_sync-0.yml} | 0 .../fixtures/{katello_sync-1.yml => repository_sync-1.yml} | 0 .../{katello_sync.yml => repository_sync.yml} | 0 tests/test_playbooks/tasks/katello_sync.yml | 2 +- 8 files changed, 7 insertions(+), 5 deletions(-) rename plugins/modules/{katello_sync.py => repository_sync.py} (98%) rename tests/fixtures/apidoc/{katello_sync.json => repository_sync.json} (100%) rename tests/test_playbooks/fixtures/{katello_sync-0.yml => repository_sync-0.yml} (100%) rename tests/test_playbooks/fixtures/{katello_sync-1.yml => repository_sync-1.yml} (100%) rename tests/test_playbooks/{katello_sync.yml => repository_sync.yml} (100%) diff --git a/meta/runtime.yml b/meta/runtime.yml index 32d9f2f7..da9c4ff6 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -100,3 +100,5 @@ plugin_routing: redirect: repository_set katello_sync_plan: redirect: sync_plan + katello_sync: + redirect: repository_sync diff --git a/plugins/modules/katello_sync.py b/plugins/modules/repository_sync.py similarity index 98% rename from plugins/modules/katello_sync.py rename to plugins/modules/repository_sync.py index f2d8b2e7..6022ffd2 100644 --- a/plugins/modules/katello_sync.py +++ b/plugins/modules/repository_sync.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- -module: katello_sync +module: repository_sync short_description: Sync a repository or product description: - Sync a repository or product @@ -51,7 +51,7 @@ EXAMPLES = ''' - name: "Sync repository" - katello_sync: + repository_sync: username: "admin" password: "changeme" server_url: "https://foreman.example.com" @@ -69,7 +69,7 @@ register: repositories - name: Kick off repository Sync tasks - katello_sync: + repository_sync: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/conftest.py b/tests/conftest.py index 51255b77..c57d5ae1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -30,7 +30,7 @@ 'installation_medium', 'job_template', 'katello_manifest', - 'katello_sync', + 'repository_sync', 'lifecycle_environment', 'location', 'hardware_model', diff --git a/tests/fixtures/apidoc/katello_sync.json b/tests/fixtures/apidoc/repository_sync.json similarity index 100% rename from tests/fixtures/apidoc/katello_sync.json rename to tests/fixtures/apidoc/repository_sync.json diff --git a/tests/test_playbooks/fixtures/katello_sync-0.yml b/tests/test_playbooks/fixtures/repository_sync-0.yml similarity index 100% rename from tests/test_playbooks/fixtures/katello_sync-0.yml rename to tests/test_playbooks/fixtures/repository_sync-0.yml diff --git a/tests/test_playbooks/fixtures/katello_sync-1.yml b/tests/test_playbooks/fixtures/repository_sync-1.yml similarity index 100% rename from tests/test_playbooks/fixtures/katello_sync-1.yml rename to tests/test_playbooks/fixtures/repository_sync-1.yml diff --git a/tests/test_playbooks/katello_sync.yml b/tests/test_playbooks/repository_sync.yml similarity index 100% rename from tests/test_playbooks/katello_sync.yml rename to tests/test_playbooks/repository_sync.yml diff --git a/tests/test_playbooks/tasks/katello_sync.yml b/tests/test_playbooks/tasks/katello_sync.yml index f1993b98..9abc7270 100644 --- a/tests/test_playbooks/tasks/katello_sync.yml +++ b/tests/test_playbooks/tasks/katello_sync.yml @@ -3,7 +3,7 @@ vars: organization_name: "Test Organization" product_name: "Test Product" - katello_sync: + repository_sync: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 7e66ff4fc9dac3dd9c26d73ce4a9246659762d54 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 17 Jun 2020 13:36:56 +0200 Subject: [PATCH 80/91] rename katello_upload to content_upload --- meta/runtime.yml | 2 ++ plugins/modules/{katello_upload.py => content_upload.py} | 4 ++-- tests/conftest.py | 2 +- tests/fixtures/apidoc/{upload.json => content_upload.json} | 0 tests/test_playbooks/{upload.yml => content_upload.yml} | 0 .../fixtures/{upload-0.yml => content_upload-0.yml} | 0 .../fixtures/{upload-1.yml => content_upload-1.yml} | 0 .../fixtures/{upload-2.yml => content_upload-2.yml} | 0 .../fixtures/{upload-3.yml => content_upload-3.yml} | 0 .../fixtures/{upload-4.yml => content_upload-4.yml} | 0 .../fixtures/{upload-5.yml => content_upload-5.yml} | 0 tests/test_playbooks/tasks/upload.yml | 2 +- 12 files changed, 6 insertions(+), 4 deletions(-) rename plugins/modules/{katello_upload.py => content_upload.py} (99%) rename tests/fixtures/apidoc/{upload.json => content_upload.json} (100%) rename tests/test_playbooks/{upload.yml => content_upload.yml} (100%) rename tests/test_playbooks/fixtures/{upload-0.yml => content_upload-0.yml} (100%) rename tests/test_playbooks/fixtures/{upload-1.yml => content_upload-1.yml} (100%) rename tests/test_playbooks/fixtures/{upload-2.yml => content_upload-2.yml} (100%) rename tests/test_playbooks/fixtures/{upload-3.yml => content_upload-3.yml} (100%) rename tests/test_playbooks/fixtures/{upload-4.yml => content_upload-4.yml} (100%) rename tests/test_playbooks/fixtures/{upload-5.yml => content_upload-5.yml} (100%) diff --git a/meta/runtime.yml b/meta/runtime.yml index da9c4ff6..52e97571 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -102,3 +102,5 @@ plugin_routing: redirect: sync_plan katello_sync: redirect: repository_sync + katello_upload: + redirect: content_upload diff --git a/plugins/modules/katello_upload.py b/plugins/modules/content_upload.py similarity index 99% rename from plugins/modules/katello_upload.py rename to plugins/modules/content_upload.py index b70e18c1..2f40ea06 100644 --- a/plugins/modules/katello_upload.py +++ b/plugins/modules/content_upload.py @@ -26,7 +26,7 @@ DOCUMENTATION = ''' --- -module: katello_upload +module: content_upload short_description: Upload content description: - Allows the upload of content to a repository @@ -62,7 +62,7 @@ EXAMPLES = ''' - name: "Upload my.rpm" - katello_upload: + content_upload: username: "admin" password: "changeme" server_url: "https://foreman.example.com" diff --git a/tests/conftest.py b/tests/conftest.py index c57d5ae1..60cdc7f2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -56,7 +56,7 @@ 'subnet', 'sync_plan', 'templates_import', - 'upload', + 'content_upload', 'user', 'usergroup', ] diff --git a/tests/fixtures/apidoc/upload.json b/tests/fixtures/apidoc/content_upload.json similarity index 100% rename from tests/fixtures/apidoc/upload.json rename to tests/fixtures/apidoc/content_upload.json diff --git a/tests/test_playbooks/upload.yml b/tests/test_playbooks/content_upload.yml similarity index 100% rename from tests/test_playbooks/upload.yml rename to tests/test_playbooks/content_upload.yml diff --git a/tests/test_playbooks/fixtures/upload-0.yml b/tests/test_playbooks/fixtures/content_upload-0.yml similarity index 100% rename from tests/test_playbooks/fixtures/upload-0.yml rename to tests/test_playbooks/fixtures/content_upload-0.yml diff --git a/tests/test_playbooks/fixtures/upload-1.yml b/tests/test_playbooks/fixtures/content_upload-1.yml similarity index 100% rename from tests/test_playbooks/fixtures/upload-1.yml rename to tests/test_playbooks/fixtures/content_upload-1.yml diff --git a/tests/test_playbooks/fixtures/upload-2.yml b/tests/test_playbooks/fixtures/content_upload-2.yml similarity index 100% rename from tests/test_playbooks/fixtures/upload-2.yml rename to tests/test_playbooks/fixtures/content_upload-2.yml diff --git a/tests/test_playbooks/fixtures/upload-3.yml b/tests/test_playbooks/fixtures/content_upload-3.yml similarity index 100% rename from tests/test_playbooks/fixtures/upload-3.yml rename to tests/test_playbooks/fixtures/content_upload-3.yml diff --git a/tests/test_playbooks/fixtures/upload-4.yml b/tests/test_playbooks/fixtures/content_upload-4.yml similarity index 100% rename from tests/test_playbooks/fixtures/upload-4.yml rename to tests/test_playbooks/fixtures/content_upload-4.yml diff --git a/tests/test_playbooks/fixtures/upload-5.yml b/tests/test_playbooks/fixtures/content_upload-5.yml similarity index 100% rename from tests/test_playbooks/fixtures/upload-5.yml rename to tests/test_playbooks/fixtures/content_upload-5.yml diff --git a/tests/test_playbooks/tasks/upload.yml b/tests/test_playbooks/tasks/upload.yml index 8ed65e9a..17a50754 100644 --- a/tests/test_playbooks/tasks/upload.yml +++ b/tests/test_playbooks/tasks/upload.yml @@ -5,7 +5,7 @@ upload_src: "{{ playbook_dir }}/data/bear-4.1-1.noarch.rpm" upload_repository: "Test Repository" upload_product: "Test Product" - katello_upload: + content_upload: username: "{{ foreman_username }}" password: "{{ foreman_password }}" server_url: "{{ foreman_server_url }}" From 93ff5cb5af9febc8b0051da275460a03d16d3e92 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Thu, 18 Jun 2020 11:16:32 +0200 Subject: [PATCH 81/91] drop more Katello/Foreman mentions --- plugins/doc_fragments/foreman.py | 12 ++++++------ plugins/modules/resource_info.py | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/doc_fragments/foreman.py b/plugins/doc_fragments/foreman.py index 4c54a019..941440c7 100644 --- a/plugins/doc_fragments/foreman.py +++ b/plugins/doc_fragments/foreman.py @@ -119,7 +119,7 @@ class ModuleDocFragment(object): options: state: description: - - State of the entity in Foreman + - State of the entity default: present choices: - present @@ -131,7 +131,7 @@ class ModuleDocFragment(object): options: state: description: - - State of the entity in Foreman + - State of the entity - C(present_with_defaults) will ensure the entity exists, but won't update existing ones default: present choices: @@ -241,27 +241,27 @@ class ModuleDocFragment(object): type: str content_source: description: - - Katello Content source. + - Content source. - Only available for Katello installations. required: false type: str lifecycle_environment: description: - - Katello Lifecycle environment. + - Lifecycle environment. - Only available for Katello installations. required: false type: str kickstart_repository: description: - Kickstart repository name. - - You need to provide this to use the "Synced Content" feature of Katello. + - You need to provide this to use the "Synced Content" feature. - Mutually exclusive with I(medium). - Only available for Katello installations. required: false type: str content_view: description: - - Katello Content view. + - Content view. - Only available for Katello installations. required: false type: str diff --git a/plugins/modules/resource_info.py b/plugins/modules/resource_info.py index 4c78fbb1..ff372def 100644 --- a/plugins/modules/resource_info.py +++ b/plugins/modules/resource_info.py @@ -77,7 +77,7 @@ - debug: var: result.resources[0].value -- name: "Read all Registries (Katello)" +- name: "Read all Registries" resource_info: username: "admin" password: "changeme" @@ -99,7 +99,7 @@ - debug: var: result.resources -- name: Get all existing subscriptions for organization with id 1 (Katello) +- name: Get all existing subscriptions for organization with id 1 resource_info: username: "admin" password: "changeme" @@ -111,7 +111,7 @@ - debug: var: result -- name: Get all existing activation keys for organization ACME (Katello) +- name: Get all existing activation keys for organization ACME resource_info: username: "admin" password: "changeme" @@ -125,7 +125,7 @@ RETURN = ''' resources: - description: Search results from Foreman + description: Resource information returned: always type: list ''' From 2878d78646e07004baa82f5a039b393c08fbee58 Mon Sep 17 00:00:00 2001 From: Matthias Dellweg Date: Fri, 19 Jun 2020 09:49:14 +0200 Subject: [PATCH 82/91] Run tests in installed collection (#842) --- .github/workflows/main.yml | 6 +++ Makefile | 37 +++++++++++++------ ansible.cfg | 9 +---- tests/test_playbooks/activation_key.yml | 6 +++ tests/test_playbooks/architecture.yml | 6 +++ tests/test_playbooks/auth_source_ldap.yml | 6 +++ tests/test_playbooks/bookmark.yml | 2 + tests/test_playbooks/compute_attribute.yml | 6 +++ tests/test_playbooks/compute_profile.yml | 6 +++ tests/test_playbooks/compute_resource.yml | 6 +++ tests/test_playbooks/config_group.yml | 2 + tests/test_playbooks/content_credential.yml | 6 +++ tests/test_playbooks/content_upload.yml | 6 +++ tests/test_playbooks/content_view.yml | 6 +++ tests/test_playbooks/content_view_filter.yml | 6 +++ tests/test_playbooks/content_view_version.yml | 6 +++ tests/test_playbooks/domain.yml | 6 +++ tests/test_playbooks/external_usergroup.yml | 6 +++ tests/test_playbooks/filters.yml | 12 +++--- tests/test_playbooks/global_parameter.yml | 4 ++ tests/test_playbooks/hardware_model.yml | 6 +++ tests/test_playbooks/host.yml | 6 +++ tests/test_playbooks/host_collection.yml | 6 +++ tests/test_playbooks/host_power.yml | 4 ++ tests/test_playbooks/hostgroup.yml | 6 +++ tests/test_playbooks/image.yml | 6 +++ tests/test_playbooks/installation_medium.yml | 6 +++ tests/test_playbooks/inventory_plugin.yml | 1 + tests/test_playbooks/job_template.yml | 6 +++ tests/test_playbooks/katello_hostgroup.yml | 6 +++ tests/test_playbooks/katello_manifest.yml | 6 +++ .../test_playbooks/lifecycle_environment.yml | 6 +++ tests/test_playbooks/location.yml | 6 +++ tests/test_playbooks/luna_hostgroup.yml | 6 +++ tests/test_playbooks/operatingsystem.yml | 4 ++ tests/test_playbooks/organization.yml | 4 ++ tests/test_playbooks/os_default_template.yml | 6 +++ tests/test_playbooks/partition_table.yml | 6 +++ tests/test_playbooks/product.yml | 6 +++ .../test_playbooks/provisioning_template.yml | 6 +++ tests/test_playbooks/puppet_environment.yml | 6 +++ tests/test_playbooks/realm.yml | 4 ++ tests/test_playbooks/redhat_manifest.yml | 2 + tests/test_playbooks/repository.yml | 6 +++ tests/test_playbooks/repository_set.yml | 6 +++ tests/test_playbooks/repository_sync.yml | 6 +++ tests/test_playbooks/resource_info.yml | 6 +++ tests/test_playbooks/role.yml | 6 +++ tests/test_playbooks/scap_content.yml | 6 +++ tests/test_playbooks/scap_tailoring_file.yml | 6 +++ tests/test_playbooks/scc_account.yml | 6 +++ tests/test_playbooks/scc_product.yml | 6 +++ tests/test_playbooks/setting.yml | 4 ++ .../test_playbooks/smart_class_parameter.yml | 6 +++ tests/test_playbooks/snapshot.yml | 4 ++ tests/test_playbooks/subnet.yml | 6 +++ tests/test_playbooks/sync_plan.yml | 6 +++ .../test_playbooks/tasks/templates_import.yml | 1 + tests/test_playbooks/templates_import.yml | 6 +++ tests/test_playbooks/user.yml | 6 +++ tests/test_playbooks/usergroup.yml | 6 +++ 61 files changed, 345 insertions(+), 25 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6a7c2945..eec271e9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,6 +39,12 @@ jobs: python-version: ${{ matrix.python }} - name: Install Ansible run: pip install git+https://github.com/ansible/ansible.git@${{ matrix.ansible }}#egg=ansible + - name: Set Environment to use mazer + run: | + echo "::set-env name=COLLECTION_COMMAND::mazer" + echo "::set-env name=COLLECTION_COMMAND_SUFFIX::" + pip install mazer + if: matrix.ansible == 'stable-2.8' - name: Install dependencies run: make test-setup - name: fake redhat-uep.pem for redhat_manifest module diff --git a/Makefile b/Makefile index f642e8d6..6005d0fa 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ $(foreach PLUGIN_TYPE,$(PLUGIN_TYPES),$(eval _$(PLUGIN_TYPE) := $(filter-out %__ DEPENDENCIES := $(METADATA) $(foreach PLUGIN_TYPE,$(PLUGIN_TYPES),$(_$(PLUGIN_TYPE))) PYTHON_VERSION = 3.7 +COLLECTION_COMMAND ?= ansible-galaxy SANITY_OPTS = --venv TEST= PYTEST=pytest -n 4 --boxed -v @@ -41,26 +42,26 @@ sanity: $(MANIFEST) # Fake a fresh git repo for ansible-test cd $( .gitignore ; ansible-test sanity $(SANITY_OPTS) --python $(PYTHON_VERSION) -test: | tests/test_playbooks/vars/server.yml +test: $(MANIFEST) | tests/test_playbooks/vars/server.yml $(PYTEST) $(TEST) -test-crud: | tests/test_playbooks/vars/server.yml +test-crud: $(MANIFEST) | tests/test_playbooks/vars/server.yml $(PYTEST) 'tests/test_crud.py::test_crud' -test-check-mode: | tests/test_playbooks/vars/server.yml +test-check-mode: $(MANIFEST) | tests/test_playbooks/vars/server.yml $(PYTEST) 'tests/test_crud.py::test_check_mode' test-other: $(PYTEST) -k 'not test_crud.py' -test_%: FORCE | tests/test_playbooks/vars/server.yml +test_%: FORCE $(MANIFEST) | tests/test_playbooks/vars/server.yml pytest -v 'tests/test_crud.py::test_crud[$*]' 'tests/test_crud.py::test_check_mode[$*]' -record_%: FORCE +record_%: FORCE $(MANIFEST) $(RM) tests/test_playbooks/fixtures/$*-*.yml pytest -v 'tests/test_crud.py::test_crud[$*]' --record -clean_%: FORCE +clean_%: FORCE $(MANIFEST) ansible-playbook --tags teardown,cleanup -i tests/inventory/hosts 'tests/test_playbooks/$*.yml' setup: test-setup @@ -78,29 +79,41 @@ dist-test: $(MANIFEST) ANSIBLE_COLLECTIONS_PATHS=build/collections ansible-doc $(NAMESPACE).$(NAME).organization | grep -q "Manage Organization" $(MANIFEST): $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz +ifeq ($(COLLECTION_COMMAND),mazer) + # No idea, why this fails. But mazer is old and deprecated so unlikely to beeing fixed... + # mazer install --collections-path build/collections $< + -mkdir build/collections build/collections/ansible_collections build/collections/ansible_collections/theforeman build/collections/ansible_collections/theforeman/foreman + tar xf $< -C build/collections/ansible_collections/theforeman/foreman +else ansible-galaxy collection install -p build/collections $< --force +endif # fix the imports to use the collection namespace -build/src/plugins/modules/%.py: plugins/modules/%.py | build +build/src/plugins/modules/%.py: plugins/modules/%.py | build/src sed -e '/ansible.module_utils.foreman_helper/ s/ansible.module_utils/ansible_collections.$(NAMESPACE).$(NAME).plugins.module_utils/g' \ -e '/extends_documentation_fragment/{:1 n; s/- foreman/- $(NAMESPACE).$(NAME).foreman/; t1}' $< > $@ -build/src/plugins/inventory/%.py: plugins/inventory/%.py | build +build/src/plugins/inventory/%.py: plugins/inventory/%.py | build/src sed -E -e '/NAME =/ s/foreman/$(NAMESPACE).$(NAME).foreman/' \ -e '/(plugin|choices):/ s/foreman/$(NAMESPACE).$(NAME).foreman/' $< > $@ -build/src/plugins/callback/%.py: plugins/callback/%.py | build +build/src/plugins/callback/%.py: plugins/callback/%.py | build/src sed -e '/CALLBACK_NAME =/ s/foreman/$(NAMESPACE).$(NAME).foreman/' \ -e '/callback:/ s/foreman/$(NAMESPACE).$(NAME).foreman/' $< > $@ -build/src/%: % | build +build/src/%: % | build/src cp $< $@ -build: +build/src: -mkdir build build/src build/src/meta build/src/plugins $(addprefix build/src/plugins/,$(PLUGIN_TYPES)) -$(NAMESPACE)-$(NAME)-$(VERSION).tar.gz: $(addprefix build/src/,$(DEPENDENCIES)) | build +$(NAMESPACE)-$(NAME)-$(VERSION).tar.gz: $(addprefix build/src/,$(DEPENDENCIES)) | build/src +ifeq ($(COLLECTION_COMMAND),mazer) + mazer build --collection-path=build/src + cp build/src/releases/$@ . +else ansible-galaxy collection build build/src --force +endif dist: $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz diff --git a/ansible.cfg b/ansible.cfg index 1ab2184f..d7b4c14d 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,11 +1,4 @@ [defaults] -library = plugins/modules -module_utils = plugins/module_utils -doc_fragment_plugins = plugins/doc_fragments -filter_plugins = plugins/filter -inventory_plugins = plugins/inventory -callback_plugins = plugins/callback +collections_paths = build/collections inventory = tests/inventory/hosts retry_files_enabled = False -stdout_callback = debug -stderr_callback = debug diff --git a/tests/test_playbooks/activation_key.yml b/tests/test_playbooks/activation_key.yml index ace2ae15..1747c40c 100644 --- a/tests/test_playbooks/activation_key.yml +++ b/tests/test_playbooks/activation_key.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman tags: - setup gather_facts: false @@ -27,6 +29,8 @@ activation_key_name: Test Activation Key Copy - hosts: tests + collections: + - theforeman.foreman tags: - test gather_facts: false @@ -258,6 +262,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman tags: - teardown gather_facts: false diff --git a/tests/test_playbooks/architecture.yml b/tests/test_playbooks/architecture.yml index 7f846f6a..279fb77e 100644 --- a/tests/test_playbooks/architecture.yml +++ b/tests/test_playbooks/architecture.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -25,6 +27,8 @@ architecture_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -108,6 +112,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/auth_source_ldap.yml b/tests/test_playbooks/auth_source_ldap.yml index e9661e1c..368a8eba 100644 --- a/tests/test_playbooks/auth_source_ldap.yml +++ b/tests/test_playbooks/auth_source_ldap.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -20,6 +22,8 @@ with_items: "{{ domain_organizations }}" - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -58,6 +62,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/bookmark.yml b/tests/test_playbooks/bookmark.yml index 978362af..17fe3838 100644 --- a/tests/test_playbooks/bookmark.yml +++ b/tests/test_playbooks/bookmark.yml @@ -1,5 +1,7 @@ --- - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/compute_attribute.yml b/tests/test_playbooks/compute_attribute.yml index 60ed99ce..89864cb1 100644 --- a/tests/test_playbooks/compute_attribute.yml +++ b/tests/test_playbooks/compute_attribute.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -23,6 +25,8 @@ compute_resource_state: present - hosts: tests + collections: + - theforeman.foreman gather_facts: false tasks: - name: Load server config @@ -62,6 +66,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/compute_profile.yml b/tests/test_playbooks/compute_profile.yml index 06048f27..de00061b 100644 --- a/tests/test_playbooks/compute_profile.yml +++ b/tests/test_playbooks/compute_profile.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -28,6 +30,8 @@ compute_profile_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -75,6 +79,8 @@ expected_change: true - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/compute_resource.yml b/tests/test_playbooks/compute_resource.yml index ddc1272b..11997946 100644 --- a/tests/test_playbooks/compute_resource.yml +++ b/tests/test_playbooks/compute_resource.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -11,6 +13,8 @@ vars: location_state: present - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -117,6 +121,8 @@ compute_resource_state: absent expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/config_group.yml b/tests/test_playbooks/config_group.yml index d7da6d34..cdfc8feb 100644 --- a/tests/test_playbooks/config_group.yml +++ b/tests/test_playbooks/config_group.yml @@ -4,6 +4,8 @@ # before running config_group tests # - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/content_credential.yml b/tests/test_playbooks/content_credential.yml index df5b0f92..9edb169e 100644 --- a/tests/test_playbooks/content_credential.yml +++ b/tests/test_playbooks/content_credential.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -9,6 +11,8 @@ organization_state: present - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -56,6 +60,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/content_upload.yml b/tests/test_playbooks/content_upload.yml index fc349b44..74d8d563 100644 --- a/tests/test_playbooks/content_upload.yml +++ b/tests/test_playbooks/content_upload.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -38,6 +40,8 @@ repository_content_type: "file" - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -78,6 +82,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/content_view.yml b/tests/test_playbooks/content_view.yml index 76aaca65..4adc3482 100644 --- a/tests/test_playbooks/content_view.yml +++ b/tests/test_playbooks/content_view.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -35,6 +37,8 @@ content_view_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -196,6 +200,8 @@ auto_publish: true - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/content_view_filter.yml b/tests/test_playbooks/content_view_filter.yml index fa8cf54f..50bb25dc 100644 --- a/tests/test_playbooks/content_view_filter.yml +++ b/tests/test_playbooks/content_view_filter.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -34,6 +36,8 @@ product: "Test Product" - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -167,6 +171,8 @@ expected_change: true - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/content_view_version.yml b/tests/test_playbooks/content_view_version.yml index 9e641476..ebc8a0fd 100644 --- a/tests/test_playbooks/content_view_version.yml +++ b/tests/test_playbooks/content_view_version.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -42,6 +44,8 @@ product: "Test Product" - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -124,6 +128,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/domain.yml b/tests/test_playbooks/domain.yml index 7193cc29..73bb0d5f 100644 --- a/tests/test_playbooks/domain.yml +++ b/tests/test_playbooks/domain.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -18,6 +20,8 @@ #TODO create smart_proxy, when ansible-module exists - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -132,6 +136,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/external_usergroup.yml b/tests/test_playbooks/external_usergroup.yml index 71eaeab1..92a30b66 100644 --- a/tests/test_playbooks/external_usergroup.yml +++ b/tests/test_playbooks/external_usergroup.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -22,6 +24,8 @@ auth_source_ldap_tls: false - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -52,6 +56,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman tags: - teardown gather_facts: false diff --git a/tests/test_playbooks/filters.yml b/tests/test_playbooks/filters.yml index fcd019c5..70c67f21 100644 --- a/tests/test_playbooks/filters.yml +++ b/tests/test_playbooks/filters.yml @@ -1,15 +1,17 @@ --- - hosts: tests + collections: + - theforeman.foreman tags: - test gather_facts: false tasks: - debug: - msg: "{{ 'Test__String)' | cp_label }}" + msg: "{{ 'Test__String)' | theforeman.foreman.cp_label }}" - assert: that: - - "{{ 'Test String' | cp_label == 'Test_String' }}" - - "{{ 'Test__String' | cp_label == 'Test__String' }}" - - "{{ 'Test--String' | cp_label == 'Test--String' }}" - - "{{ 'Test (String) 1234' | cp_label == 'Test_String_1234' }}" + - "{{ 'Test String' | theforeman.foreman.cp_label == 'Test_String' }}" + - "{{ 'Test__String' | theforeman.foreman.cp_label == 'Test__String' }}" + - "{{ 'Test--String' | theforeman.foreman.cp_label == 'Test--String' }}" + - "{{ 'Test (String) 1234' | theforeman.foreman.cp_label == 'Test_String_1234' }}" ... diff --git a/tests/test_playbooks/global_parameter.yml b/tests/test_playbooks/global_parameter.yml index 6937f352..27d0a4f6 100644 --- a/tests/test_playbooks/global_parameter.yml +++ b/tests/test_playbooks/global_parameter.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -8,6 +10,8 @@ vars: global_parameter_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/hardware_model.yml b/tests/test_playbooks/hardware_model.yml index e1076c90..f1875b41 100644 --- a/tests/test_playbooks/hardware_model.yml +++ b/tests/test_playbooks/hardware_model.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -9,6 +11,8 @@ model_state: "absent" - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -47,6 +51,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/host.yml b/tests/test_playbooks/host.yml index 4c9598f6..79588dc6 100644 --- a/tests/test_playbooks/host.yml +++ b/tests/test_playbooks/host.yml @@ -10,6 +10,8 @@ command: hammer proxy import-classes --puppet-environment production --name {{ ansible_fqdn }} - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -88,6 +90,8 @@ host_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -373,6 +377,8 @@ expected_change: true - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/host_collection.yml b/tests/test_playbooks/host_collection.yml index 3c3994b6..b13ed739 100644 --- a/tests/test_playbooks/host_collection.yml +++ b/tests/test_playbooks/host_collection.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -9,6 +11,8 @@ organization_state: present - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -66,6 +70,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/host_power.yml b/tests/test_playbooks/host_power.yml index 2365e038..c2a137ac 100644 --- a/tests/test_playbooks/host_power.yml +++ b/tests/test_playbooks/host_power.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -12,6 +14,8 @@ host_power_state: "off" - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/hostgroup.yml b/tests/test_playbooks/hostgroup.yml index e52fa807..d1bcb320 100644 --- a/tests/test_playbooks/hostgroup.yml +++ b/tests/test_playbooks/hostgroup.yml @@ -8,6 +8,8 @@ ## - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -89,6 +91,8 @@ hostgroup_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -548,6 +552,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/image.yml b/tests/test_playbooks/image.yml index 4f16a943..043779bd 100644 --- a/tests/test_playbooks/image.yml +++ b/tests/test_playbooks/image.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -67,6 +69,8 @@ - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -165,6 +169,8 @@ expected_change: true - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/installation_medium.yml b/tests/test_playbooks/installation_medium.yml index 1d6180e8..5b8b9756 100644 --- a/tests/test_playbooks/installation_medium.yml +++ b/tests/test_playbooks/installation_medium.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -17,6 +19,8 @@ - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -116,6 +120,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/inventory_plugin.yml b/tests/test_playbooks/inventory_plugin.yml index 9df73c4e..22e19dfa 100644 --- a/tests/test_playbooks/inventory_plugin.yml +++ b/tests/test_playbooks/inventory_plugin.yml @@ -9,6 +9,7 @@ testhost2.example.com: group_b collections: - community.general + - theforeman.foreman tasks: - name: fetch Foreman container docker_image: diff --git a/tests/test_playbooks/job_template.yml b/tests/test_playbooks/job_template.yml index c8bfcef0..73679610 100644 --- a/tests/test_playbooks/job_template.yml +++ b/tests/test_playbooks/job_template.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -23,6 +25,8 @@ - "delete file" - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -170,6 +174,8 @@ expected_change: true - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/katello_hostgroup.yml b/tests/test_playbooks/katello_hostgroup.yml index 55593b26..96f1a696 100644 --- a/tests/test_playbooks/katello_hostgroup.yml +++ b/tests/test_playbooks/katello_hostgroup.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -30,6 +32,8 @@ hostgroup_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -72,6 +76,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/katello_manifest.yml b/tests/test_playbooks/katello_manifest.yml index 217296d3..6b4f5137 100644 --- a/tests/test_playbooks/katello_manifest.yml +++ b/tests/test_playbooks/katello_manifest.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -12,6 +14,8 @@ manifest_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -62,6 +66,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/lifecycle_environment.yml b/tests/test_playbooks/lifecycle_environment.yml index 9c7af803..f04dc7f6 100644 --- a/tests/test_playbooks/lifecycle_environment.yml +++ b/tests/test_playbooks/lifecycle_environment.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -18,6 +20,8 @@ - Dev - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -88,6 +92,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/location.yml b/tests/test_playbooks/location.yml index c5f2b1a2..5d2642ae 100644 --- a/tests/test_playbooks/location.yml +++ b/tests/test_playbooks/location.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -18,6 +20,8 @@ organization_state: present - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -183,6 +187,8 @@ expected_change: true - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/luna_hostgroup.yml b/tests/test_playbooks/luna_hostgroup.yml index 4b5bce4a..df920566 100644 --- a/tests/test_playbooks/luna_hostgroup.yml +++ b/tests/test_playbooks/luna_hostgroup.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -20,6 +22,8 @@ hostgroup_name: "New host group" hostgroup_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -56,6 +60,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/operatingsystem.yml b/tests/test_playbooks/operatingsystem.yml index 2f2c0927..a4bb45dd 100644 --- a/tests/test_playbooks/operatingsystem.yml +++ b/tests/test_playbooks/operatingsystem.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -13,6 +15,8 @@ operatingsystem_minor: 1 operatingsystem_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/organization.yml b/tests/test_playbooks/organization.yml index 6ce988a5..0b587e5f 100644 --- a/tests/test_playbooks/organization.yml +++ b/tests/test_playbooks/organization.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -8,6 +10,8 @@ vars: organization_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/os_default_template.yml b/tests/test_playbooks/os_default_template.yml index 2587e75c..fd5b60f6 100644 --- a/tests/test_playbooks/os_default_template.yml +++ b/tests/test_playbooks/os_default_template.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -26,6 +28,8 @@ os_default_template_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -66,6 +70,8 @@ - finish - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/partition_table.yml b/tests/test_playbooks/partition_table.yml index 532ef1cb..186382d2 100644 --- a/tests/test_playbooks/partition_table.yml +++ b/tests/test_playbooks/partition_table.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -12,6 +14,8 @@ location_state: present - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -163,6 +167,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/product.yml b/tests/test_playbooks/product.yml index 6a5c801a..1d98d76f 100644 --- a/tests/test_playbooks/product.yml +++ b/tests/test_playbooks/product.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -22,6 +24,8 @@ vars: product_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -106,6 +110,8 @@ product_state: absent expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/provisioning_template.yml b/tests/test_playbooks/provisioning_template.yml index e36c3f17..b3c85c99 100644 --- a/tests/test_playbooks/provisioning_template.yml +++ b/tests/test_playbooks/provisioning_template.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -23,6 +25,8 @@ location_state: present - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -139,6 +143,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/puppet_environment.yml b/tests/test_playbooks/puppet_environment.yml index 221fa87c..dc31a1fb 100644 --- a/tests/test_playbooks/puppet_environment.yml +++ b/tests/test_playbooks/puppet_environment.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -12,6 +14,8 @@ location_state: present - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -44,6 +48,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/realm.yml b/tests/test_playbooks/realm.yml index 276a82f9..6f265aa1 100644 --- a/tests/test_playbooks/realm.yml +++ b/tests/test_playbooks/realm.yml @@ -3,6 +3,8 @@ # might need to run its provisioning playbook by hand. --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -11,6 +13,8 @@ vars: realm_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/redhat_manifest.yml b/tests/test_playbooks/redhat_manifest.yml index 1698b222..7c16e1fd 100644 --- a/tests/test_playbooks/redhat_manifest.yml +++ b/tests/test_playbooks/redhat_manifest.yml @@ -1,5 +1,7 @@ --- - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/repository.yml b/tests/test_playbooks/repository.yml index d17b5b51..59508b65 100644 --- a/tests/test_playbooks/repository.yml +++ b/tests/test_playbooks/repository.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -20,6 +22,8 @@ product_state: present - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -188,6 +192,8 @@ repository_content_type: docker - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/repository_set.yml b/tests/test_playbooks/repository_set.yml index 2a2aca59..264ea4e9 100644 --- a/tests/test_playbooks/repository_set.yml +++ b/tests/test_playbooks/repository_set.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -18,6 +20,8 @@ state: disabled - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -175,6 +179,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/repository_sync.yml b/tests/test_playbooks/repository_sync.yml index a71b9567..3d4842f0 100644 --- a/tests/test_playbooks/repository_sync.yml +++ b/tests/test_playbooks/repository_sync.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -15,6 +17,8 @@ repository_state: present - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -27,6 +31,8 @@ repository: "Test Repository" - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/resource_info.yml b/tests/test_playbooks/resource_info.yml index 5dfde542..da13478d 100644 --- a/tests/test_playbooks/resource_info.yml +++ b/tests/test_playbooks/resource_info.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -20,6 +22,8 @@ loop: "{{ test_resources }}" - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -73,6 +77,8 @@ when: "'config_groups' not in result.msg" - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/role.yml b/tests/test_playbooks/role.yml index e996538d..cadded9c 100644 --- a/tests/test_playbooks/role.yml +++ b/tests/test_playbooks/role.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -19,6 +21,8 @@ - role_with_filters - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -116,6 +120,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/scap_content.yml b/tests/test_playbooks/scap_content.yml index 4bec33cf..447943f2 100644 --- a/tests/test_playbooks/scap_content.yml +++ b/tests/test_playbooks/scap_content.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -19,6 +21,8 @@ - updated_scap_content_title - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -84,6 +88,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/scap_tailoring_file.yml b/tests/test_playbooks/scap_tailoring_file.yml index 457b4482..ee3890e1 100644 --- a/tests/test_playbooks/scap_tailoring_file.yml +++ b/tests/test_playbooks/scap_tailoring_file.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -19,6 +21,8 @@ - updated_scap_tailoring_file_name - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -84,6 +88,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/scc_account.yml b/tests/test_playbooks/scc_account.yml index fb00e0ac..2f500273 100644 --- a/tests/test_playbooks/scc_account.yml +++ b/tests/test_playbooks/scc_account.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -19,6 +21,8 @@ scc_account_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -96,6 +100,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/scc_product.yml b/tests/test_playbooks/scc_product.yml index 510ba164..6602d2da 100644 --- a/tests/test_playbooks/scc_product.yml +++ b/tests/test_playbooks/scc_product.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -19,6 +21,8 @@ scc_account_state: synced - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -34,6 +38,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/setting.yml b/tests/test_playbooks/setting.yml index 02026ab7..187a5d14 100644 --- a/tests/test_playbooks/setting.yml +++ b/tests/test_playbooks/setting.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -13,6 +15,8 @@ setting_name: token_duration - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/smart_class_parameter.yml b/tests/test_playbooks/smart_class_parameter.yml index 81f29a55..3a528c98 100644 --- a/tests/test_playbooks/smart_class_parameter.yml +++ b/tests/test_playbooks/smart_class_parameter.yml @@ -8,6 +8,8 @@ ## - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -52,6 +54,8 @@ - stepout - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -523,6 +527,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/snapshot.yml b/tests/test_playbooks/snapshot.yml index 4641f9cd..e21c25c1 100644 --- a/tests/test_playbooks/snapshot.yml +++ b/tests/test_playbooks/snapshot.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -9,6 +11,8 @@ snapshot_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/subnet.yml b/tests/test_playbooks/subnet.yml index c0a38916..0b08f5bd 100644 --- a/tests/test_playbooks/subnet.yml +++ b/tests/test_playbooks/subnet.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -29,6 +31,8 @@ subnet_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -251,6 +255,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/sync_plan.yml b/tests/test_playbooks/sync_plan.yml index 818ddff2..8e76f596 100644 --- a/tests/test_playbooks/sync_plan.yml +++ b/tests/test_playbooks/sync_plan.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -15,6 +17,8 @@ sync_plan_state: absent - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -70,6 +74,8 @@ expected_change: true - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/tasks/templates_import.yml b/tests/test_playbooks/tasks/templates_import.yml index 475ee7bf..a930356b 100644 --- a/tests/test_playbooks/tasks/templates_import.yml +++ b/tests/test_playbooks/tasks/templates_import.yml @@ -1,3 +1,4 @@ +--- - name: Sync templates in from a git repo templates_import: username: "{{ foreman_username }}" diff --git a/tests/test_playbooks/templates_import.yml b/tests/test_playbooks/templates_import.yml index 6ba1ac39..54a7666f 100644 --- a/tests/test_playbooks/templates_import.yml +++ b/tests/test_playbooks/templates_import.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -19,6 +21,8 @@ location_state: present - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -76,6 +80,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/user.yml b/tests/test_playbooks/user.yml index 057ecc2c..1527c17f 100644 --- a/tests/test_playbooks/user.yml +++ b/tests/test_playbooks/user.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman tags: - setup gather_facts: false @@ -14,6 +16,8 @@ organization_state: "present" - hosts: tests + collections: + - theforeman.foreman tags: - test gather_facts: false @@ -82,6 +86,8 @@ expected_change: false - hosts: localhost + collections: + - theforeman.foreman tags: - teardown gather_facts: false diff --git a/tests/test_playbooks/usergroup.yml b/tests/test_playbooks/usergroup.yml index 1a748a00..179e0411 100644 --- a/tests/test_playbooks/usergroup.yml +++ b/tests/test_playbooks/usergroup.yml @@ -1,5 +1,7 @@ --- - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -23,6 +25,8 @@ with_items: "{{ group.roles }}" - hosts: tests + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml @@ -110,6 +114,8 @@ expected_change: true - hosts: localhost + collections: + - theforeman.foreman gather_facts: false vars_files: - vars/server.yml From 559c5f6cafbff3b1c5ff2f7e6e9783b0f0ed5865 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Fri, 19 Jun 2020 10:30:01 +0200 Subject: [PATCH 83/91] pure collection (#841) * use FQCN in plugins * no need to sed anymore * use FQCN for inventory test * make doc work inside collection * fix framework test --- Makefile | 15 +-------------- docs/Makefile | 2 +- plugins/callback/foreman.py | 4 ++-- plugins/inventory/foreman.py | 6 +++--- plugins/modules/activation_key.py | 6 +++--- plugins/modules/architecture.py | 6 +++--- plugins/modules/auth_source_ldap.py | 8 ++++---- plugins/modules/bookmark.py | 6 +++--- plugins/modules/compute_attribute.py | 6 +++--- plugins/modules/compute_profile.py | 6 +++--- plugins/modules/compute_resource.py | 8 ++++---- plugins/modules/config_group.py | 6 +++--- plugins/modules/content_credential.py | 8 ++++---- plugins/modules/content_upload.py | 6 +++--- plugins/modules/content_view.py | 8 ++++---- plugins/modules/content_view_filter.py | 6 +++--- plugins/modules/content_view_version.py | 8 ++++---- plugins/modules/domain.py | 10 +++++----- plugins/modules/external_usergroup.py | 6 +++--- plugins/modules/global_parameter.py | 6 +++--- plugins/modules/hardware_model.py | 6 +++--- plugins/modules/host.py | 10 +++++----- plugins/modules/host_collection.py | 8 ++++---- plugins/modules/host_power.py | 4 ++-- plugins/modules/hostgroup.py | 12 ++++++------ plugins/modules/image.py | 6 +++--- plugins/modules/installation_medium.py | 10 +++++----- plugins/modules/job_template.py | 8 ++++---- plugins/modules/lifecycle_environment.py | 8 ++++---- plugins/modules/location.py | 8 ++++---- plugins/modules/operatingsystem.py | 10 +++++----- plugins/modules/organization.py | 8 ++++---- plugins/modules/os_default_template.py | 6 +++--- plugins/modules/partition_table.py | 10 +++++----- plugins/modules/product.py | 8 ++++---- plugins/modules/provisioning_template.py | 8 ++++---- plugins/modules/puppet_environment.py | 8 ++++---- plugins/modules/realm.py | 8 ++++---- plugins/modules/repository.py | 8 ++++---- plugins/modules/repository_set.py | 6 +++--- plugins/modules/repository_sync.py | 6 +++--- plugins/modules/resource_info.py | 4 ++-- plugins/modules/role.py | 8 ++++---- plugins/modules/scap_content.py | 10 +++++----- plugins/modules/scap_tailoring_file.py | 10 +++++----- plugins/modules/scc_account.py | 6 +++--- plugins/modules/scc_product.py | 6 +++--- plugins/modules/setting.py | 4 ++-- plugins/modules/smart_class_parameter.py | 4 ++-- plugins/modules/snapshot.py | 4 ++-- plugins/modules/subnet.py | 10 +++++----- plugins/modules/subscription_manifest.py | 6 +++--- plugins/modules/sync_plan.py | 8 ++++---- plugins/modules/templates_import.py | 6 +++--- plugins/modules/user.py | 8 ++++---- plugins/modules/usergroup.py | 6 +++--- tests/inventory/tests.foreman.yml | 2 +- tests/test_module_state.py | 2 +- 58 files changed, 197 insertions(+), 210 deletions(-) diff --git a/Makefile b/Makefile index 6005d0fa..a954fa56 100644 --- a/Makefile +++ b/Makefile @@ -88,19 +88,6 @@ else ansible-galaxy collection install -p build/collections $< --force endif -# fix the imports to use the collection namespace -build/src/plugins/modules/%.py: plugins/modules/%.py | build/src - sed -e '/ansible.module_utils.foreman_helper/ s/ansible.module_utils/ansible_collections.$(NAMESPACE).$(NAME).plugins.module_utils/g' \ - -e '/extends_documentation_fragment/{:1 n; s/- foreman/- $(NAMESPACE).$(NAME).foreman/; t1}' $< > $@ - -build/src/plugins/inventory/%.py: plugins/inventory/%.py | build/src - sed -E -e '/NAME =/ s/foreman/$(NAMESPACE).$(NAME).foreman/' \ - -e '/(plugin|choices):/ s/foreman/$(NAMESPACE).$(NAME).foreman/' $< > $@ - -build/src/plugins/callback/%.py: plugins/callback/%.py | build/src - sed -e '/CALLBACK_NAME =/ s/foreman/$(NAMESPACE).$(NAME).foreman/' \ - -e '/callback:/ s/foreman/$(NAMESPACE).$(NAME).foreman/' $< > $@ - build/src/%: % | build/src cp $< $@ @@ -122,7 +109,7 @@ clean: doc-setup: pip install -r docs/requirements.txt -doc: +doc: $(MANIFEST) make -C docs html FORCE: diff --git a/docs/Makefile b/docs/Makefile index fabce4a5..f6149a94 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -21,7 +21,7 @@ $(ANSIBLEGIT): generate-docs: $(ANSIBLEGIT) rm -rf ./modules/ - bash -c "source $(ANSIBLEGIT)/hacking/env-setup && ANSIBLE_DOC_FRAGMENT_PLUGINS=../plugins/doc_fragments python3 $(ANSIBLEGIT)/hacking/build-ansible.py document-plugins --module-dir ../plugins/modules --template-dir ./_templates --template-dir $(ANSIBLEGIT)/docs/templates --type rst --output-dir ./modules/" + bash -c "source $(ANSIBLEGIT)/hacking/env-setup && ANSIBLE_COLLECTIONS_PATHS=../build/collections python3 $(ANSIBLEGIT)/hacking/build-ansible.py document-plugins --module-dir ../plugins/modules --template-dir ./_templates --template-dir $(ANSIBLEGIT)/docs/templates --type rst --output-dir ./modules/" # Catch-all target: route all unknown targets to Sphinx using the new # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). diff --git a/plugins/callback/foreman.py b/plugins/callback/foreman.py index 2b6a8a0c..eef2ac1e 100644 --- a/plugins/callback/foreman.py +++ b/plugins/callback/foreman.py @@ -8,7 +8,7 @@ __metaclass__ = type DOCUMENTATION = ''' - callback: foreman + callback: theforeman.foreman.foreman type: notification short_description: Sends events to Foreman description: @@ -83,7 +83,7 @@ class CallbackModule(CallbackBase): CALLBACK_VERSION = 2.0 CALLBACK_TYPE = 'notification' - CALLBACK_NAME = 'foreman' + CALLBACK_NAME = 'theforeman.foreman.foreman' CALLBACK_NEEDS_WHITELIST = True FOREMAN_HEADERS = { diff --git a/plugins/inventory/foreman.py b/plugins/inventory/foreman.py index bda1c4a7..8e61e3e6 100644 --- a/plugins/inventory/foreman.py +++ b/plugins/inventory/foreman.py @@ -21,7 +21,7 @@ plugin: description: token that ensures this is a source file for the C(foreman) plugin. required: True - choices: ['foreman'] + choices: ['theforeman.foreman.foreman'] url: description: url to foreman default: 'http://localhost:3000' @@ -72,7 +72,7 @@ EXAMPLES = ''' # my.foreman.yml -plugin: foreman +plugin: theforeman.foreman.foreman url: http://localhost:2222 user: ansible-tester password: secure @@ -101,7 +101,7 @@ class InventoryModule(BaseInventoryPlugin, Cacheable, Constructable): ''' Host inventory parser for ansible using foreman as source. ''' - NAME = 'foreman' + NAME = 'theforeman.foreman.foreman' def __init__(self): diff --git a/plugins/modules/activation_key.py b/plugins/modules/activation_key.py index 2e3a92b5..89f3b6a6 100644 --- a/plugins/modules/activation_key.py +++ b/plugins/modules/activation_key.py @@ -143,8 +143,8 @@ - Name of the new activation key when state == copied type: str extends_documentation_fragment: - - foreman - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -174,7 +174,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule def override_to_boolnone(override): diff --git a/plugins/modules/architecture.py b/plugins/modules/architecture.py index 57e11d1b..cdd5e87f 100644 --- a/plugins/modules/architecture.py +++ b/plugins/modules/architecture.py @@ -45,8 +45,8 @@ type: list elements: str extends_documentation_fragment: - - foreman - - foreman.entity_state + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state ''' EXAMPLES = ''' @@ -83,7 +83,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanArchitectureModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/auth_source_ldap.py b/plugins/modules/auth_source_ldap.py index 5d7a47e5..7066cfce 100644 --- a/plugins/modules/auth_source_ldap.py +++ b/plugins/modules/auth_source_ldap.py @@ -118,9 +118,9 @@ required: false type: str extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.taxonomy + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.taxonomy ''' EXAMPLES = ''' @@ -160,7 +160,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule class ForemanAuthSourceLdapModule(ForemanTaxonomicEntityAnsibleModule): diff --git a/plugins/modules/bookmark.py b/plugins/modules/bookmark.py index b0d1d499..48c514ea 100644 --- a/plugins/modules/bookmark.py +++ b/plugins/modules/bookmark.py @@ -54,8 +54,8 @@ - Query of the bookmark type: str extends_documentation_fragment: - - foreman - - foreman.entity_state_with_defaults + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state_with_defaults ''' EXAMPLES = ''' @@ -91,7 +91,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanBookmarkModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/compute_attribute.py b/plugins/modules/compute_attribute.py index 4d43fc58..f804c9a3 100644 --- a/plugins/modules/compute_attribute.py +++ b/plugins/modules/compute_attribute.py @@ -51,8 +51,8 @@ - vm_attributes type: dict extends_documentation_fragment: - - foreman - - foreman.entity_state + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state ''' EXAMPLES = ''' @@ -83,7 +83,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanComputeAttributeModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/compute_profile.py b/plugins/modules/compute_profile.py index 1401a7d7..172a2dc1 100644 --- a/plugins/modules/compute_profile.py +++ b/plugins/modules/compute_profile.py @@ -59,8 +59,8 @@ - vm_attributes type: dict extends_documentation_fragment: - - foreman - - foreman.entity_state + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state ''' EXAMPLES = ''' @@ -141,7 +141,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule compute_attribute_foreman_spec = { diff --git a/plugins/modules/compute_resource.py b/plugins/modules/compute_resource.py index 06a6e357..bb6d31a1 100644 --- a/plugins/modules/compute_resource.py +++ b/plugins/modules/compute_resource.py @@ -120,9 +120,9 @@ - verify ssl from provider I(provider=proxmox) type: bool extends_documentation_fragment: - - foreman - - foreman.entity_state_with_defaults - - foreman.taxonomy + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state_with_defaults + - theforeman.foreman.foreman.taxonomy ''' EXAMPLES = ''' @@ -285,7 +285,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule def get_provider_info(provider): diff --git a/plugins/modules/config_group.py b/plugins/modules/config_group.py index 447a6155..b5e974b1 100644 --- a/plugins/modules/config_group.py +++ b/plugins/modules/config_group.py @@ -45,8 +45,8 @@ type: list elements: str extends_documentation_fragment: - - foreman - - foreman.entity_state + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state ''' EXAMPLES = ''' @@ -64,7 +64,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanConfigGroupModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/content_credential.py b/plugins/modules/content_credential.py index b1a47a52..eeb15c41 100644 --- a/plugins/modules/content_credential.py +++ b/plugins/modules/content_credential.py @@ -50,9 +50,9 @@ required: true type: str extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -69,7 +69,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule class KatelloContentCredentialModule(KatelloEntityAnsibleModule): diff --git a/plugins/modules/content_upload.py b/plugins/modules/content_upload.py index 2f40ea06..bd95a0af 100644 --- a/plugins/modules/content_upload.py +++ b/plugins/modules/content_upload.py @@ -56,8 +56,8 @@ - Currently only uploading to deb, RPM & file repositories is supported - For anything but file repositories, a supporting library must be installed. See Requirements. extends_documentation_fragment: - - foreman - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -78,7 +78,7 @@ import traceback from ansible.module_utils._text import to_bytes -from ansible.module_utils.foreman_helper import KatelloAnsibleModule, missing_required_lib +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloAnsibleModule, missing_required_lib try: from debian import debfile diff --git a/plugins/modules/content_view.py b/plugins/modules/content_view.py index 45e88167..a63af846 100644 --- a/plugins/modules/content_view.py +++ b/plugins/modules/content_view.py @@ -96,9 +96,9 @@ aliases: - version extends_documentation_fragment: - - foreman - - foreman.entity_state_with_defaults - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state_with_defaults + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -132,7 +132,7 @@ RETURN = ''' # ''' import copy -from ansible.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule cvc_foreman_spec = { diff --git a/plugins/modules/content_view_filter.py b/plugins/modules/content_view_filter.py index 97dc7eb2..2343d990 100644 --- a/plugins/modules/content_view_filter.py +++ b/plugins/modules/content_view_filter.py @@ -140,8 +140,8 @@ - Include all RPMs with no errata type: bool extends_documentation_fragment: - - foreman - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -172,7 +172,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloAnsibleModule, _foreman_spec_helper +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloAnsibleModule, _foreman_spec_helper content_filter_spec = { 'id': {}, diff --git a/plugins/modules/content_view_version.py b/plugins/modules/content_view_version.py index 6da51bf1..d7e82306 100644 --- a/plugins/modules/content_view_version.py +++ b/plugins/modules/content_view_version.py @@ -70,9 +70,9 @@ - Helpful for promoting a content view version type: str extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -132,7 +132,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule def promote_content_view_version(module, content_view_version, environments, force, force_yum_metadata_regeneration): diff --git a/plugins/modules/domain.py b/plugins/modules/domain.py index c6ed45dc..c39bcc83 100644 --- a/plugins/modules/domain.py +++ b/plugins/modules/domain.py @@ -55,10 +55,10 @@ description: - Domain specific host parameters extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.taxonomy - - foreman.nested_parameters + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.taxonomy + - theforeman.foreman.foreman.nested_parameters ''' EXAMPLES = ''' @@ -78,7 +78,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule, NestedParametersMixin +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule, NestedParametersMixin class ForemanDomainModule(NestedParametersMixin, ForemanTaxonomicEntityAnsibleModule): diff --git a/plugins/modules/external_usergroup.py b/plugins/modules/external_usergroup.py index eedc5166..b10d3268 100644 --- a/plugins/modules/external_usergroup.py +++ b/plugins/modules/external_usergroup.py @@ -48,8 +48,8 @@ required: true type: str extends_documentation_fragment: - - foreman - - foreman.entity_state + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state ''' EXAMPLES = ''' @@ -63,7 +63,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanExternalUsergroupModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/global_parameter.py b/plugins/modules/global_parameter.py index 7b9ab4c0..cc6a0eee 100644 --- a/plugins/modules/global_parameter.py +++ b/plugins/modules/global_parameter.py @@ -66,8 +66,8 @@ notes: - The I(parameter_type) only has an effect on Foreman >= 1.22 extends_documentation_fragment: - - foreman - - foreman.entity_state_with_defaults + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state_with_defaults ''' EXAMPLES = ''' @@ -101,7 +101,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule, parameter_value_to_str +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule, parameter_value_to_str class ForemanCommonParameterModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/hardware_model.py b/plugins/modules/hardware_model.py index e53f8fc9..8ff14036 100644 --- a/plugins/modules/hardware_model.py +++ b/plugins/modules/hardware_model.py @@ -52,8 +52,8 @@ - This is primarily used by Sparc Solaris builds and can be left blank for other architectures. type: str extends_documentation_fragment: - - foreman - - foreman.entity_state + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state ''' EXAMPLES = ''' @@ -70,7 +70,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanModelModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/host.py b/plugins/modules/host.py index a81dcfce..052c6cfe 100644 --- a/plugins/modules/host.py +++ b/plugins/modules/host.py @@ -114,10 +114,10 @@ type: str required: false extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.host_options - - foreman.nested_parameters + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.host_options + - theforeman.foreman.foreman.nested_parameters ''' EXAMPLES = ''' @@ -160,7 +160,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ( +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( ensure_puppetclasses, ForemanEntityAnsibleModule, HostMixin, diff --git a/plugins/modules/host_collection.py b/plugins/modules/host_collection.py index cf86bd06..3d43511a 100644 --- a/plugins/modules/host_collection.py +++ b/plugins/modules/host_collection.py @@ -48,9 +48,9 @@ - New name of the host collection. When this parameter is set, the module will not be idempotent. type: str extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -67,7 +67,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule class KatelloHostCollectionModule(KatelloEntityAnsibleModule): diff --git a/plugins/modules/host_power.py b/plugins/modules/host_power.py index 92b3e847..d74f9d00 100644 --- a/plugins/modules/host_power.py +++ b/plugins/modules/host_power.py @@ -56,7 +56,7 @@ - 'status' type: str extends_documentation_fragment: - - foreman + - theforeman.foreman.foreman ''' EXAMPLES = ''' @@ -98,7 +98,7 @@ sample: "off" ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule def main(): diff --git a/plugins/modules/hostgroup.py b/plugins/modules/hostgroup.py index 0cebfb36..12334c2e 100644 --- a/plugins/modules/hostgroup.py +++ b/plugins/modules/hostgroup.py @@ -59,11 +59,11 @@ description: - Hostgroup specific host parameters extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.taxonomy - - foreman.nested_parameters - - foreman.host_options + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.taxonomy + - theforeman.foreman.foreman.nested_parameters + - theforeman.foreman.foreman.host_options ''' EXAMPLES = ''' @@ -134,7 +134,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ( +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( ensure_puppetclasses, HostMixin, ForemanTaxonomicEntityAnsibleModule, diff --git a/plugins/modules/image.py b/plugins/modules/image.py index 39fb4091..bdd82180 100644 --- a/plugins/modules/image.py +++ b/plugins/modules/image.py @@ -67,8 +67,8 @@ required: false type: bool extends_documentation_fragment: - - foreman - - foreman.entity_state + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state ''' EXAMPLES = ''' @@ -84,7 +84,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanImageModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/installation_medium.py b/plugins/modules/installation_medium.py index f3392e1f..ab5b73ab 100644 --- a/plugins/modules/installation_medium.py +++ b/plugins/modules/installation_medium.py @@ -55,10 +55,10 @@ description: Path to the installation medium type: str extends_documentation_fragment: - - foreman - - foreman.entity_state_with_defaults - - foreman.taxonomy - - foreman.os_family + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state_with_defaults + - theforeman.foreman.foreman.taxonomy + - theforeman.foreman.foreman.os_family ''' EXAMPLES = ''' @@ -80,7 +80,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule, OS_LIST +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule, OS_LIST class ForemanInstallationMediumModule(ForemanTaxonomicEntityAnsibleModule): diff --git a/plugins/modules/job_template.py b/plugins/modules/job_template.py index e38a9921..84188512 100644 --- a/plugins/modules/job_template.py +++ b/plugins/modules/job_template.py @@ -147,9 +147,9 @@ - Type of the resource type: str extends_documentation_fragment: - - foreman - - foreman.entity_state_with_defaults - - foreman.taxonomy + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state_with_defaults + - theforeman.foreman.foreman.taxonomy ''' EXAMPLES = ''' @@ -280,7 +280,7 @@ RETURN = ''' # ''' import os -from ansible.module_utils.foreman_helper import ( +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( ForemanTaxonomicEntityAnsibleModule, parse_template, parse_template_from_file, diff --git a/plugins/modules/lifecycle_environment.py b/plugins/modules/lifecycle_environment.py index 819438e2..7dc676b4 100644 --- a/plugins/modules/lifecycle_environment.py +++ b/plugins/modules/lifecycle_environment.py @@ -52,9 +52,9 @@ - Name of the parent lifecycle environment type: str extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -73,7 +73,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule class KatelloLifecycleEnvironmentModule(KatelloEntityAnsibleModule): diff --git a/plugins/modules/location.py b/plugins/modules/location.py index 939ecfb1..52824cd0 100644 --- a/plugins/modules/location.py +++ b/plugins/modules/location.py @@ -47,9 +47,9 @@ type: list elements: str extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.nested_parameters + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.nested_parameters ''' EXAMPLES = ''' @@ -96,7 +96,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule, NestedParametersMixin +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule, NestedParametersMixin class ForemanLocationModule(NestedParametersMixin, ForemanEntityAnsibleModule): diff --git a/plugins/modules/operatingsystem.py b/plugins/modules/operatingsystem.py index acbceaa3..5d47423a 100644 --- a/plugins/modules/operatingsystem.py +++ b/plugins/modules/operatingsystem.py @@ -109,10 +109,10 @@ description: - Operating System specific host parameters extends_documentation_fragment: - - foreman - - foreman.entity_state_with_defaults - - foreman.nested_parameters - - foreman.os_family + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state_with_defaults + - theforeman.foreman.foreman.nested_parameters + - theforeman.foreman.foreman.os_family ''' EXAMPLES = ''' @@ -155,7 +155,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ( +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( ForemanEntityAnsibleModule, NestedParametersMixin, OS_LIST, diff --git a/plugins/modules/organization.py b/plugins/modules/organization.py index 3113e974..80bb5a34 100644 --- a/plugins/modules/organization.py +++ b/plugins/modules/organization.py @@ -49,9 +49,9 @@ - Label of the Organization type: str extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.nested_parameters + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.nested_parameters ''' EXAMPLES = ''' @@ -67,7 +67,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule, NestedParametersMixin +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule, NestedParametersMixin class ForemanOrganizationModule(NestedParametersMixin, ForemanEntityAnsibleModule): diff --git a/plugins/modules/os_default_template.py b/plugins/modules/os_default_template.py index fe431198..cfed83c3 100644 --- a/plugins/modules/os_default_template.py +++ b/plugins/modules/os_default_template.py @@ -48,8 +48,8 @@ required: false type: str extends_documentation_fragment: - - foreman - - foreman.entity_state_with_defaults + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state_with_defaults ''' EXAMPLES = ''' @@ -76,7 +76,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanOsDefaultTemplateModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/partition_table.py b/plugins/modules/partition_table.py index 785c216a..cb8b72be 100644 --- a/plugins/modules/partition_table.py +++ b/plugins/modules/partition_table.py @@ -68,10 +68,10 @@ description: - The OS family the template shall be assigned with. extends_documentation_fragment: - - foreman - - foreman.entity_state_with_defaults - - foreman.taxonomy - - foreman.os_family + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state_with_defaults + - theforeman.foreman.foreman.taxonomy + - theforeman.foreman.foreman.os_family ''' EXAMPLES = ''' @@ -191,7 +191,7 @@ import os -from ansible.module_utils.foreman_helper import ( +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( ForemanTaxonomicEntityAnsibleModule, parse_template, parse_template_from_file, diff --git a/plugins/modules/product.py b/plugins/modules/product.py index 77d5835c..452e4a4a 100644 --- a/plugins/modules/product.py +++ b/plugins/modules/product.py @@ -74,9 +74,9 @@ required: false type: str extends_documentation_fragment: - - foreman - - foreman.entity_state_with_defaults - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state_with_defaults + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -104,7 +104,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule class KatelloProductModule(KatelloEntityAnsibleModule): diff --git a/plugins/modules/provisioning_template.py b/plugins/modules/provisioning_template.py index 37fddbca..6aa7da68 100644 --- a/plugins/modules/provisioning_template.py +++ b/plugins/modules/provisioning_template.py @@ -93,9 +93,9 @@ type: list elements: str extends_documentation_fragment: - - foreman - - foreman.entity_state_with_defaults - - foreman.taxonomy + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state_with_defaults + - theforeman.foreman.foreman.taxonomy ''' EXAMPLES = ''' @@ -218,7 +218,7 @@ import os -from ansible.module_utils.foreman_helper import ( +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( ForemanTaxonomicEntityAnsibleModule, parse_template, parse_template_from_file, diff --git a/plugins/modules/puppet_environment.py b/plugins/modules/puppet_environment.py index a7c742da..81ec0271 100644 --- a/plugins/modules/puppet_environment.py +++ b/plugins/modules/puppet_environment.py @@ -39,9 +39,9 @@ required: true type: str extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.taxonomy + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.taxonomy ''' EXAMPLES = ''' @@ -60,7 +60,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ( +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( ForemanTaxonomicEntityAnsibleModule, ) diff --git a/plugins/modules/realm.py b/plugins/modules/realm.py index afffa99b..d1fdb686 100644 --- a/plugins/modules/realm.py +++ b/plugins/modules/realm.py @@ -52,9 +52,9 @@ required: true type: str extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.taxonomy + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.taxonomy ''' EXAMPLES = ''' @@ -71,7 +71,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule class ForemanRealmModule(ForemanTaxonomicEntityAnsibleModule): diff --git a/plugins/modules/repository.py b/plugins/modules/repository.py index 4651ae3f..384dbd1d 100644 --- a/plugins/modules/repository.py +++ b/plugins/modules/repository.py @@ -161,9 +161,9 @@ type: str required: false extends_documentation_fragment: - - foreman - - foreman.entity_state_with_defaults - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state_with_defaults + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -200,7 +200,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule class KatelloRepositoryModule(KatelloEntityAnsibleModule): diff --git a/plugins/modules/repository_set.py b/plugins/modules/repository_set.py index c606f698..85995146 100644 --- a/plugins/modules/repository_set.py +++ b/plugins/modules/repository_set.py @@ -80,8 +80,8 @@ default: enabled type: str extends_documentation_fragment: - - foreman - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -194,7 +194,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule def get_desired_repos(desired_substitutions, available_repos): diff --git a/plugins/modules/repository_sync.py b/plugins/modules/repository_sync.py index 6022ffd2..0c2ac0fd 100644 --- a/plugins/modules/repository_sync.py +++ b/plugins/modules/repository_sync.py @@ -44,8 +44,8 @@ If omitted, all repositories in I(product) are synched. type: str extends_documentation_fragment: - - foreman - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.organization ... ''' @@ -97,7 +97,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloAnsibleModule def main(): diff --git a/plugins/modules/resource_info.py b/plugins/modules/resource_info.py index ff372def..e094065d 100644 --- a/plugins/modules/resource_info.py +++ b/plugins/modules/resource_info.py @@ -62,7 +62,7 @@ notes: - Some resources don't support scoping and will return errors when you pass I(organization) or unknown data in I(params). extends_documentation_fragment: - - foreman + - theforeman.foreman.foreman ''' EXAMPLES = ''' @@ -130,7 +130,7 @@ type: list ''' -from ansible.module_utils.foreman_helper import ForemanAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanAnsibleModule def main(): diff --git a/plugins/modules/role.py b/plugins/modules/role.py index 89ccea95..d5f5b0a8 100644 --- a/plugins/modules/role.py +++ b/plugins/modules/role.py @@ -56,9 +56,9 @@ required: false type: str extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.taxonomy + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.taxonomy ''' EXAMPLES = ''' @@ -84,7 +84,7 @@ import copy -from ansible.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule filter_foreman_spec = dict( diff --git a/plugins/modules/scap_content.py b/plugins/modules/scap_content.py index 11a632d2..63fddedb 100644 --- a/plugins/modules/scap_content.py +++ b/plugins/modules/scap_content.py @@ -43,10 +43,10 @@ - When this parameter is set, the module will not be idempotent. type: str extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.taxonomy - - foreman.scap_datastream + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.taxonomy + - theforeman.foreman.foreman.scap_datastream ''' EXAMPLES = ''' @@ -92,7 +92,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanScapDataStreamModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanScapDataStreamModule class ForemanScapContentModule(ForemanScapDataStreamModule): diff --git a/plugins/modules/scap_tailoring_file.py b/plugins/modules/scap_tailoring_file.py index 521972f9..f5892d8e 100644 --- a/plugins/modules/scap_tailoring_file.py +++ b/plugins/modules/scap_tailoring_file.py @@ -43,10 +43,10 @@ - When this parameter is set, the module will not be idempotent. type: str extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.taxonomy - - foreman.scap_datastream + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.taxonomy + - theforeman.foreman.foreman.scap_datastream ''' EXAMPLES = ''' @@ -92,7 +92,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanScapDataStreamModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanScapDataStreamModule class ForemanTailoringFileModule(ForemanScapDataStreamModule): diff --git a/plugins/modules/scc_account.py b/plugins/modules/scc_account.py index 233ef3ef..1c266c85 100644 --- a/plugins/modules/scc_account.py +++ b/plugins/modules/scc_account.py @@ -78,8 +78,8 @@ choices: ["present", "absent", "synced"] type: str extends_documentation_fragment: - - foreman - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -114,7 +114,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule class KatelloSccAccountModule(KatelloEntityAnsibleModule): diff --git a/plugins/modules/scc_product.py b/plugins/modules/scc_product.py index 434f48a7..354f48f0 100644 --- a/plugins/modules/scc_product.py +++ b/plugins/modules/scc_product.py @@ -46,8 +46,8 @@ required: true type: str extends_documentation_fragment: - - foreman - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -61,7 +61,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloAnsibleModule def main(): diff --git a/plugins/modules/setting.py b/plugins/modules/setting.py index 479e9fbb..c98848d4 100644 --- a/plugins/modules/setting.py +++ b/plugins/modules/setting.py @@ -44,7 +44,7 @@ required: false type: raw extends_documentation_fragment: - - foreman + - theforeman.foreman.foreman ''' EXAMPLES = ''' @@ -72,7 +72,7 @@ ''' -from ansible.module_utils.foreman_helper import ForemanAnsibleModule, parameter_value_to_str, _foreman_spec_helper +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanAnsibleModule, parameter_value_to_str, _foreman_spec_helper class ForemanSettingModule(ForemanAnsibleModule): diff --git a/plugins/modules/smart_class_parameter.py b/plugins/modules/smart_class_parameter.py index 25bc49da..40a58b86 100644 --- a/plugins/modules/smart_class_parameter.py +++ b/plugins/modules/smart_class_parameter.py @@ -120,7 +120,7 @@ - present - present_with_defaults extends_documentation_fragment: - - foreman + - theforeman.foreman.foreman ''' EXAMPLES = ''' @@ -160,7 +160,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule, parameter_value_to_str +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule, parameter_value_to_str override_value_foreman_spec = dict( match=dict(required=True), diff --git a/plugins/modules/snapshot.py b/plugins/modules/snapshot.py index d3d9801c..1af266b9 100644 --- a/plugins/modules/snapshot.py +++ b/plugins/modules/snapshot.py @@ -57,7 +57,7 @@ choices: ["present", "reverted", "absent"] type: str extends_documentation_fragment: - - foreman + - theforeman.foreman.foreman ''' EXAMPLES = ''' @@ -102,7 +102,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanSnapshotModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/subnet.py b/plugins/modules/subnet.py index 98a7a8ec..63623096 100644 --- a/plugins/modules/subnet.py +++ b/plugins/modules/subnet.py @@ -146,10 +146,10 @@ description: - Subnet specific host parameters extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.taxonomy - - foreman.nested_parameters + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.taxonomy + - theforeman.foreman.foreman.nested_parameters ''' EXAMPLES = ''' @@ -185,7 +185,7 @@ RETURN = ''' # ''' import traceback -from ansible.module_utils.foreman_helper import ( +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( ForemanTaxonomicEntityAnsibleModule, NestedParametersMixin, missing_required_lib ) try: diff --git a/plugins/modules/subscription_manifest.py b/plugins/modules/subscription_manifest.py index 784ae42f..540c7bd5 100644 --- a/plugins/modules/subscription_manifest.py +++ b/plugins/modules/subscription_manifest.py @@ -51,8 +51,8 @@ aliases: [ redhat_repository_url ] type: str extends_documentation_fragment: - - foreman - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -68,7 +68,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule def main(): diff --git a/plugins/modules/sync_plan.py b/plugins/modules/sync_plan.py index 5b5215c8..eced9f88 100644 --- a/plugins/modules/sync_plan.py +++ b/plugins/modules/sync_plan.py @@ -75,9 +75,9 @@ type: list elements: str extends_documentation_fragment: - - foreman - - foreman.entity_state_with_defaults - - foreman.organization + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state_with_defaults + - theforeman.foreman.foreman.organization ''' EXAMPLES = ''' @@ -99,7 +99,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule class KatelloSyncPlanModule(KatelloEntityAnsibleModule): diff --git a/plugins/modules/templates_import.py b/plugins/modules/templates_import.py index eaf81024..c9e0b8e3 100644 --- a/plugins/modules/templates_import.py +++ b/plugins/modules/templates_import.py @@ -94,8 +94,8 @@ required: false type: str extends_documentation_fragment: - - foreman - - foreman.taxonomy + - theforeman.foreman.foreman + - theforeman.foreman.foreman.taxonomy ''' EXAMPLES = ''' @@ -111,7 +111,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanTaxonomicAnsibleModule, _flatten_entity +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicAnsibleModule, _flatten_entity def main(): diff --git a/plugins/modules/user.py b/plugins/modules/user.py index a81d6194..72cc72e2 100644 --- a/plugins/modules/user.py +++ b/plugins/modules/user.py @@ -274,9 +274,9 @@ type: list elements: str extends_documentation_fragment: - - foreman - - foreman.entity_state - - foreman.taxonomy + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state + - theforeman.foreman.foreman.taxonomy ''' EXAMPLES = ''' @@ -317,7 +317,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ( +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( ForemanTaxonomicEntityAnsibleModule, ) diff --git a/plugins/modules/usergroup.py b/plugins/modules/usergroup.py index dda52f51..a88d24dc 100644 --- a/plugins/modules/usergroup.py +++ b/plugins/modules/usergroup.py @@ -67,8 +67,8 @@ type: list elements: str extends_documentation_fragment: - - foreman - - foreman.entity_state + - theforeman.foreman.foreman + - theforeman.foreman.foreman.entity_state ''' EXAMPLES = ''' @@ -88,7 +88,7 @@ RETURN = ''' # ''' -from ansible.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanUsergroupModule(ForemanEntityAnsibleModule): diff --git a/tests/inventory/tests.foreman.yml b/tests/inventory/tests.foreman.yml index dfc80cae..0a2a67bb 100644 --- a/tests/inventory/tests.foreman.yml +++ b/tests/inventory/tests.foreman.yml @@ -1,4 +1,4 @@ -plugin: foreman +plugin: theforeman.foreman.foreman url: http://localhost:3000/ user: admin password: changeme diff --git a/tests/test_module_state.py b/tests/test_module_state.py index 0ef5d4db..c410dd63 100644 --- a/tests/test_module_state.py +++ b/tests/test_module_state.py @@ -48,7 +48,7 @@ def _module_framework_from_body(body): framework = None for entry in body: if isinstance(entry, ast.ImportFrom): - if entry.module == 'ansible.module_utils.foreman_helper' and not framework: + if entry.module == 'ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper' and not framework: framework = 'apypie' elif isinstance(entry, ast_try) and not framework: framework = _module_framework_from_body(entry.body) From 643ba77a3630c6663501ed30382c8d39a7c87c26 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Fri, 19 Jun 2020 11:12:01 +0200 Subject: [PATCH 84/91] better docs formatting (#843) and a fix in job template as it has no "layout" --- plugins/modules/installation_medium.py | 5 ++--- plugins/modules/job_template.py | 13 +++++-------- plugins/modules/partition_table.py | 11 ++++------- plugins/modules/provisioning_template.py | 11 ++++------- 4 files changed, 15 insertions(+), 25 deletions(-) diff --git a/plugins/modules/installation_medium.py b/plugins/modules/installation_medium.py index ab5b73ab..69998bc0 100644 --- a/plugins/modules/installation_medium.py +++ b/plugins/modules/installation_medium.py @@ -34,9 +34,8 @@ options: name: description: - - | - The full installation medium name. - The special name "*" (only possible as parameter) is used to perform bulk actions (modify, delete) on all existing partition tables. + - The full installation medium name. + - The special name "*" (only possible as parameter) is used to perform bulk actions (modify, delete) on all existing partition tables. required: true type: str updated_name: diff --git a/plugins/modules/job_template.py b/plugins/modules/job_template.py index 84188512..c65fe2e1 100644 --- a/plugins/modules/job_template.py +++ b/plugins/modules/job_template.py @@ -43,10 +43,8 @@ type: str file_name: description: - - | - The path of a template file, that shall be imported. - Either this or layout is required as a source for - the Job Template "content". + - The path of a template file, that shall be imported. + - Either this or I(template) is required as a source for the Job Template "content". type: path job_category: description: @@ -75,9 +73,8 @@ type: bool template: description: - - | - The content of the Job Template, either this or file_name - is required as a source for the Job Template "content". + - The content of the Job Template. + - Either this or I(file_name) is required as a source for the Job Template "content". type: str template_inputs: description: @@ -247,7 +244,7 @@ username: "admin" password: "changeme" state: present - layout: '{{ lookup("file", item.src) }}' + template: '{{ lookup("file", item.src) }}' with_filetree: '/path/to/job/templates' when: item.state == 'file' diff --git a/plugins/modules/partition_table.py b/plugins/modules/partition_table.py index cb8b72be..9869a758 100644 --- a/plugins/modules/partition_table.py +++ b/plugins/modules/partition_table.py @@ -35,17 +35,14 @@ options: file_name: description: - - | - The path of a template file, that shall be imported. - Either this or layout is required as a source for - the Partition Template "content". + - The path of a template file, that shall be imported. + - Either this or I(layout) is required as a source for the Partition Template "content". required: false type: path layout: description: - - | - The content of the Partitioning Table Template, either this or file_name - is required as a source for the Partition Template "content". + - The content of the Partitioning Table Template + - Either this or I(file_name) is required as a source for the Partition Template "content". required: false type: str locked: diff --git a/plugins/modules/provisioning_template.py b/plugins/modules/provisioning_template.py index 6aa7da68..11034b49 100644 --- a/plugins/modules/provisioning_template.py +++ b/plugins/modules/provisioning_template.py @@ -59,17 +59,14 @@ type: str template: description: - - | - The content of the provisioning template, either this or file_name - is required as a source for the Provisioning Template "content". + - The content of the provisioning template. + - Either this or I(file_name) is required as a source for the Provisioning Template "content". required: false type: str file_name: description: - - | - The path of a template file, that shall be imported. - Either this or template is required as a source for - the Provisioning Template "content". + - The path of a template file, that shall be imported. + - Either this or I(template) is required as a source for the Provisioning Template "content". required: false type: path locked: From 2988d9888c8e8459de2b7d22f715d25893a73b73 Mon Sep 17 00:00:00 2001 From: Matthias Dellweg <2500@gmx.de> Date: Fri, 19 Jun 2020 11:18:29 +0200 Subject: [PATCH 85/91] Use required_by in hostgroup (#844) Fixes #399 --- plugins/modules/hostgroup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/modules/hostgroup.py b/plugins/modules/hostgroup.py index 12334c2e..5372f5a5 100644 --- a/plugins/modules/hostgroup.py +++ b/plugins/modules/hostgroup.py @@ -156,14 +156,14 @@ def main(): argument_spec=dict( updated_name=dict(), ), + required_by=dict( + content_source=('organization',), + content_view=('organization',), + lifecycle_environment=('organization',), + ), ) module_params = module.foreman_params - katello_params = ['content_source', 'lifecycle_environment', 'content_view'] - - if 'organization' not in module_params and list(set(katello_params) & set(module_params.keys())): - module.fail_json(msg="Please specify the organization when using katello parameters.") - with module.api_connection(): if not module.desired_absent: if 'organization' in module_params: From 82ae5ccdf077966101405ab83690d9b6c612d487 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Fri, 19 Jun 2020 11:13:21 +0200 Subject: [PATCH 86/91] drop bad repository_sync example fixes #838 --- plugins/modules/repository_sync.py | 35 ------------------------------ 1 file changed, 35 deletions(-) diff --git a/plugins/modules/repository_sync.py b/plugins/modules/repository_sync.py index 0c2ac0fd..abe4d9a0 100644 --- a/plugins/modules/repository_sync.py +++ b/plugins/modules/repository_sync.py @@ -58,41 +58,6 @@ repository: "My repository" product: "My Product" organization: "Default Organization" - -# Sync all repositories -- name: Get all repositories - resource_info: - username: "admin" - password: "changeme" - server_url: "https://foreman.example.com" - resource: repositories - register: repositories - -- name: Kick off repository Sync tasks - repository_sync: - username: "admin" - password: "changeme" - server_url: "https://foreman.example.com" - product: "{{ item.product.name }}" - repository: "{{ item.name }}" - organization: "Default Organization" - loop: "{{ repositories.resources }}" - when: item.url # Not all repositories have a URL - async: 999999 - poll: 0 - register: repo_sync_sleeper - -- name: Wait until all Syncs have finished - async_status: - jid: "{{ repo_sync_sleeper_item.ansible_job_id }}" - loop: "{{ repo_sync_sleeper.results }}" - loop_control: - loop_var: repo_sync_sleeper_item - when: repo_sync_sleeper_item.ansible_job_id is defined # Skip items that were skipped in the previous task - register: async_job_result - until: async_job_result.finished - retries: 999 - delay: 10 ''' RETURN = ''' # ''' From 7b0566453761e8391a0b7682dbcce8249b64223b Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Fri, 19 Jun 2020 11:24:01 +0200 Subject: [PATCH 87/91] release 1.0.0 --- galaxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy.yml b/galaxy.yml index 206ea6a8..caebdc42 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -49,7 +49,7 @@ authors: - "metalcated " - "russianguppie <46544650+russianguppie@users.noreply.github.com>" - "willtome " -version: "0.8.1" +version: "1.0.0" license: - "GPL-3.0-or-later" tags: From e1abac417773a8a958389348b668adc272ab4920 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 22 Jun 2020 10:19:53 +0200 Subject: [PATCH 88/91] don't hardcode collection name in mazer install step --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a954fa56..90994182 100644 --- a/Makefile +++ b/Makefile @@ -82,8 +82,8 @@ $(MANIFEST): $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz ifeq ($(COLLECTION_COMMAND),mazer) # No idea, why this fails. But mazer is old and deprecated so unlikely to beeing fixed... # mazer install --collections-path build/collections $< - -mkdir build/collections build/collections/ansible_collections build/collections/ansible_collections/theforeman build/collections/ansible_collections/theforeman/foreman - tar xf $< -C build/collections/ansible_collections/theforeman/foreman + -mkdir build/collections build/collections/ansible_collections build/collections/ansible_collections/$(NAMESPACE) build/collections/ansible_collections/$(NAMESPACE)/$(NAME) + tar xf $< -C build/collections/ansible_collections/$(NAMESPACE)/$(NAME) else ansible-galaxy collection install -p build/collections $< --force endif From e027ba4aed8f1e2184e14d131c7826067875ecc3 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 22 Jun 2020 10:23:35 +0200 Subject: [PATCH 89/91] update documentation to reflect the removed foreman_ prefix --- README.md | 6 +++--- docs/developing.md | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c27d78cb..1ea8cf6b 100644 --- a/README.md +++ b/README.md @@ -30,12 +30,12 @@ Starting with Ansible 2.7, Ansible only supports Python 2.7 and 3.5 (and higher) * Some modules, e.g. `katello_sync` and `katello_content_view_version`, trigger long running tasks on the server side. It might be beneficial to your playbook to wait for their completion in an asynchronous manner. As Ansible has facilities to do so, the modules will wait unconditionally. See the [Ansible documentation](https://docs.ansible.com/ansible/latest/user_guide/playbooks_async.html) for putting tasks in the background. -* `foreman_compute_resource` can leak sensitive data if used within a loop. According to [ansible documentation](https://docs.ansible.com/ansible/latest/user_guide/playbooks_loops.html), using loop over Ansible resources can leak sensitive data. You can prevent this by using `no_log: yes` on the task. +* `compute_resource` can leak sensitive data if used within a loop. According to [ansible documentation](https://docs.ansible.com/ansible/latest/user_guide/playbooks_loops.html), using loop over Ansible resources can leak sensitive data. You can prevent this by using `no_log: yes` on the task. eg: ```yaml - name: Create compute resources - foreman_compute_resource: + compute_resource: server_url: https://foreman.example.com username: admin password: changeme @@ -73,6 +73,6 @@ These dependencies are required for the Ansible controller, not the Foreman serv * `PyYAML` * [`apypie`](https://pypi.org/project/apypie/) -* [`ipaddress`](https://pypi.org/project/ipaddress/) for the `foreman_subnet` module on Python 2.7 +* [`ipaddress`](https://pypi.org/project/ipaddress/) for the `subnet` module on Python 2.7 * `rpm` for the RPM support in the `katello_upload` module * `debian` for the DEB support in the `katello_upload` module diff --git a/docs/developing.md b/docs/developing.md index db4df897..1ceeec28 100644 --- a/docs/developing.md +++ b/docs/developing.md @@ -2,7 +2,7 @@ First of all, please have a look at the [Ansible module development](https://docs.ansible.com/ansible/latest/dev_guide/developing_modules_general.html) guide and get familiar with the general Ansible module layout. -When looking at actual modules in this repository ([`foreman_domain`](../plugins/modules/foreman_domain.py) is a nice short example), you will notice a few differences to a "regular" Ansible module: +When looking at actual modules in this repository ([`domain`](../plugins/modules/domain.py) is a nice short example), you will notice a few differences to a "regular" Ansible module: * Instead of `AnsibleModule`, we use `ForemanEntityAnsibleModule` (and a few others, see [`plugins/module_utils/foreman_helper.py`](../plugins/module_utils/foreman_helper.py)) which provides an abstraction layer for talking with the Foreman API * Instead of Ansible's `argument_spec`, we provide an enhanced version called `foreman_spec`. It handles the translation from Ansible module arguments to Foreman API parameters, as nobody wants to write `organization_ids` in their playbook when they can write `organizations` @@ -42,8 +42,8 @@ The rest of the module is usually very minimalistic: if __name__ == '__main__': main() ``` -You can see a complete example of simple module in [`foreman_architecture`](../plugins/modules/foreman_architecture.py) -In some cases, you will have to handle some custom workflows/validations, you can see some examples in [`foreman_bookmark`](../plugins/modules/foreman_bookmark.py), [`foreman_compute_attribute`](../plugins/modules/foreman_compute_attribute.py), [`foreman_hostgroup`](../plugins/modules/foreman_hostgroup.py), [`foreman_provisioning_template`](../plugins/modules/foreman_provisioning_template.py)... +You can see a complete example of simple module in [`architecture`](../plugins/modules/architecture.py) +In some cases, you will have to handle some custom workflows/validations, you can see some examples in [`bookmark`](../plugins/modules/bookmark.py), [`compute_attribute`](../plugins/modules/compute_attribute.py), [`hostgroup`](../plugins/modules/hostgroup.py), [`provisioning_template`](../plugins/modules/provisioning_template.py)... ## Specification of the `foreman_spec` @@ -57,7 +57,7 @@ This is usually combined with `flat_name=_id`. If no flat_name is provid This is usually combined with `flat_name=_ids`. If no flat_name is provided, fallback to `singularize()_ids` where entity is the foreman_spec key. eg `organizations=dict(type='entity_list')` => `flat_name=organization_ids`. * `type='nested_list'` The referenced value is a list of Foreman entities that are not included in the main API call. The module must handle the entities separately. -See domain parameters in [`foreman_domain`](../plugins/modules/foreman_domain.py) for an example. +See domain parameters in [`domain`](../plugins/modules/domain.py) for an example. The sub entities must be described by `foreman_spec=_spec`. * `type='invisible'` The parameter is available to the API call, but it will be excluded from Ansible's `argument_spec`. * `search_by='login'`: Used with `type='entity'` or `type='entity_list'`. Field used to search the sub entity. Defaults to value provided by `ENTITY_KEYS` or 'name' if no value found. @@ -93,7 +93,7 @@ required_plugins=[ ] ``` -Or specific parameters, like the `discovery_proxy` parameter of `foreman_subnet` which needs the Discovery plugin: +Or specific parameters, like the `discovery_proxy` parameter of `subnet` which needs the Discovery plugin: ```python required_plugins=[ ('discovery', ['discovery_proxy']), From be0eb869bb3f054e05f0af90b798a3fbee75c438 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 22 Jun 2020 10:12:30 +0200 Subject: [PATCH 90/91] add branding target to makefile --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 90994182..a4bab1b6 100644 --- a/Makefile +++ b/Makefile @@ -112,6 +112,9 @@ doc-setup: doc: $(MANIFEST) make -C docs html +branding: + sed -i 's/theforeman\.foreman/redhat.satellite/g' plugins/*/*.py tests/inventory/tests.foreman.yml tests/test_module_state.py tests/test_playbooks/*.yml + FORCE: .PHONY: help dist lint sanity test test-crud test-check-mode test-other setup test-setup FORCE From 34f098fd63635ac5580ea851610cf011e7d176a7 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 22 Jun 2020 13:58:31 +0200 Subject: [PATCH 91/91] re-brand --- plugins/callback/foreman.py | 4 ++-- plugins/inventory/foreman.py | 6 +++--- plugins/modules/activation_key.py | 6 +++--- plugins/modules/architecture.py | 6 +++--- plugins/modules/auth_source_ldap.py | 8 ++++---- plugins/modules/bookmark.py | 6 +++--- plugins/modules/compute_attribute.py | 6 +++--- plugins/modules/compute_profile.py | 6 +++--- plugins/modules/compute_resource.py | 8 ++++---- plugins/modules/config_group.py | 6 +++--- plugins/modules/content_credential.py | 8 ++++---- plugins/modules/content_upload.py | 6 +++--- plugins/modules/content_view.py | 8 ++++---- plugins/modules/content_view_filter.py | 6 +++--- plugins/modules/content_view_version.py | 8 ++++---- plugins/modules/domain.py | 10 +++++----- plugins/modules/external_usergroup.py | 6 +++--- plugins/modules/global_parameter.py | 6 +++--- plugins/modules/hardware_model.py | 6 +++--- plugins/modules/host.py | 10 +++++----- plugins/modules/host_collection.py | 8 ++++---- plugins/modules/host_power.py | 4 ++-- plugins/modules/hostgroup.py | 12 ++++++------ plugins/modules/image.py | 6 +++--- plugins/modules/installation_medium.py | 10 +++++----- plugins/modules/job_template.py | 8 ++++---- plugins/modules/lifecycle_environment.py | 8 ++++---- plugins/modules/location.py | 8 ++++---- plugins/modules/operatingsystem.py | 10 +++++----- plugins/modules/organization.py | 8 ++++---- plugins/modules/os_default_template.py | 6 +++--- plugins/modules/partition_table.py | 10 +++++----- plugins/modules/product.py | 8 ++++---- plugins/modules/provisioning_template.py | 8 ++++---- plugins/modules/puppet_environment.py | 8 ++++---- plugins/modules/realm.py | 8 ++++---- plugins/modules/repository.py | 8 ++++---- plugins/modules/repository_set.py | 6 +++--- plugins/modules/repository_sync.py | 6 +++--- plugins/modules/resource_info.py | 4 ++-- plugins/modules/role.py | 8 ++++---- plugins/modules/scap_content.py | 10 +++++----- plugins/modules/scap_tailoring_file.py | 10 +++++----- plugins/modules/setting.py | 4 ++-- plugins/modules/smart_class_parameter.py | 4 ++-- plugins/modules/subnet.py | 10 +++++----- plugins/modules/subscription_manifest.py | 6 +++--- plugins/modules/sync_plan.py | 8 ++++---- plugins/modules/templates_import.py | 6 +++--- plugins/modules/user.py | 8 ++++---- plugins/modules/usergroup.py | 6 +++--- tests/inventory/tests.foreman.yml | 2 +- tests/test_module_state.py | 2 +- tests/test_playbooks/activation_key.yml | 6 +++--- tests/test_playbooks/architecture.yml | 6 +++--- tests/test_playbooks/auth_source_ldap.yml | 6 +++--- tests/test_playbooks/bookmark.yml | 2 +- tests/test_playbooks/compute_attribute.yml | 6 +++--- tests/test_playbooks/compute_profile.yml | 6 +++--- tests/test_playbooks/compute_resource.yml | 6 +++--- tests/test_playbooks/config_group.yml | 2 +- tests/test_playbooks/content_credential.yml | 6 +++--- tests/test_playbooks/content_upload.yml | 6 +++--- tests/test_playbooks/content_view.yml | 6 +++--- tests/test_playbooks/content_view_filter.yml | 6 +++--- tests/test_playbooks/content_view_version.yml | 6 +++--- tests/test_playbooks/domain.yml | 6 +++--- tests/test_playbooks/external_usergroup.yml | 6 +++--- tests/test_playbooks/filters.yml | 12 ++++++------ tests/test_playbooks/global_parameter.yml | 4 ++-- tests/test_playbooks/hardware_model.yml | 6 +++--- tests/test_playbooks/host.yml | 6 +++--- tests/test_playbooks/host_collection.yml | 6 +++--- tests/test_playbooks/host_power.yml | 4 ++-- tests/test_playbooks/hostgroup.yml | 6 +++--- tests/test_playbooks/image.yml | 6 +++--- tests/test_playbooks/installation_medium.yml | 6 +++--- tests/test_playbooks/inventory_plugin.yml | 2 +- tests/test_playbooks/job_template.yml | 6 +++--- tests/test_playbooks/katello_hostgroup.yml | 6 +++--- tests/test_playbooks/katello_manifest.yml | 6 +++--- tests/test_playbooks/lifecycle_environment.yml | 6 +++--- tests/test_playbooks/location.yml | 6 +++--- tests/test_playbooks/luna_hostgroup.yml | 6 +++--- tests/test_playbooks/operatingsystem.yml | 4 ++-- tests/test_playbooks/organization.yml | 4 ++-- tests/test_playbooks/os_default_template.yml | 6 +++--- tests/test_playbooks/partition_table.yml | 6 +++--- tests/test_playbooks/product.yml | 6 +++--- tests/test_playbooks/provisioning_template.yml | 6 +++--- tests/test_playbooks/puppet_environment.yml | 6 +++--- tests/test_playbooks/realm.yml | 4 ++-- tests/test_playbooks/redhat_manifest.yml | 2 +- tests/test_playbooks/repository.yml | 6 +++--- tests/test_playbooks/repository_set.yml | 6 +++--- tests/test_playbooks/repository_sync.yml | 6 +++--- tests/test_playbooks/resource_info.yml | 6 +++--- tests/test_playbooks/role.yml | 6 +++--- tests/test_playbooks/scap_content.yml | 6 +++--- tests/test_playbooks/scap_tailoring_file.yml | 6 +++--- tests/test_playbooks/setting.yml | 4 ++-- tests/test_playbooks/smart_class_parameter.yml | 6 +++--- tests/test_playbooks/subnet.yml | 6 +++--- tests/test_playbooks/sync_plan.yml | 6 +++--- tests/test_playbooks/templates_import.yml | 6 +++--- tests/test_playbooks/user.yml | 6 +++--- tests/test_playbooks/usergroup.yml | 6 +++--- 107 files changed, 338 insertions(+), 338 deletions(-) diff --git a/plugins/callback/foreman.py b/plugins/callback/foreman.py index eef2ac1e..7ca7651e 100644 --- a/plugins/callback/foreman.py +++ b/plugins/callback/foreman.py @@ -8,7 +8,7 @@ __metaclass__ = type DOCUMENTATION = ''' - callback: theforeman.foreman.foreman + callback: redhat.satellite.foreman type: notification short_description: Sends events to Foreman description: @@ -83,7 +83,7 @@ class CallbackModule(CallbackBase): CALLBACK_VERSION = 2.0 CALLBACK_TYPE = 'notification' - CALLBACK_NAME = 'theforeman.foreman.foreman' + CALLBACK_NAME = 'redhat.satellite.foreman' CALLBACK_NEEDS_WHITELIST = True FOREMAN_HEADERS = { diff --git a/plugins/inventory/foreman.py b/plugins/inventory/foreman.py index 8e61e3e6..5b7a08a4 100644 --- a/plugins/inventory/foreman.py +++ b/plugins/inventory/foreman.py @@ -21,7 +21,7 @@ plugin: description: token that ensures this is a source file for the C(foreman) plugin. required: True - choices: ['theforeman.foreman.foreman'] + choices: ['redhat.satellite.foreman'] url: description: url to foreman default: 'http://localhost:3000' @@ -72,7 +72,7 @@ EXAMPLES = ''' # my.foreman.yml -plugin: theforeman.foreman.foreman +plugin: redhat.satellite.foreman url: http://localhost:2222 user: ansible-tester password: secure @@ -101,7 +101,7 @@ class InventoryModule(BaseInventoryPlugin, Cacheable, Constructable): ''' Host inventory parser for ansible using foreman as source. ''' - NAME = 'theforeman.foreman.foreman' + NAME = 'redhat.satellite.foreman' def __init__(self): diff --git a/plugins/modules/activation_key.py b/plugins/modules/activation_key.py index 89f3b6a6..d86ea3d5 100644 --- a/plugins/modules/activation_key.py +++ b/plugins/modules/activation_key.py @@ -143,8 +143,8 @@ - Name of the new activation key when state == copied type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.organization ''' EXAMPLES = ''' @@ -174,7 +174,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule def override_to_boolnone(override): diff --git a/plugins/modules/architecture.py b/plugins/modules/architecture.py index cdd5e87f..f3f1b735 100644 --- a/plugins/modules/architecture.py +++ b/plugins/modules/architecture.py @@ -45,8 +45,8 @@ type: list elements: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state ''' EXAMPLES = ''' @@ -83,7 +83,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanArchitectureModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/auth_source_ldap.py b/plugins/modules/auth_source_ldap.py index 7066cfce..8c2d2215 100644 --- a/plugins/modules/auth_source_ldap.py +++ b/plugins/modules/auth_source_ldap.py @@ -118,9 +118,9 @@ required: false type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.taxonomy + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.taxonomy ''' EXAMPLES = ''' @@ -160,7 +160,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule class ForemanAuthSourceLdapModule(ForemanTaxonomicEntityAnsibleModule): diff --git a/plugins/modules/bookmark.py b/plugins/modules/bookmark.py index 48c514ea..659de6d4 100644 --- a/plugins/modules/bookmark.py +++ b/plugins/modules/bookmark.py @@ -54,8 +54,8 @@ - Query of the bookmark type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state_with_defaults + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state_with_defaults ''' EXAMPLES = ''' @@ -91,7 +91,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanBookmarkModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/compute_attribute.py b/plugins/modules/compute_attribute.py index f804c9a3..da42f313 100644 --- a/plugins/modules/compute_attribute.py +++ b/plugins/modules/compute_attribute.py @@ -51,8 +51,8 @@ - vm_attributes type: dict extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state ''' EXAMPLES = ''' @@ -83,7 +83,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanComputeAttributeModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/compute_profile.py b/plugins/modules/compute_profile.py index 172a2dc1..49ae1043 100644 --- a/plugins/modules/compute_profile.py +++ b/plugins/modules/compute_profile.py @@ -59,8 +59,8 @@ - vm_attributes type: dict extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state ''' EXAMPLES = ''' @@ -141,7 +141,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule compute_attribute_foreman_spec = { diff --git a/plugins/modules/compute_resource.py b/plugins/modules/compute_resource.py index bb6d31a1..b911e522 100644 --- a/plugins/modules/compute_resource.py +++ b/plugins/modules/compute_resource.py @@ -120,9 +120,9 @@ - verify ssl from provider I(provider=proxmox) type: bool extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state_with_defaults - - theforeman.foreman.foreman.taxonomy + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state_with_defaults + - redhat.satellite.foreman.taxonomy ''' EXAMPLES = ''' @@ -285,7 +285,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule def get_provider_info(provider): diff --git a/plugins/modules/config_group.py b/plugins/modules/config_group.py index b5e974b1..4580d416 100644 --- a/plugins/modules/config_group.py +++ b/plugins/modules/config_group.py @@ -45,8 +45,8 @@ type: list elements: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state ''' EXAMPLES = ''' @@ -64,7 +64,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanConfigGroupModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/content_credential.py b/plugins/modules/content_credential.py index eeb15c41..4c7171fa 100644 --- a/plugins/modules/content_credential.py +++ b/plugins/modules/content_credential.py @@ -50,9 +50,9 @@ required: true type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.organization ''' EXAMPLES = ''' @@ -69,7 +69,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule class KatelloContentCredentialModule(KatelloEntityAnsibleModule): diff --git a/plugins/modules/content_upload.py b/plugins/modules/content_upload.py index bd95a0af..3f18e12d 100644 --- a/plugins/modules/content_upload.py +++ b/plugins/modules/content_upload.py @@ -56,8 +56,8 @@ - Currently only uploading to deb, RPM & file repositories is supported - For anything but file repositories, a supporting library must be installed. See Requirements. extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.organization ''' EXAMPLES = ''' @@ -78,7 +78,7 @@ import traceback from ansible.module_utils._text import to_bytes -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloAnsibleModule, missing_required_lib +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloAnsibleModule, missing_required_lib try: from debian import debfile diff --git a/plugins/modules/content_view.py b/plugins/modules/content_view.py index a63af846..88349bbc 100644 --- a/plugins/modules/content_view.py +++ b/plugins/modules/content_view.py @@ -96,9 +96,9 @@ aliases: - version extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state_with_defaults - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state_with_defaults + - redhat.satellite.foreman.organization ''' EXAMPLES = ''' @@ -132,7 +132,7 @@ RETURN = ''' # ''' import copy -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule cvc_foreman_spec = { diff --git a/plugins/modules/content_view_filter.py b/plugins/modules/content_view_filter.py index 2343d990..519a3f42 100644 --- a/plugins/modules/content_view_filter.py +++ b/plugins/modules/content_view_filter.py @@ -140,8 +140,8 @@ - Include all RPMs with no errata type: bool extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.organization ''' EXAMPLES = ''' @@ -172,7 +172,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloAnsibleModule, _foreman_spec_helper +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloAnsibleModule, _foreman_spec_helper content_filter_spec = { 'id': {}, diff --git a/plugins/modules/content_view_version.py b/plugins/modules/content_view_version.py index d7e82306..16a26302 100644 --- a/plugins/modules/content_view_version.py +++ b/plugins/modules/content_view_version.py @@ -70,9 +70,9 @@ - Helpful for promoting a content view version type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.organization ''' EXAMPLES = ''' @@ -132,7 +132,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule def promote_content_view_version(module, content_view_version, environments, force, force_yum_metadata_regeneration): diff --git a/plugins/modules/domain.py b/plugins/modules/domain.py index c39bcc83..896417f3 100644 --- a/plugins/modules/domain.py +++ b/plugins/modules/domain.py @@ -55,10 +55,10 @@ description: - Domain specific host parameters extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.taxonomy - - theforeman.foreman.foreman.nested_parameters + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.taxonomy + - redhat.satellite.foreman.nested_parameters ''' EXAMPLES = ''' @@ -78,7 +78,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule, NestedParametersMixin +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule, NestedParametersMixin class ForemanDomainModule(NestedParametersMixin, ForemanTaxonomicEntityAnsibleModule): diff --git a/plugins/modules/external_usergroup.py b/plugins/modules/external_usergroup.py index b10d3268..2b83fc59 100644 --- a/plugins/modules/external_usergroup.py +++ b/plugins/modules/external_usergroup.py @@ -48,8 +48,8 @@ required: true type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state ''' EXAMPLES = ''' @@ -63,7 +63,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanExternalUsergroupModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/global_parameter.py b/plugins/modules/global_parameter.py index cc6a0eee..4317525b 100644 --- a/plugins/modules/global_parameter.py +++ b/plugins/modules/global_parameter.py @@ -66,8 +66,8 @@ notes: - The I(parameter_type) only has an effect on Foreman >= 1.22 extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state_with_defaults + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state_with_defaults ''' EXAMPLES = ''' @@ -101,7 +101,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule, parameter_value_to_str +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule, parameter_value_to_str class ForemanCommonParameterModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/hardware_model.py b/plugins/modules/hardware_model.py index 8ff14036..c0058764 100644 --- a/plugins/modules/hardware_model.py +++ b/plugins/modules/hardware_model.py @@ -52,8 +52,8 @@ - This is primarily used by Sparc Solaris builds and can be left blank for other architectures. type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state ''' EXAMPLES = ''' @@ -70,7 +70,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanModelModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/host.py b/plugins/modules/host.py index 052c6cfe..50e1c3a1 100644 --- a/plugins/modules/host.py +++ b/plugins/modules/host.py @@ -114,10 +114,10 @@ type: str required: false extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.host_options - - theforeman.foreman.foreman.nested_parameters + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.host_options + - redhat.satellite.foreman.nested_parameters ''' EXAMPLES = ''' @@ -160,7 +160,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ( ensure_puppetclasses, ForemanEntityAnsibleModule, HostMixin, diff --git a/plugins/modules/host_collection.py b/plugins/modules/host_collection.py index 3d43511a..3ac9689d 100644 --- a/plugins/modules/host_collection.py +++ b/plugins/modules/host_collection.py @@ -48,9 +48,9 @@ - New name of the host collection. When this parameter is set, the module will not be idempotent. type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.organization ''' EXAMPLES = ''' @@ -67,7 +67,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule class KatelloHostCollectionModule(KatelloEntityAnsibleModule): diff --git a/plugins/modules/host_power.py b/plugins/modules/host_power.py index d74f9d00..f43bbc39 100644 --- a/plugins/modules/host_power.py +++ b/plugins/modules/host_power.py @@ -56,7 +56,7 @@ - 'status' type: str extends_documentation_fragment: - - theforeman.foreman.foreman + - redhat.satellite.foreman ''' EXAMPLES = ''' @@ -98,7 +98,7 @@ sample: "off" ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule def main(): diff --git a/plugins/modules/hostgroup.py b/plugins/modules/hostgroup.py index 5372f5a5..56dbc1ac 100644 --- a/plugins/modules/hostgroup.py +++ b/plugins/modules/hostgroup.py @@ -59,11 +59,11 @@ description: - Hostgroup specific host parameters extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.taxonomy - - theforeman.foreman.foreman.nested_parameters - - theforeman.foreman.foreman.host_options + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.taxonomy + - redhat.satellite.foreman.nested_parameters + - redhat.satellite.foreman.host_options ''' EXAMPLES = ''' @@ -134,7 +134,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ( ensure_puppetclasses, HostMixin, ForemanTaxonomicEntityAnsibleModule, diff --git a/plugins/modules/image.py b/plugins/modules/image.py index bdd82180..d3637567 100644 --- a/plugins/modules/image.py +++ b/plugins/modules/image.py @@ -67,8 +67,8 @@ required: false type: bool extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state ''' EXAMPLES = ''' @@ -84,7 +84,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanImageModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/installation_medium.py b/plugins/modules/installation_medium.py index 69998bc0..182eea3d 100644 --- a/plugins/modules/installation_medium.py +++ b/plugins/modules/installation_medium.py @@ -54,10 +54,10 @@ description: Path to the installation medium type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state_with_defaults - - theforeman.foreman.foreman.taxonomy - - theforeman.foreman.foreman.os_family + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state_with_defaults + - redhat.satellite.foreman.taxonomy + - redhat.satellite.foreman.os_family ''' EXAMPLES = ''' @@ -79,7 +79,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule, OS_LIST +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule, OS_LIST class ForemanInstallationMediumModule(ForemanTaxonomicEntityAnsibleModule): diff --git a/plugins/modules/job_template.py b/plugins/modules/job_template.py index c65fe2e1..e17e826d 100644 --- a/plugins/modules/job_template.py +++ b/plugins/modules/job_template.py @@ -144,9 +144,9 @@ - Type of the resource type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state_with_defaults - - theforeman.foreman.foreman.taxonomy + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state_with_defaults + - redhat.satellite.foreman.taxonomy ''' EXAMPLES = ''' @@ -277,7 +277,7 @@ RETURN = ''' # ''' import os -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ( ForemanTaxonomicEntityAnsibleModule, parse_template, parse_template_from_file, diff --git a/plugins/modules/lifecycle_environment.py b/plugins/modules/lifecycle_environment.py index 7dc676b4..3af0de4f 100644 --- a/plugins/modules/lifecycle_environment.py +++ b/plugins/modules/lifecycle_environment.py @@ -52,9 +52,9 @@ - Name of the parent lifecycle environment type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.organization ''' EXAMPLES = ''' @@ -73,7 +73,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule class KatelloLifecycleEnvironmentModule(KatelloEntityAnsibleModule): diff --git a/plugins/modules/location.py b/plugins/modules/location.py index 52824cd0..0b5928a1 100644 --- a/plugins/modules/location.py +++ b/plugins/modules/location.py @@ -47,9 +47,9 @@ type: list elements: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.nested_parameters + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.nested_parameters ''' EXAMPLES = ''' @@ -96,7 +96,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule, NestedParametersMixin +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule, NestedParametersMixin class ForemanLocationModule(NestedParametersMixin, ForemanEntityAnsibleModule): diff --git a/plugins/modules/operatingsystem.py b/plugins/modules/operatingsystem.py index 5d47423a..e4117bbd 100644 --- a/plugins/modules/operatingsystem.py +++ b/plugins/modules/operatingsystem.py @@ -109,10 +109,10 @@ description: - Operating System specific host parameters extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state_with_defaults - - theforeman.foreman.foreman.nested_parameters - - theforeman.foreman.foreman.os_family + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state_with_defaults + - redhat.satellite.foreman.nested_parameters + - redhat.satellite.foreman.os_family ''' EXAMPLES = ''' @@ -155,7 +155,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ( ForemanEntityAnsibleModule, NestedParametersMixin, OS_LIST, diff --git a/plugins/modules/organization.py b/plugins/modules/organization.py index 80bb5a34..81fea610 100644 --- a/plugins/modules/organization.py +++ b/plugins/modules/organization.py @@ -49,9 +49,9 @@ - Label of the Organization type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.nested_parameters + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.nested_parameters ''' EXAMPLES = ''' @@ -67,7 +67,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule, NestedParametersMixin +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule, NestedParametersMixin class ForemanOrganizationModule(NestedParametersMixin, ForemanEntityAnsibleModule): diff --git a/plugins/modules/os_default_template.py b/plugins/modules/os_default_template.py index cfed83c3..31ae97e1 100644 --- a/plugins/modules/os_default_template.py +++ b/plugins/modules/os_default_template.py @@ -48,8 +48,8 @@ required: false type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state_with_defaults + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state_with_defaults ''' EXAMPLES = ''' @@ -76,7 +76,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanOsDefaultTemplateModule(ForemanEntityAnsibleModule): diff --git a/plugins/modules/partition_table.py b/plugins/modules/partition_table.py index 9869a758..77e8261e 100644 --- a/plugins/modules/partition_table.py +++ b/plugins/modules/partition_table.py @@ -65,10 +65,10 @@ description: - The OS family the template shall be assigned with. extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state_with_defaults - - theforeman.foreman.foreman.taxonomy - - theforeman.foreman.foreman.os_family + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state_with_defaults + - redhat.satellite.foreman.taxonomy + - redhat.satellite.foreman.os_family ''' EXAMPLES = ''' @@ -188,7 +188,7 @@ import os -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ( ForemanTaxonomicEntityAnsibleModule, parse_template, parse_template_from_file, diff --git a/plugins/modules/product.py b/plugins/modules/product.py index 452e4a4a..0dec814e 100644 --- a/plugins/modules/product.py +++ b/plugins/modules/product.py @@ -74,9 +74,9 @@ required: false type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state_with_defaults - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state_with_defaults + - redhat.satellite.foreman.organization ''' EXAMPLES = ''' @@ -104,7 +104,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule class KatelloProductModule(KatelloEntityAnsibleModule): diff --git a/plugins/modules/provisioning_template.py b/plugins/modules/provisioning_template.py index 11034b49..1cf427e2 100644 --- a/plugins/modules/provisioning_template.py +++ b/plugins/modules/provisioning_template.py @@ -90,9 +90,9 @@ type: list elements: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state_with_defaults - - theforeman.foreman.foreman.taxonomy + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state_with_defaults + - redhat.satellite.foreman.taxonomy ''' EXAMPLES = ''' @@ -215,7 +215,7 @@ import os -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ( ForemanTaxonomicEntityAnsibleModule, parse_template, parse_template_from_file, diff --git a/plugins/modules/puppet_environment.py b/plugins/modules/puppet_environment.py index 81ec0271..7e16f8a8 100644 --- a/plugins/modules/puppet_environment.py +++ b/plugins/modules/puppet_environment.py @@ -39,9 +39,9 @@ required: true type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.taxonomy + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.taxonomy ''' EXAMPLES = ''' @@ -60,7 +60,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ( ForemanTaxonomicEntityAnsibleModule, ) diff --git a/plugins/modules/realm.py b/plugins/modules/realm.py index d1fdb686..a6c7eb32 100644 --- a/plugins/modules/realm.py +++ b/plugins/modules/realm.py @@ -52,9 +52,9 @@ required: true type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.taxonomy + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.taxonomy ''' EXAMPLES = ''' @@ -71,7 +71,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule class ForemanRealmModule(ForemanTaxonomicEntityAnsibleModule): diff --git a/plugins/modules/repository.py b/plugins/modules/repository.py index 384dbd1d..c59ae0ab 100644 --- a/plugins/modules/repository.py +++ b/plugins/modules/repository.py @@ -161,9 +161,9 @@ type: str required: false extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state_with_defaults - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state_with_defaults + - redhat.satellite.foreman.organization ''' EXAMPLES = ''' @@ -200,7 +200,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule class KatelloRepositoryModule(KatelloEntityAnsibleModule): diff --git a/plugins/modules/repository_set.py b/plugins/modules/repository_set.py index 85995146..5bc3bdf6 100644 --- a/plugins/modules/repository_set.py +++ b/plugins/modules/repository_set.py @@ -80,8 +80,8 @@ default: enabled type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.organization ''' EXAMPLES = ''' @@ -194,7 +194,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule def get_desired_repos(desired_substitutions, available_repos): diff --git a/plugins/modules/repository_sync.py b/plugins/modules/repository_sync.py index abe4d9a0..6965a8a5 100644 --- a/plugins/modules/repository_sync.py +++ b/plugins/modules/repository_sync.py @@ -44,8 +44,8 @@ If omitted, all repositories in I(product) are synched. type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.organization ... ''' @@ -62,7 +62,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloAnsibleModule def main(): diff --git a/plugins/modules/resource_info.py b/plugins/modules/resource_info.py index e094065d..543ad988 100644 --- a/plugins/modules/resource_info.py +++ b/plugins/modules/resource_info.py @@ -62,7 +62,7 @@ notes: - Some resources don't support scoping and will return errors when you pass I(organization) or unknown data in I(params). extends_documentation_fragment: - - theforeman.foreman.foreman + - redhat.satellite.foreman ''' EXAMPLES = ''' @@ -130,7 +130,7 @@ type: list ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanAnsibleModule def main(): diff --git a/plugins/modules/role.py b/plugins/modules/role.py index d5f5b0a8..13f1e840 100644 --- a/plugins/modules/role.py +++ b/plugins/modules/role.py @@ -56,9 +56,9 @@ required: false type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.taxonomy + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.taxonomy ''' EXAMPLES = ''' @@ -84,7 +84,7 @@ import copy -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanTaxonomicEntityAnsibleModule filter_foreman_spec = dict( diff --git a/plugins/modules/scap_content.py b/plugins/modules/scap_content.py index 63fddedb..78a3a6d0 100644 --- a/plugins/modules/scap_content.py +++ b/plugins/modules/scap_content.py @@ -43,10 +43,10 @@ - When this parameter is set, the module will not be idempotent. type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.taxonomy - - theforeman.foreman.foreman.scap_datastream + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.taxonomy + - redhat.satellite.foreman.scap_datastream ''' EXAMPLES = ''' @@ -92,7 +92,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanScapDataStreamModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanScapDataStreamModule class ForemanScapContentModule(ForemanScapDataStreamModule): diff --git a/plugins/modules/scap_tailoring_file.py b/plugins/modules/scap_tailoring_file.py index f5892d8e..c5bdb9d0 100644 --- a/plugins/modules/scap_tailoring_file.py +++ b/plugins/modules/scap_tailoring_file.py @@ -43,10 +43,10 @@ - When this parameter is set, the module will not be idempotent. type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.taxonomy - - theforeman.foreman.foreman.scap_datastream + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.taxonomy + - redhat.satellite.foreman.scap_datastream ''' EXAMPLES = ''' @@ -92,7 +92,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanScapDataStreamModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanScapDataStreamModule class ForemanTailoringFileModule(ForemanScapDataStreamModule): diff --git a/plugins/modules/setting.py b/plugins/modules/setting.py index c98848d4..945f06cc 100644 --- a/plugins/modules/setting.py +++ b/plugins/modules/setting.py @@ -44,7 +44,7 @@ required: false type: raw extends_documentation_fragment: - - theforeman.foreman.foreman + - redhat.satellite.foreman ''' EXAMPLES = ''' @@ -72,7 +72,7 @@ ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanAnsibleModule, parameter_value_to_str, _foreman_spec_helper +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanAnsibleModule, parameter_value_to_str, _foreman_spec_helper class ForemanSettingModule(ForemanAnsibleModule): diff --git a/plugins/modules/smart_class_parameter.py b/plugins/modules/smart_class_parameter.py index 40a58b86..6054a946 100644 --- a/plugins/modules/smart_class_parameter.py +++ b/plugins/modules/smart_class_parameter.py @@ -120,7 +120,7 @@ - present - present_with_defaults extends_documentation_fragment: - - theforeman.foreman.foreman + - redhat.satellite.foreman ''' EXAMPLES = ''' @@ -160,7 +160,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule, parameter_value_to_str +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule, parameter_value_to_str override_value_foreman_spec = dict( match=dict(required=True), diff --git a/plugins/modules/subnet.py b/plugins/modules/subnet.py index 63623096..c51cc988 100644 --- a/plugins/modules/subnet.py +++ b/plugins/modules/subnet.py @@ -146,10 +146,10 @@ description: - Subnet specific host parameters extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.taxonomy - - theforeman.foreman.foreman.nested_parameters + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.taxonomy + - redhat.satellite.foreman.nested_parameters ''' EXAMPLES = ''' @@ -185,7 +185,7 @@ RETURN = ''' # ''' import traceback -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ( ForemanTaxonomicEntityAnsibleModule, NestedParametersMixin, missing_required_lib ) try: diff --git a/plugins/modules/subscription_manifest.py b/plugins/modules/subscription_manifest.py index 540c7bd5..b367086b 100644 --- a/plugins/modules/subscription_manifest.py +++ b/plugins/modules/subscription_manifest.py @@ -51,8 +51,8 @@ aliases: [ redhat_repository_url ] type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.organization ''' EXAMPLES = ''' @@ -68,7 +68,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule def main(): diff --git a/plugins/modules/sync_plan.py b/plugins/modules/sync_plan.py index eced9f88..775ec61e 100644 --- a/plugins/modules/sync_plan.py +++ b/plugins/modules/sync_plan.py @@ -75,9 +75,9 @@ type: list elements: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state_with_defaults - - theforeman.foreman.foreman.organization + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state_with_defaults + - redhat.satellite.foreman.organization ''' EXAMPLES = ''' @@ -99,7 +99,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import KatelloEntityAnsibleModule class KatelloSyncPlanModule(KatelloEntityAnsibleModule): diff --git a/plugins/modules/templates_import.py b/plugins/modules/templates_import.py index c9e0b8e3..6e3ca2cb 100644 --- a/plugins/modules/templates_import.py +++ b/plugins/modules/templates_import.py @@ -94,8 +94,8 @@ required: false type: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.taxonomy + - redhat.satellite.foreman + - redhat.satellite.foreman.taxonomy ''' EXAMPLES = ''' @@ -111,7 +111,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanTaxonomicAnsibleModule, _flatten_entity +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanTaxonomicAnsibleModule, _flatten_entity def main(): diff --git a/plugins/modules/user.py b/plugins/modules/user.py index 72cc72e2..db9d92d3 100644 --- a/plugins/modules/user.py +++ b/plugins/modules/user.py @@ -274,9 +274,9 @@ type: list elements: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state - - theforeman.foreman.foreman.taxonomy + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state + - redhat.satellite.foreman.taxonomy ''' EXAMPLES = ''' @@ -317,7 +317,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ( +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ( ForemanTaxonomicEntityAnsibleModule, ) diff --git a/plugins/modules/usergroup.py b/plugins/modules/usergroup.py index a88d24dc..e6ddbbcf 100644 --- a/plugins/modules/usergroup.py +++ b/plugins/modules/usergroup.py @@ -67,8 +67,8 @@ type: list elements: str extends_documentation_fragment: - - theforeman.foreman.foreman - - theforeman.foreman.foreman.entity_state + - redhat.satellite.foreman + - redhat.satellite.foreman.entity_state ''' EXAMPLES = ''' @@ -88,7 +88,7 @@ RETURN = ''' # ''' -from ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule +from ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper import ForemanEntityAnsibleModule class ForemanUsergroupModule(ForemanEntityAnsibleModule): diff --git a/tests/inventory/tests.foreman.yml b/tests/inventory/tests.foreman.yml index 0a2a67bb..f3531ca1 100644 --- a/tests/inventory/tests.foreman.yml +++ b/tests/inventory/tests.foreman.yml @@ -1,4 +1,4 @@ -plugin: theforeman.foreman.foreman +plugin: redhat.satellite.foreman url: http://localhost:3000/ user: admin password: changeme diff --git a/tests/test_module_state.py b/tests/test_module_state.py index c410dd63..453513a9 100644 --- a/tests/test_module_state.py +++ b/tests/test_module_state.py @@ -48,7 +48,7 @@ def _module_framework_from_body(body): framework = None for entry in body: if isinstance(entry, ast.ImportFrom): - if entry.module == 'ansible_collections.theforeman.foreman.plugins.module_utils.foreman_helper' and not framework: + if entry.module == 'ansible_collections.redhat.satellite.plugins.module_utils.foreman_helper' and not framework: framework = 'apypie' elif isinstance(entry, ast_try) and not framework: framework = _module_framework_from_body(entry.body) diff --git a/tests/test_playbooks/activation_key.yml b/tests/test_playbooks/activation_key.yml index 1747c40c..00c5fb54 100644 --- a/tests/test_playbooks/activation_key.yml +++ b/tests/test_playbooks/activation_key.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite tags: - setup gather_facts: false @@ -30,7 +30,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite tags: - test gather_facts: false @@ -263,7 +263,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite tags: - teardown gather_facts: false diff --git a/tests/test_playbooks/architecture.yml b/tests/test_playbooks/architecture.yml index 279fb77e..68185b1b 100644 --- a/tests/test_playbooks/architecture.yml +++ b/tests/test_playbooks/architecture.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -28,7 +28,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -113,7 +113,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/auth_source_ldap.yml b/tests/test_playbooks/auth_source_ldap.yml index 368a8eba..3e17a01e 100644 --- a/tests/test_playbooks/auth_source_ldap.yml +++ b/tests/test_playbooks/auth_source_ldap.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -23,7 +23,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -63,7 +63,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/bookmark.yml b/tests/test_playbooks/bookmark.yml index 17fe3838..0bfa096c 100644 --- a/tests/test_playbooks/bookmark.yml +++ b/tests/test_playbooks/bookmark.yml @@ -1,7 +1,7 @@ --- - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/compute_attribute.yml b/tests/test_playbooks/compute_attribute.yml index 89864cb1..535f245a 100644 --- a/tests/test_playbooks/compute_attribute.yml +++ b/tests/test_playbooks/compute_attribute.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -26,7 +26,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false tasks: - name: Load server config @@ -67,7 +67,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/compute_profile.yml b/tests/test_playbooks/compute_profile.yml index de00061b..3bd3f51c 100644 --- a/tests/test_playbooks/compute_profile.yml +++ b/tests/test_playbooks/compute_profile.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -31,7 +31,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -80,7 +80,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/compute_resource.yml b/tests/test_playbooks/compute_resource.yml index 11997946..7d01c521 100644 --- a/tests/test_playbooks/compute_resource.yml +++ b/tests/test_playbooks/compute_resource.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -14,7 +14,7 @@ location_state: present - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -122,7 +122,7 @@ expected_change: false - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/config_group.yml b/tests/test_playbooks/config_group.yml index cdfc8feb..df595efc 100644 --- a/tests/test_playbooks/config_group.yml +++ b/tests/test_playbooks/config_group.yml @@ -5,7 +5,7 @@ # - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/content_credential.yml b/tests/test_playbooks/content_credential.yml index 9edb169e..dd46497a 100644 --- a/tests/test_playbooks/content_credential.yml +++ b/tests/test_playbooks/content_credential.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -12,7 +12,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -61,7 +61,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/content_upload.yml b/tests/test_playbooks/content_upload.yml index 74d8d563..5fdfbf02 100644 --- a/tests/test_playbooks/content_upload.yml +++ b/tests/test_playbooks/content_upload.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -41,7 +41,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -83,7 +83,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/content_view.yml b/tests/test_playbooks/content_view.yml index 4adc3482..4bbd2c53 100644 --- a/tests/test_playbooks/content_view.yml +++ b/tests/test_playbooks/content_view.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -38,7 +38,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -201,7 +201,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/content_view_filter.yml b/tests/test_playbooks/content_view_filter.yml index 50bb25dc..f0384eea 100644 --- a/tests/test_playbooks/content_view_filter.yml +++ b/tests/test_playbooks/content_view_filter.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -37,7 +37,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -172,7 +172,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/content_view_version.yml b/tests/test_playbooks/content_view_version.yml index ebc8a0fd..e93e2be5 100644 --- a/tests/test_playbooks/content_view_version.yml +++ b/tests/test_playbooks/content_view_version.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -45,7 +45,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -129,7 +129,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/domain.yml b/tests/test_playbooks/domain.yml index 73bb0d5f..1f1172c2 100644 --- a/tests/test_playbooks/domain.yml +++ b/tests/test_playbooks/domain.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -21,7 +21,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -137,7 +137,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/external_usergroup.yml b/tests/test_playbooks/external_usergroup.yml index 92a30b66..d5845f70 100644 --- a/tests/test_playbooks/external_usergroup.yml +++ b/tests/test_playbooks/external_usergroup.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -25,7 +25,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -57,7 +57,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite tags: - teardown gather_facts: false diff --git a/tests/test_playbooks/filters.yml b/tests/test_playbooks/filters.yml index 70c67f21..1c6c4835 100644 --- a/tests/test_playbooks/filters.yml +++ b/tests/test_playbooks/filters.yml @@ -1,17 +1,17 @@ --- - hosts: tests collections: - - theforeman.foreman + - redhat.satellite tags: - test gather_facts: false tasks: - debug: - msg: "{{ 'Test__String)' | theforeman.foreman.cp_label }}" + msg: "{{ 'Test__String)' | redhat.satellite.cp_label }}" - assert: that: - - "{{ 'Test String' | theforeman.foreman.cp_label == 'Test_String' }}" - - "{{ 'Test__String' | theforeman.foreman.cp_label == 'Test__String' }}" - - "{{ 'Test--String' | theforeman.foreman.cp_label == 'Test--String' }}" - - "{{ 'Test (String) 1234' | theforeman.foreman.cp_label == 'Test_String_1234' }}" + - "{{ 'Test String' | redhat.satellite.cp_label == 'Test_String' }}" + - "{{ 'Test__String' | redhat.satellite.cp_label == 'Test__String' }}" + - "{{ 'Test--String' | redhat.satellite.cp_label == 'Test--String' }}" + - "{{ 'Test (String) 1234' | redhat.satellite.cp_label == 'Test_String_1234' }}" ... diff --git a/tests/test_playbooks/global_parameter.yml b/tests/test_playbooks/global_parameter.yml index 27d0a4f6..eed1a7ce 100644 --- a/tests/test_playbooks/global_parameter.yml +++ b/tests/test_playbooks/global_parameter.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -11,7 +11,7 @@ global_parameter_state: absent - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/hardware_model.yml b/tests/test_playbooks/hardware_model.yml index f1875b41..fbe2208f 100644 --- a/tests/test_playbooks/hardware_model.yml +++ b/tests/test_playbooks/hardware_model.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -12,7 +12,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -52,7 +52,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/host.yml b/tests/test_playbooks/host.yml index 79588dc6..56f4bca7 100644 --- a/tests/test_playbooks/host.yml +++ b/tests/test_playbooks/host.yml @@ -11,7 +11,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -91,7 +91,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -378,7 +378,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/host_collection.yml b/tests/test_playbooks/host_collection.yml index b13ed739..b31a22ef 100644 --- a/tests/test_playbooks/host_collection.yml +++ b/tests/test_playbooks/host_collection.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -12,7 +12,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -71,7 +71,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/host_power.yml b/tests/test_playbooks/host_power.yml index c2a137ac..bff727f4 100644 --- a/tests/test_playbooks/host_power.yml +++ b/tests/test_playbooks/host_power.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -15,7 +15,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/hostgroup.yml b/tests/test_playbooks/hostgroup.yml index d1bcb320..3a722a98 100644 --- a/tests/test_playbooks/hostgroup.yml +++ b/tests/test_playbooks/hostgroup.yml @@ -9,7 +9,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -92,7 +92,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -553,7 +553,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/image.yml b/tests/test_playbooks/image.yml index 043779bd..eb86a856 100644 --- a/tests/test_playbooks/image.yml +++ b/tests/test_playbooks/image.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -70,7 +70,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -170,7 +170,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/installation_medium.yml b/tests/test_playbooks/installation_medium.yml index 5b8b9756..646c0767 100644 --- a/tests/test_playbooks/installation_medium.yml +++ b/tests/test_playbooks/installation_medium.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -20,7 +20,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -121,7 +121,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/inventory_plugin.yml b/tests/test_playbooks/inventory_plugin.yml index 22e19dfa..315beae3 100644 --- a/tests/test_playbooks/inventory_plugin.yml +++ b/tests/test_playbooks/inventory_plugin.yml @@ -9,7 +9,7 @@ testhost2.example.com: group_b collections: - community.general - - theforeman.foreman + - redhat.satellite tasks: - name: fetch Foreman container docker_image: diff --git a/tests/test_playbooks/job_template.yml b/tests/test_playbooks/job_template.yml index 73679610..adbc93eb 100644 --- a/tests/test_playbooks/job_template.yml +++ b/tests/test_playbooks/job_template.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -26,7 +26,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -175,7 +175,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/katello_hostgroup.yml b/tests/test_playbooks/katello_hostgroup.yml index 96f1a696..d3ee7f25 100644 --- a/tests/test_playbooks/katello_hostgroup.yml +++ b/tests/test_playbooks/katello_hostgroup.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -33,7 +33,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -77,7 +77,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/katello_manifest.yml b/tests/test_playbooks/katello_manifest.yml index 6b4f5137..11622e1e 100644 --- a/tests/test_playbooks/katello_manifest.yml +++ b/tests/test_playbooks/katello_manifest.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -15,7 +15,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -67,7 +67,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/lifecycle_environment.yml b/tests/test_playbooks/lifecycle_environment.yml index f04dc7f6..034a2a86 100644 --- a/tests/test_playbooks/lifecycle_environment.yml +++ b/tests/test_playbooks/lifecycle_environment.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -21,7 +21,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -93,7 +93,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/location.yml b/tests/test_playbooks/location.yml index 5d2642ae..285e8f9d 100644 --- a/tests/test_playbooks/location.yml +++ b/tests/test_playbooks/location.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -21,7 +21,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -188,7 +188,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/luna_hostgroup.yml b/tests/test_playbooks/luna_hostgroup.yml index df920566..631b4eed 100644 --- a/tests/test_playbooks/luna_hostgroup.yml +++ b/tests/test_playbooks/luna_hostgroup.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -23,7 +23,7 @@ hostgroup_state: absent - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -61,7 +61,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/operatingsystem.yml b/tests/test_playbooks/operatingsystem.yml index a4bb45dd..4e75b3e1 100644 --- a/tests/test_playbooks/operatingsystem.yml +++ b/tests/test_playbooks/operatingsystem.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -16,7 +16,7 @@ operatingsystem_state: absent - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/organization.yml b/tests/test_playbooks/organization.yml index 0b587e5f..a53a75b0 100644 --- a/tests/test_playbooks/organization.yml +++ b/tests/test_playbooks/organization.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -11,7 +11,7 @@ organization_state: absent - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/os_default_template.yml b/tests/test_playbooks/os_default_template.yml index fd5b60f6..ad8a7911 100644 --- a/tests/test_playbooks/os_default_template.yml +++ b/tests/test_playbooks/os_default_template.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -29,7 +29,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -71,7 +71,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/partition_table.yml b/tests/test_playbooks/partition_table.yml index 186382d2..ccb8f394 100644 --- a/tests/test_playbooks/partition_table.yml +++ b/tests/test_playbooks/partition_table.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -15,7 +15,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -168,7 +168,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/product.yml b/tests/test_playbooks/product.yml index 1d98d76f..f865c276 100644 --- a/tests/test_playbooks/product.yml +++ b/tests/test_playbooks/product.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -25,7 +25,7 @@ product_state: absent - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -111,7 +111,7 @@ expected_change: false - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/provisioning_template.yml b/tests/test_playbooks/provisioning_template.yml index b3c85c99..6f51e81b 100644 --- a/tests/test_playbooks/provisioning_template.yml +++ b/tests/test_playbooks/provisioning_template.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -26,7 +26,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -144,7 +144,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/puppet_environment.yml b/tests/test_playbooks/puppet_environment.yml index dc31a1fb..88e41599 100644 --- a/tests/test_playbooks/puppet_environment.yml +++ b/tests/test_playbooks/puppet_environment.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -15,7 +15,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -49,7 +49,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/realm.yml b/tests/test_playbooks/realm.yml index 6f265aa1..cfbd404b 100644 --- a/tests/test_playbooks/realm.yml +++ b/tests/test_playbooks/realm.yml @@ -4,7 +4,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -14,7 +14,7 @@ realm_state: absent - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/redhat_manifest.yml b/tests/test_playbooks/redhat_manifest.yml index 7c16e1fd..25cf4c0e 100644 --- a/tests/test_playbooks/redhat_manifest.yml +++ b/tests/test_playbooks/redhat_manifest.yml @@ -1,7 +1,7 @@ --- - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/repository.yml b/tests/test_playbooks/repository.yml index 59508b65..d93c0bdb 100644 --- a/tests/test_playbooks/repository.yml +++ b/tests/test_playbooks/repository.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -23,7 +23,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -193,7 +193,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/repository_set.yml b/tests/test_playbooks/repository_set.yml index 264ea4e9..24607a84 100644 --- a/tests/test_playbooks/repository_set.yml +++ b/tests/test_playbooks/repository_set.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -21,7 +21,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -180,7 +180,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/repository_sync.yml b/tests/test_playbooks/repository_sync.yml index 3d4842f0..a9ee6a77 100644 --- a/tests/test_playbooks/repository_sync.yml +++ b/tests/test_playbooks/repository_sync.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -18,7 +18,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -32,7 +32,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/resource_info.yml b/tests/test_playbooks/resource_info.yml index da13478d..3628fb4b 100644 --- a/tests/test_playbooks/resource_info.yml +++ b/tests/test_playbooks/resource_info.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -23,7 +23,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -78,7 +78,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/role.yml b/tests/test_playbooks/role.yml index cadded9c..261df135 100644 --- a/tests/test_playbooks/role.yml +++ b/tests/test_playbooks/role.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -22,7 +22,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -121,7 +121,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/scap_content.yml b/tests/test_playbooks/scap_content.yml index 447943f2..a2837385 100644 --- a/tests/test_playbooks/scap_content.yml +++ b/tests/test_playbooks/scap_content.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -22,7 +22,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -89,7 +89,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/scap_tailoring_file.yml b/tests/test_playbooks/scap_tailoring_file.yml index ee3890e1..ea828ed8 100644 --- a/tests/test_playbooks/scap_tailoring_file.yml +++ b/tests/test_playbooks/scap_tailoring_file.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -22,7 +22,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -89,7 +89,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/setting.yml b/tests/test_playbooks/setting.yml index 187a5d14..7b4c0419 100644 --- a/tests/test_playbooks/setting.yml +++ b/tests/test_playbooks/setting.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -16,7 +16,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/smart_class_parameter.yml b/tests/test_playbooks/smart_class_parameter.yml index 3a528c98..495ca5b0 100644 --- a/tests/test_playbooks/smart_class_parameter.yml +++ b/tests/test_playbooks/smart_class_parameter.yml @@ -9,7 +9,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -55,7 +55,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -528,7 +528,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/subnet.yml b/tests/test_playbooks/subnet.yml index 0b08f5bd..a06e8f96 100644 --- a/tests/test_playbooks/subnet.yml +++ b/tests/test_playbooks/subnet.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -32,7 +32,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -256,7 +256,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/sync_plan.yml b/tests/test_playbooks/sync_plan.yml index 8e76f596..d24e8de7 100644 --- a/tests/test_playbooks/sync_plan.yml +++ b/tests/test_playbooks/sync_plan.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -18,7 +18,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -75,7 +75,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/templates_import.yml b/tests/test_playbooks/templates_import.yml index 54a7666f..667e775e 100644 --- a/tests/test_playbooks/templates_import.yml +++ b/tests/test_playbooks/templates_import.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -22,7 +22,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -81,7 +81,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml diff --git a/tests/test_playbooks/user.yml b/tests/test_playbooks/user.yml index 1527c17f..19be09f7 100644 --- a/tests/test_playbooks/user.yml +++ b/tests/test_playbooks/user.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite tags: - setup gather_facts: false @@ -17,7 +17,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite tags: - test gather_facts: false @@ -87,7 +87,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite tags: - teardown gather_facts: false diff --git a/tests/test_playbooks/usergroup.yml b/tests/test_playbooks/usergroup.yml index 179e0411..97167a86 100644 --- a/tests/test_playbooks/usergroup.yml +++ b/tests/test_playbooks/usergroup.yml @@ -1,7 +1,7 @@ --- - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -26,7 +26,7 @@ - hosts: tests collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml @@ -115,7 +115,7 @@ - hosts: localhost collections: - - theforeman.foreman + - redhat.satellite gather_facts: false vars_files: - vars/server.yml