diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml index f20c6918bc..7912f6c3bf 100644 --- a/.github/BOTMETA.yml +++ b/.github/BOTMETA.yml @@ -179,16 +179,7 @@ files: $modules/identity/keycloak/: eikef $modules/inventory/add_host.py: $team_ansible $modules/inventory/group_by.py: $team_ansible - $modules/messaging/rabbitmq_binding.py: $team_rabbitmq - $modules/messaging/rabbitmq_exchange.py: $team_rabbitmq - $modules/messaging/rabbitmq_parameter.py: $team_rabbitmq - $modules/messaging/rabbitmq_plugin.py: $team_rabbitmq - $modules/messaging/rabbitmq_policy.py: retr0h - $modules/messaging/rabbitmq_queue.py: $team_rabbitmq - $modules/messaging/rabbitmq_user.py: $team_rabbitmq - $modules/messaging/rabbitmq_vhost.py: - ignored: choffman - maintainers: $team_rabbitmq + $modules/messaging/rabbitmq/: $team_rabbitmq $modules/monitoring/datadog_event.py: ignored: arturaz $modules/monitoring/logentries.py: diff --git a/lib/ansible/modules/messaging/rabbitmq/__init__.py b/lib/ansible/modules/messaging/rabbitmq/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/modules/messaging/rabbitmq_binding.py b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_binding.py similarity index 98% rename from lib/ansible/modules/messaging/rabbitmq_binding.py rename to lib/ansible/modules/messaging/rabbitmq/rabbitmq_binding.py index 265c608216..9012a719cf 100644 --- a/lib/ansible/modules/messaging/rabbitmq_binding.py +++ b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_binding.py @@ -1,8 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# Copyright (c) 2015, Manuel Sousa -# +# Copyright: (c) 2015, Manuel Sousa # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import absolute_import, division, print_function @@ -17,10 +16,10 @@ ANSIBLE_METADATA = { DOCUMENTATION = ''' --- module: rabbitmq_binding -author: "Manuel Sousa (@manuel-sousa)" +author: Manuel Sousa (@manuel-sousa) version_added: "2.0" -short_description: This module manages rabbitMQ bindings +short_description: Manage rabbitMQ bindings description: - This module uses rabbitMQ REST APIs to create / delete bindings. requirements: [ "requests >= 1.0.0" ] diff --git a/lib/ansible/modules/messaging/rabbitmq_exchange.py b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_exchange.py similarity index 97% rename from lib/ansible/modules/messaging/rabbitmq_exchange.py rename to lib/ansible/modules/messaging/rabbitmq/rabbitmq_exchange.py index b52cbd0611..65977a93f9 100644 --- a/lib/ansible/modules/messaging/rabbitmq_exchange.py +++ b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_exchange.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# (c) 2015, Manuel Sousa +# Copyright: (c) 2015, Manuel Sousa # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import absolute_import, division, print_function @@ -16,10 +16,10 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- module: rabbitmq_exchange -author: "Manuel Sousa (@manuel-sousa)" +author: Manuel Sousa (@manuel-sousa) version_added: "2.0" -short_description: This module manages rabbitMQ exchanges +short_description: Manage rabbitMQ exchanges description: - This module uses rabbitMQ Rest API to create/delete exchanges requirements: [ "requests >= 1.0.0" ] diff --git a/lib/ansible/modules/messaging/rabbitmq_parameter.py b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_parameter.py similarity index 96% rename from lib/ansible/modules/messaging/rabbitmq_parameter.py rename to lib/ansible/modules/messaging/rabbitmq/rabbitmq_parameter.py index da3a12c572..ccccd4eb1b 100644 --- a/lib/ansible/modules/messaging/rabbitmq_parameter.py +++ b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_parameter.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# (c) 2013, Chatham Financial +# Copyright: (c) 2013, Chatham Financial # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import absolute_import, division, print_function @@ -16,11 +16,11 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- module: rabbitmq_parameter -short_description: Adds or removes parameters to RabbitMQ +short_description: Manage RabbitMQ parameters description: - Manage dynamic, cluster-wide parameters for RabbitMQ version_added: "1.1" -author: '"Chris Hoffman (@chrishoffman)"' +author: Chris Hoffman (@chrishoffman) options: component: description: diff --git a/lib/ansible/modules/messaging/rabbitmq_plugin.py b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_plugin.py similarity index 98% rename from lib/ansible/modules/messaging/rabbitmq_plugin.py rename to lib/ansible/modules/messaging/rabbitmq/rabbitmq_plugin.py index aa8a25a7c9..79437183e0 100644 --- a/lib/ansible/modules/messaging/rabbitmq_plugin.py +++ b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_plugin.py @@ -1,8 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- + # Copyright: (c) 2013, Chatham Financial -# Copyright: (c) 2018, Ansible Project -# Copyright: (c) 2018, Abhijeet Kasurde # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import absolute_import, division, print_function diff --git a/lib/ansible/modules/messaging/rabbitmq_policy.py b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_policy.py similarity index 96% rename from lib/ansible/modules/messaging/rabbitmq_policy.py rename to lib/ansible/modules/messaging/rabbitmq/rabbitmq_policy.py index 8721889b53..615734b643 100644 --- a/lib/ansible/modules/messaging/rabbitmq_policy.py +++ b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_policy.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# (c) 2013, John Dewey +# Copyright: (c) 2013, John Dewey # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import absolute_import, division, print_function @@ -16,11 +16,11 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- module: rabbitmq_policy -short_description: Manage the state of policies in RabbitMQ. +short_description: Manage the state of policies in RabbitMQ description: - Manage the state of a policy in RabbitMQ. version_added: "1.5" -author: "John Dewey (@retr0h)" +author: John Dewey (@retr0h) options: name: description: diff --git a/lib/ansible/modules/messaging/rabbitmq_queue.py b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_queue.py similarity index 98% rename from lib/ansible/modules/messaging/rabbitmq_queue.py rename to lib/ansible/modules/messaging/rabbitmq/rabbitmq_queue.py index 6d7a67263d..812a59767a 100644 --- a/lib/ansible/modules/messaging/rabbitmq_queue.py +++ b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_queue.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# (c) 2015, Manuel Sousa +# Copyright: (c) 2015, Manuel Sousa # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import absolute_import, division, print_function @@ -16,10 +16,10 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- module: rabbitmq_queue -author: "Manuel Sousa (@manuel-sousa)" +author: Manuel Sousa (@manuel-sousa) version_added: "2.0" -short_description: This module manages rabbitMQ queues +short_description: Manage rabbitMQ queues description: - This module uses rabbitMQ Rest API to create/delete queues requirements: [ "requests >= 1.0.0" ] diff --git a/lib/ansible/modules/messaging/rabbitmq_user.py b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_user.py similarity index 98% rename from lib/ansible/modules/messaging/rabbitmq_user.py rename to lib/ansible/modules/messaging/rabbitmq/rabbitmq_user.py index 46b1924c9a..c7fa7173a0 100644 --- a/lib/ansible/modules/messaging/rabbitmq_user.py +++ b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_user.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# (c) 2013, Chatham Financial +# Copyright: (c) 2013, Chatham Financial # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import absolute_import, division, print_function @@ -16,11 +16,11 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- module: rabbitmq_user -short_description: Adds or removes users to RabbitMQ +short_description: Manage RabbitMQ users description: - Add or remove users to RabbitMQ and assign permissions version_added: "1.1" -author: '"Chris Hoffman (@chrishoffman)"' +author: Chris Hoffman (@chrishoffman) options: user: description: diff --git a/lib/ansible/modules/messaging/rabbitmq_vhost.py b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_vhost.py similarity index 97% rename from lib/ansible/modules/messaging/rabbitmq_vhost.py rename to lib/ansible/modules/messaging/rabbitmq/rabbitmq_vhost.py index cd171b8536..184ccdac8b 100644 --- a/lib/ansible/modules/messaging/rabbitmq_vhost.py +++ b/lib/ansible/modules/messaging/rabbitmq/rabbitmq_vhost.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# (c) 2013, Chatham Financial +# Copyright: (c) 2013, Chatham Financial # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import absolute_import, division, print_function @@ -20,7 +20,7 @@ short_description: Manage the state of a virtual host in RabbitMQ description: - Manage the state of a virtual host in RabbitMQ version_added: "1.1" -author: '"Chris Hoffman (@choffman)"' +author: Chris Hoffman (@chrishoffman) options: name: description: diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt index 52d509fc99..c153bbc2a5 100644 --- a/test/sanity/validate-modules/ignore.txt +++ b/test/sanity/validate-modules/ignore.txt @@ -575,12 +575,12 @@ lib/ansible/modules/identity/keycloak/keycloak_client.py E324 lib/ansible/modules/identity/keycloak/keycloak_client.py E325 lib/ansible/modules/identity/keycloak/keycloak_clienttemplate.py E324 lib/ansible/modules/identity/keycloak/keycloak_clienttemplate.py E325 -lib/ansible/modules/messaging/rabbitmq_binding.py E324 -lib/ansible/modules/messaging/rabbitmq_exchange.py E324 -lib/ansible/modules/messaging/rabbitmq_exchange.py E326 -lib/ansible/modules/messaging/rabbitmq_policy.py E324 -lib/ansible/modules/messaging/rabbitmq_queue.py E324 -lib/ansible/modules/messaging/rabbitmq_queue.py E327 +lib/ansible/modules/messaging/rabbitmq/rabbitmq_binding.py E324 +lib/ansible/modules/messaging/rabbitmq/rabbitmq_exchange.py E324 +lib/ansible/modules/messaging/rabbitmq/rabbitmq_exchange.py E326 +lib/ansible/modules/messaging/rabbitmq/rabbitmq_policy.py E324 +lib/ansible/modules/messaging/rabbitmq/rabbitmq_queue.py E324 +lib/ansible/modules/messaging/rabbitmq/rabbitmq_queue.py E327 lib/ansible/modules/monitoring/airbrake_deployment.py E324 lib/ansible/modules/monitoring/bigpanda.py E322 lib/ansible/modules/monitoring/bigpanda.py E324