From aed8c080f677a5c9fc87974e764bc66f61c7b4e8 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Mon, 6 May 2024 16:22:52 -0400 Subject: [PATCH] ansible-galaxy, clarify licensing for 'init' templates and results (#83175) --- lib/ansible/galaxy/data/COPYING | 7 +++++++ lib/ansible/galaxy/data/apb/Dockerfile.j2 | 1 + lib/ansible/galaxy/data/apb/Makefile.j2 | 1 + lib/ansible/galaxy/data/apb/apb.yml.j2 | 1 + lib/ansible/galaxy/data/apb/defaults/main.yml.j2 | 1 + lib/ansible/galaxy/data/apb/handlers/main.yml.j2 | 1 + lib/ansible/galaxy/data/apb/meta/main.yml.j2 | 1 + lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 | 1 + lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 | 1 + lib/ansible/galaxy/data/apb/tasks/main.yml.j2 | 1 + lib/ansible/galaxy/data/apb/tests/ansible.cfg | 1 + lib/ansible/galaxy/data/apb/tests/inventory | 1 + lib/ansible/galaxy/data/apb/tests/test.yml.j2 | 1 + lib/ansible/galaxy/data/apb/vars/main.yml.j2 | 1 + lib/ansible/galaxy/data/collections_galaxy_meta.yml | 1 + lib/ansible/galaxy/data/container/defaults/main.yml.j2 | 1 + lib/ansible/galaxy/data/container/handlers/main.yml.j2 | 1 + lib/ansible/galaxy/data/container/meta/container.yml.j2 | 1 + lib/ansible/galaxy/data/container/meta/main.yml.j2 | 1 + lib/ansible/galaxy/data/container/tasks/main.yml.j2 | 1 + lib/ansible/galaxy/data/container/tests/ansible.cfg | 1 + lib/ansible/galaxy/data/container/tests/inventory | 1 + lib/ansible/galaxy/data/container/tests/test.yml.j2 | 1 + lib/ansible/galaxy/data/container/vars/main.yml.j2 | 1 + lib/ansible/galaxy/data/default/collection/README.md.j2 | 1 + lib/ansible/galaxy/data/default/collection/galaxy.yml.j2 | 1 + .../galaxy/data/default/collection/meta/runtime.yml | 1 + .../galaxy/data/default/collection/plugins/README.md.j2 | 1 + lib/ansible/galaxy/data/default/role/defaults/main.yml.j2 | 1 + lib/ansible/galaxy/data/default/role/handlers/main.yml.j2 | 1 + lib/ansible/galaxy/data/default/role/meta/main.yml.j2 | 1 + lib/ansible/galaxy/data/default/role/tasks/main.yml.j2 | 1 + lib/ansible/galaxy/data/default/role/tests/inventory | 1 + lib/ansible/galaxy/data/default/role/tests/test.yml.j2 | 1 + lib/ansible/galaxy/data/default/role/vars/main.yml.j2 | 1 + .../galaxy/data/network/cliconf_plugins/example.py.j2 | 1 + lib/ansible/galaxy/data/network/defaults/main.yml.j2 | 1 + .../galaxy/data/network/library/example_command.py.j2 | 1 + .../galaxy/data/network/library/example_config.py.j2 | 1 + .../galaxy/data/network/library/example_facts.py.j2 | 1 + lib/ansible/galaxy/data/network/meta/main.yml.j2 | 1 + lib/ansible/galaxy/data/network/module_utils/example.py.j2 | 1 + .../galaxy/data/network/netconf_plugins/example.py.j2 | 1 + lib/ansible/galaxy/data/network/tasks/main.yml.j2 | 1 + .../galaxy/data/network/terminal_plugins/example.py.j2 | 1 + lib/ansible/galaxy/data/network/tests/inventory | 1 + lib/ansible/galaxy/data/network/tests/test.yml.j2 | 1 + lib/ansible/galaxy/data/network/vars/main.yml.j2 | 1 + setup.cfg | 1 + test/units/cli/test_galaxy.py | 5 ++++- 50 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 lib/ansible/galaxy/data/COPYING diff --git a/lib/ansible/galaxy/data/COPYING b/lib/ansible/galaxy/data/COPYING new file mode 100644 index 00000000000..87a9639c92f --- /dev/null +++ b/lib/ansible/galaxy/data/COPYING @@ -0,0 +1,7 @@ +All templates, files and files generated from them in the subdirectories of this one +are subject to the MIT license when applicable. + +MIT License: +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/lib/ansible/galaxy/data/apb/Dockerfile.j2 b/lib/ansible/galaxy/data/apb/Dockerfile.j2 index 4d99a8b0c37..f39abc3bd89 100644 --- a/lib/ansible/galaxy/data/apb/Dockerfile.j2 +++ b/lib/ansible/galaxy/data/apb/Dockerfile.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 FROM ansibleplaybookbundle/apb-base LABEL "com.redhat.apb.spec"=\ diff --git a/lib/ansible/galaxy/data/apb/Makefile.j2 b/lib/ansible/galaxy/data/apb/Makefile.j2 index ebeaa61f168..9278d246094 100644 --- a/lib/ansible/galaxy/data/apb/Makefile.j2 +++ b/lib/ansible/galaxy/data/apb/Makefile.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 DOCKERHOST = DOCKERHOST DOCKERORG = DOCKERORG IMAGENAME = {{ role_name }} diff --git a/lib/ansible/galaxy/data/apb/apb.yml.j2 b/lib/ansible/galaxy/data/apb/apb.yml.j2 index f96880196fe..e9405dcc359 100644 --- a/lib/ansible/galaxy/data/apb/apb.yml.j2 +++ b/lib/ansible/galaxy/data/apb/apb.yml.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 version: '1.0.0' name: {{ role_name }} description: {{ description }} diff --git a/lib/ansible/galaxy/data/apb/defaults/main.yml.j2 b/lib/ansible/galaxy/data/apb/defaults/main.yml.j2 index 3818e64c335..8842d94e345 100644 --- a/lib/ansible/galaxy/data/apb/defaults/main.yml.j2 +++ b/lib/ansible/galaxy/data/apb/defaults/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # defaults file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/apb/handlers/main.yml.j2 b/lib/ansible/galaxy/data/apb/handlers/main.yml.j2 index 3f4c49674d4..89371a09bab 100644 --- a/lib/ansible/galaxy/data/apb/handlers/main.yml.j2 +++ b/lib/ansible/galaxy/data/apb/handlers/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # handlers file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/apb/meta/main.yml.j2 b/lib/ansible/galaxy/data/apb/meta/main.yml.j2 index 546b8310288..23f870c4c50 100644 --- a/lib/ansible/galaxy/data/apb/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/apb/meta/main.yml.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 galaxy_info: author: {{ author }} description: {{ description }} diff --git a/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 b/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 index 19527310a59..0a863784990 100644 --- a/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 +++ b/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 - name: "{{ role_name }} playbook to deprovision the application" hosts: localhost gather_facts: false diff --git a/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 b/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 index 7b08605ec58..f0691e2b875 100644 --- a/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 +++ b/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 - name: "{{ role_name }} playbook to provision the application" hosts: localhost gather_facts: false diff --git a/lib/ansible/galaxy/data/apb/tasks/main.yml.j2 b/lib/ansible/galaxy/data/apb/tasks/main.yml.j2 index a9880650590..1bba65a7566 100644 --- a/lib/ansible/galaxy/data/apb/tasks/main.yml.j2 +++ b/lib/ansible/galaxy/data/apb/tasks/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # tasks file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/apb/tests/ansible.cfg b/lib/ansible/galaxy/data/apb/tests/ansible.cfg index 2f74f1b2722..e2b73526706 100644 --- a/lib/ansible/galaxy/data/apb/tests/ansible.cfg +++ b/lib/ansible/galaxy/data/apb/tests/ansible.cfg @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 [defaults] inventory=./inventory diff --git a/lib/ansible/galaxy/data/apb/tests/inventory b/lib/ansible/galaxy/data/apb/tests/inventory index ea69cbf1225..a24f8243f1f 100644 --- a/lib/ansible/galaxy/data/apb/tests/inventory +++ b/lib/ansible/galaxy/data/apb/tests/inventory @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 localhost diff --git a/lib/ansible/galaxy/data/apb/tests/test.yml.j2 b/lib/ansible/galaxy/data/apb/tests/test.yml.j2 index fb14f85c97b..1b03869978c 100644 --- a/lib/ansible/galaxy/data/apb/tests/test.yml.j2 +++ b/lib/ansible/galaxy/data/apb/tests/test.yml.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 --- - hosts: localhost gather_facts: no diff --git a/lib/ansible/galaxy/data/apb/vars/main.yml.j2 b/lib/ansible/galaxy/data/apb/vars/main.yml.j2 index 092d511a1e6..8fc2f46c5e0 100644 --- a/lib/ansible/galaxy/data/apb/vars/main.yml.j2 +++ b/lib/ansible/galaxy/data/apb/vars/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # vars file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/collections_galaxy_meta.yml b/lib/ansible/galaxy/data/collections_galaxy_meta.yml index 5c4472cda1a..f47f1a7efff 100644 --- a/lib/ansible/galaxy/data/collections_galaxy_meta.yml +++ b/lib/ansible/galaxy/data/collections_galaxy_meta.yml @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 # Copyright (c) 2019 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/lib/ansible/galaxy/data/container/defaults/main.yml.j2 b/lib/ansible/galaxy/data/container/defaults/main.yml.j2 index 3818e64c335..8842d94e345 100644 --- a/lib/ansible/galaxy/data/container/defaults/main.yml.j2 +++ b/lib/ansible/galaxy/data/container/defaults/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # defaults file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/container/handlers/main.yml.j2 b/lib/ansible/galaxy/data/container/handlers/main.yml.j2 index 3f4c49674d4..89371a09bab 100644 --- a/lib/ansible/galaxy/data/container/handlers/main.yml.j2 +++ b/lib/ansible/galaxy/data/container/handlers/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # handlers file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/container/meta/container.yml.j2 b/lib/ansible/galaxy/data/container/meta/container.yml.j2 index f033d34110e..97b39617192 100644 --- a/lib/ansible/galaxy/data/container/meta/container.yml.j2 +++ b/lib/ansible/galaxy/data/container/meta/container.yml.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 # Add your Ansible Container service definitions here. # For example: # diff --git a/lib/ansible/galaxy/data/container/meta/main.yml.j2 b/lib/ansible/galaxy/data/container/meta/main.yml.j2 index 8a6a382f291..d3fe1495a25 100644 --- a/lib/ansible/galaxy/data/container/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/container/meta/main.yml.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 galaxy_info: author: {{ author }} description: {{ description }} diff --git a/lib/ansible/galaxy/data/container/tasks/main.yml.j2 b/lib/ansible/galaxy/data/container/tasks/main.yml.j2 index a9880650590..1bba65a7566 100644 --- a/lib/ansible/galaxy/data/container/tasks/main.yml.j2 +++ b/lib/ansible/galaxy/data/container/tasks/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # tasks file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/container/tests/ansible.cfg b/lib/ansible/galaxy/data/container/tests/ansible.cfg index 2f74f1b2722..e2b73526706 100644 --- a/lib/ansible/galaxy/data/container/tests/ansible.cfg +++ b/lib/ansible/galaxy/data/container/tests/ansible.cfg @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 [defaults] inventory=./inventory diff --git a/lib/ansible/galaxy/data/container/tests/inventory b/lib/ansible/galaxy/data/container/tests/inventory index ea69cbf1225..a24f8243f1f 100644 --- a/lib/ansible/galaxy/data/container/tests/inventory +++ b/lib/ansible/galaxy/data/container/tests/inventory @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 localhost diff --git a/lib/ansible/galaxy/data/container/tests/test.yml.j2 b/lib/ansible/galaxy/data/container/tests/test.yml.j2 index fb14f85c97b..1b03869978c 100644 --- a/lib/ansible/galaxy/data/container/tests/test.yml.j2 +++ b/lib/ansible/galaxy/data/container/tests/test.yml.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 --- - hosts: localhost gather_facts: no diff --git a/lib/ansible/galaxy/data/container/vars/main.yml.j2 b/lib/ansible/galaxy/data/container/vars/main.yml.j2 index 092d511a1e6..8fc2f46c5e0 100644 --- a/lib/ansible/galaxy/data/container/vars/main.yml.j2 +++ b/lib/ansible/galaxy/data/container/vars/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # vars file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/default/collection/README.md.j2 b/lib/ansible/galaxy/data/default/collection/README.md.j2 index 5e5162206ec..ff8d7a3e8b1 100644 --- a/lib/ansible/galaxy/data/default/collection/README.md.j2 +++ b/lib/ansible/galaxy/data/default/collection/README.md.j2 @@ -1,3 +1,4 @@ +{# SPDX-License-Identifier: MIT-0 #} # Ansible Collection - {{ namespace }}.{{ collection_name }} Documentation for the collection. diff --git a/lib/ansible/galaxy/data/default/collection/galaxy.yml.j2 b/lib/ansible/galaxy/data/default/collection/galaxy.yml.j2 index 7821491b257..842bdb10ce1 100644 --- a/lib/ansible/galaxy/data/default/collection/galaxy.yml.j2 +++ b/lib/ansible/galaxy/data/default/collection/galaxy.yml.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 ### REQUIRED {% for option in required_config %} {{ option.description | comment_ify }} diff --git a/lib/ansible/galaxy/data/default/collection/meta/runtime.yml b/lib/ansible/galaxy/data/default/collection/meta/runtime.yml index 20f709edff5..936cae9f714 100644 --- a/lib/ansible/galaxy/data/default/collection/meta/runtime.yml +++ b/lib/ansible/galaxy/data/default/collection/meta/runtime.yml @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 --- # Collections must specify a minimum required ansible version to upload # to galaxy diff --git a/lib/ansible/galaxy/data/default/collection/plugins/README.md.j2 b/lib/ansible/galaxy/data/default/collection/plugins/README.md.j2 index 7c006cfa76f..795e371cd60 100644 --- a/lib/ansible/galaxy/data/default/collection/plugins/README.md.j2 +++ b/lib/ansible/galaxy/data/default/collection/plugins/README.md.j2 @@ -1,3 +1,4 @@ +{# SPDX-License-Identifier: MIT-0 #} # Collections Plugins Directory This directory can be used to ship various plugins inside an Ansible collection. Each plugin is placed in a folder that diff --git a/lib/ansible/galaxy/data/default/role/defaults/main.yml.j2 b/lib/ansible/galaxy/data/default/role/defaults/main.yml.j2 index 3818e64c335..8842d94e345 100644 --- a/lib/ansible/galaxy/data/default/role/defaults/main.yml.j2 +++ b/lib/ansible/galaxy/data/default/role/defaults/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # defaults file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/default/role/handlers/main.yml.j2 b/lib/ansible/galaxy/data/default/role/handlers/main.yml.j2 index 3f4c49674d4..89371a09bab 100644 --- a/lib/ansible/galaxy/data/default/role/handlers/main.yml.j2 +++ b/lib/ansible/galaxy/data/default/role/handlers/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # handlers file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/default/role/meta/main.yml.j2 b/lib/ansible/galaxy/data/default/role/meta/main.yml.j2 index 47abff98bb7..b23f47cc5bc 100644 --- a/lib/ansible/galaxy/data/default/role/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/default/role/meta/main.yml.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 galaxy_info: author: {{ author }} description: {{ description }} diff --git a/lib/ansible/galaxy/data/default/role/tasks/main.yml.j2 b/lib/ansible/galaxy/data/default/role/tasks/main.yml.j2 index a9880650590..1bba65a7566 100644 --- a/lib/ansible/galaxy/data/default/role/tasks/main.yml.j2 +++ b/lib/ansible/galaxy/data/default/role/tasks/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # tasks file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/default/role/tests/inventory b/lib/ansible/galaxy/data/default/role/tests/inventory index 878877b0776..03ca42fd173 100644 --- a/lib/ansible/galaxy/data/default/role/tests/inventory +++ b/lib/ansible/galaxy/data/default/role/tests/inventory @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 localhost diff --git a/lib/ansible/galaxy/data/default/role/tests/test.yml.j2 b/lib/ansible/galaxy/data/default/role/tests/test.yml.j2 index 0c40f95a697..bf4f028593e 100644 --- a/lib/ansible/galaxy/data/default/role/tests/test.yml.j2 +++ b/lib/ansible/galaxy/data/default/role/tests/test.yml.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 --- - hosts: localhost remote_user: root diff --git a/lib/ansible/galaxy/data/default/role/vars/main.yml.j2 b/lib/ansible/galaxy/data/default/role/vars/main.yml.j2 index 092d511a1e6..8fc2f46c5e0 100644 --- a/lib/ansible/galaxy/data/default/role/vars/main.yml.j2 +++ b/lib/ansible/galaxy/data/default/role/vars/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # vars file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/network/cliconf_plugins/example.py.j2 b/lib/ansible/galaxy/data/network/cliconf_plugins/example.py.j2 index cf434d750c3..51e41111117 100644 --- a/lib/ansible/galaxy/data/network/cliconf_plugins/example.py.j2 +++ b/lib/ansible/galaxy/data/network/cliconf_plugins/example.py.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 # # (c) 2018 Red Hat Inc. # diff --git a/lib/ansible/galaxy/data/network/defaults/main.yml.j2 b/lib/ansible/galaxy/data/network/defaults/main.yml.j2 index 3818e64c335..8842d94e345 100644 --- a/lib/ansible/galaxy/data/network/defaults/main.yml.j2 +++ b/lib/ansible/galaxy/data/network/defaults/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # defaults file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/network/library/example_command.py.j2 b/lib/ansible/galaxy/data/network/library/example_command.py.j2 index dff5b153a64..9aa6ef62d4d 100644 --- a/lib/ansible/galaxy/data/network/library/example_command.py.j2 +++ b/lib/ansible/galaxy/data/network/library/example_command.py.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 # # (c) 2018 Red Hat Inc. # diff --git a/lib/ansible/galaxy/data/network/library/example_config.py.j2 b/lib/ansible/galaxy/data/network/library/example_config.py.j2 index 0a8479b36cb..2913af08a0c 100644 --- a/lib/ansible/galaxy/data/network/library/example_config.py.j2 +++ b/lib/ansible/galaxy/data/network/library/example_config.py.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 # # (c) 2018 Red Hat Inc. # diff --git a/lib/ansible/galaxy/data/network/library/example_facts.py.j2 b/lib/ansible/galaxy/data/network/library/example_facts.py.j2 index 2f0bafa1ccb..f90f456eab0 100644 --- a/lib/ansible/galaxy/data/network/library/example_facts.py.j2 +++ b/lib/ansible/galaxy/data/network/library/example_facts.py.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 # # (c) 2018 Red Hat Inc. # diff --git a/lib/ansible/galaxy/data/network/meta/main.yml.j2 b/lib/ansible/galaxy/data/network/meta/main.yml.j2 index fe754a42ccd..0cd67263113 100644 --- a/lib/ansible/galaxy/data/network/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/network/meta/main.yml.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 galaxy_info: author: {{ author }} description: {{ description }} diff --git a/lib/ansible/galaxy/data/network/module_utils/example.py.j2 b/lib/ansible/galaxy/data/network/module_utils/example.py.j2 index 9422e747024..a3d9aeac236 100644 --- a/lib/ansible/galaxy/data/network/module_utils/example.py.j2 +++ b/lib/ansible/galaxy/data/network/module_utils/example.py.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 # # (c) 2018 Red Hat Inc. # diff --git a/lib/ansible/galaxy/data/network/netconf_plugins/example.py.j2 b/lib/ansible/galaxy/data/network/netconf_plugins/example.py.j2 index 69c90c990af..fb9ddfad86c 100644 --- a/lib/ansible/galaxy/data/network/netconf_plugins/example.py.j2 +++ b/lib/ansible/galaxy/data/network/netconf_plugins/example.py.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 # # (c) 2018 Red Hat Inc. # diff --git a/lib/ansible/galaxy/data/network/tasks/main.yml.j2 b/lib/ansible/galaxy/data/network/tasks/main.yml.j2 index a9880650590..1bba65a7566 100644 --- a/lib/ansible/galaxy/data/network/tasks/main.yml.j2 +++ b/lib/ansible/galaxy/data/network/tasks/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # tasks file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/network/terminal_plugins/example.py.j2 b/lib/ansible/galaxy/data/network/terminal_plugins/example.py.j2 index f44e79f3dcf..d3562d15136 100644 --- a/lib/ansible/galaxy/data/network/terminal_plugins/example.py.j2 +++ b/lib/ansible/galaxy/data/network/terminal_plugins/example.py.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 # # (c) 2018 Red Hat Inc. # diff --git a/lib/ansible/galaxy/data/network/tests/inventory b/lib/ansible/galaxy/data/network/tests/inventory index 878877b0776..03ca42fd173 100644 --- a/lib/ansible/galaxy/data/network/tests/inventory +++ b/lib/ansible/galaxy/data/network/tests/inventory @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 localhost diff --git a/lib/ansible/galaxy/data/network/tests/test.yml.j2 b/lib/ansible/galaxy/data/network/tests/test.yml.j2 index 11284eb5b8e..93263043bf1 100644 --- a/lib/ansible/galaxy/data/network/tests/test.yml.j2 +++ b/lib/ansible/galaxy/data/network/tests/test.yml.j2 @@ -1,3 +1,4 @@ +#SPDX-License-Identifier: MIT-0 --- - hosts: localhost connection: network_cli diff --git a/lib/ansible/galaxy/data/network/vars/main.yml.j2 b/lib/ansible/galaxy/data/network/vars/main.yml.j2 index 092d511a1e6..8fc2f46c5e0 100644 --- a/lib/ansible/galaxy/data/network/vars/main.yml.j2 +++ b/lib/ansible/galaxy/data/network/vars/main.yml.j2 @@ -1,2 +1,3 @@ +#SPDX-License-Identifier: MIT-0 --- # vars file for {{ role_name }} diff --git a/setup.cfg b/setup.cfg index 29fb6ef2671..d7b7fd70224 100644 --- a/setup.cfg +++ b/setup.cfg @@ -48,6 +48,7 @@ scripts = ansible = config/*.yml executor/powershell/*.ps1 + galaxy/data/COPYING galaxy/data/*.yml galaxy/data/*/*.j2 galaxy/data/*/*.md diff --git a/test/units/cli/test_galaxy.py b/test/units/cli/test_galaxy.py index ece35244a78..39362043342 100644 --- a/test/units/cli/test_galaxy.py +++ b/test/units/cli/test_galaxy.py @@ -307,7 +307,10 @@ class ValidRoleTests(object): for d in need_main_ymls: main_yml = os.path.join(self.role_dir, d, 'main.yml') self.assertTrue(os.path.exists(main_yml)) - expected_string = "---\n# {0} file for {1}".format(d, self.role_name) + if self.role_name == 'delete_me_skeleton': + expected_string = "---\n# {0} file for {1}".format(d, self.role_name) + else: + expected_string = "#SPDX-License-Identifier: MIT-0\n---\n# {0} file for {1}".format(d, self.role_name) with open(main_yml, 'r') as f: self.assertEqual(expected_string, f.read().strip())