Relicense under GPLv3 and clean up modules (containers#57)

Clean up modules according to last Ansible changes
Set license for GPLv3 to avoid various possible issues

.github/workflows/collection-continuous-integration.yml

@@ -89,7 +89,10 @@ jobs:
           ~/.local/bin/ansible-galaxy collection install .cache/collection-tarballs/*.tar.gz
       - name: Run collection sanity tests
         run: >-
-          ~/.local/bin/ansible-test sanity --color --requirements --python "${{ matrix.python-version }}" -vvv
+          ~/.local/bin/ansible-test sanity
+          --color
+          --requirements
+          --python "${{ matrix.python-version }}" -vvv
           plugins/ tests/
         working-directory: >-
           /home/runner/.ansible/collections/ansible_collections/containers/podman

README.md

@@ -102,4 +102,4 @@ on `#ansible-podman` channel on Freenode IRC.
 
 ## License
 
-Apache-2.0
+GPL-3.0-or-later

galaxy.yml

@@ -1,12 +1,12 @@
 namespace: containers
 name: podman
-version: 1.0.1
+version: 9.9.9
 readme: README.md
 authors:
   - Sagi Shnaidman <[email protected]>
   - Ansible team
 description: Podman container Ansible modules
-license: Apache-2.0
+license: GPL-3.0-or-later
 tags:
   - containers
   - podman

plugins/module_utils/podman/common.py

@@ -1,6 +1,6 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2019 Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+#!/usr/bin/python
+# Copyright (c) 2020 Red Hat
+# 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
 __metaclass__ = type

plugins/modules/podman_container.py

@@ -1,18 +1,6 @@
 #!/usr/bin/python
-# Copyright (c) 2019 OpenStack Foundation
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
+# Copyright (c) 2020 Red Hat
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 # flake8: noqa: E501
 
@@ -21,12 +9,6 @@
 __metaclass__ = type
 
 
-ANSIBLE_METADATA = {
-    'metadata_version': '1.0',
-    'status': ['preview'],
-    'supported_by': 'community'
-}
-
 DOCUMENTATION = """
 module: podman_container
 author:

plugins/modules/podman_container_info.py

@@ -1,16 +1,10 @@
 #!/usr/bin/python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2019 Ansible Project
+# Copyright (c) 2020 Red Hat
 # 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
 __metaclass__ = type
 
-ANSIBLE_METADATA = {
-    'metadata_version': '1.1',
-    'status': ['preview'],
-    'supported_by': 'community'
-}
 
 DOCUMENTATION = '''
 module: podman_container_info

plugins/modules/podman_image.py

@@ -1,16 +1,10 @@
 #!/usr/bin/python
-# -*- coding: utf-8 -*-
 # Copyright (c) 2018 Ansible Project
 # 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
 __metaclass__ = type
 
-ANSIBLE_METADATA = {
-    'metadata_version': '1.1',
-    'status': ['preview'],
-    'supported_by': 'community'
-}
 
 DOCUMENTATION = '''
   module: podman_image

plugins/modules/podman_image_info.py

@@ -1,16 +1,10 @@
 #!/usr/bin/python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018 Ansible Project
+# Copyright (c) 2019 Ansible Project
 # 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
 __metaclass__ = type
 
-ANSIBLE_METADATA = {
-    'metadata_version': '1.1',
-    'status': ['preview'],
-    'supported_by': 'community'
-}
 
 DOCUMENTATION = '''
 module: podman_image_info

plugins/modules/podman_network_info.py

@@ -1,16 +1,10 @@
 #!/usr/bin/python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018 Ansible Project
+# Copyright (c) 2020 Red Hat
 # 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
 __metaclass__ = type
 
-ANSIBLE_METADATA = {
-    'metadata_version': '1.1',
-    'status': ['preview'],
-    'supported_by': 'community'
-}
 
 DOCUMENTATION = """
 module: podman_network_info

plugins/modules/podman_volume_info.py

@@ -1,16 +1,10 @@
 #!/usr/bin/python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018 Ansible Project
+# Copyright (c) 2020 Red Hat
 # 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
 __metaclass__ = type
 
-ANSIBLE_METADATA = {
-    'metadata_version': '1.1',
-    'status': ['preview'],
-    'supported_by': 'community'
-}
 
 DOCUMENTATION = '''
 module: podman_volume_info

tests/sanity/ignore-2.10.txt

@@ -6,7 +6,6 @@ plugins/modules/podman_image.py validate-modules:undocumented-parameter
 plugins/modules/podman_image_info.py validate-modules:parameter-list-no-elements
 plugins/modules/podman_image_info.py validate-modules:parameter-type-not-in-doc
 plugins/modules/podman_container.py validate-modules:invalid-ansiblemodule-schema
-plugins/modules/podman_container.py validate-modules:missing-gplv3-license
 plugins/modules/podman_container.py validate-modules:parameter-list-no-elements
 plugins/modules/podman_container.py import-2.6!skip
 plugins/modules/podman_container.py compile-2.6!skip
@@ -18,3 +17,4 @@ plugins/modules/podman_container.py import-3.8!skip
 plugins/modules/podman_container.py import-3.9!skip
 tests/integration/targets/connection_buildah/runme.sh shellcheck:SC2086
 tests/integration/targets/connection_podman/runme.sh shellcheck:SC2086
+plugins/module_utils/podman/common.py shebang!skip

tests/sanity/ignore-2.9.txt

@@ -12,3 +12,4 @@ plugins/modules/podman_container.py import-3.7!skip
 plugins/modules/podman_container.py import-3.8!skip
 tests/integration/targets/connection_buildah/runme.sh shellcheck:SC2086
 tests/integration/targets/connection_podman/runme.sh shellcheck:SC2086
+plugins/module_utils/podman/common.py shebang!skip