From 785f981476a55a02b8c974ec0abcec6eb6f81d82 Mon Sep 17 00:00:00 2001 From: jvautour Date: Thu, 17 Apr 2025 10:32:24 +0100 Subject: [PATCH] fix template spacing The lack of spacing for the SPDX identifier in the jinja templates causes ansible-lint to throw a formatting warning when initing new roles with ansible-galaxy --- lib/ansible/galaxy/data/apb/Dockerfile.j2 | 2 +- lib/ansible/galaxy/data/apb/Makefile.j2 | 2 +- lib/ansible/galaxy/data/apb/apb.yml.j2 | 2 +- lib/ansible/galaxy/data/apb/defaults/main.yml.j2 | 2 +- lib/ansible/galaxy/data/apb/handlers/main.yml.j2 | 2 +- lib/ansible/galaxy/data/apb/meta/main.yml.j2 | 2 +- lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 | 2 +- lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 | 2 +- lib/ansible/galaxy/data/apb/tasks/main.yml.j2 | 2 +- lib/ansible/galaxy/data/apb/tests/ansible.cfg | 2 +- lib/ansible/galaxy/data/apb/tests/inventory | 2 +- lib/ansible/galaxy/data/apb/tests/test.yml.j2 | 2 +- lib/ansible/galaxy/data/apb/vars/main.yml.j2 | 2 +- lib/ansible/galaxy/data/collections_galaxy_meta.yml | 2 +- lib/ansible/galaxy/data/container/defaults/main.yml.j2 | 2 +- lib/ansible/galaxy/data/container/handlers/main.yml.j2 | 2 +- lib/ansible/galaxy/data/container/meta/container.yml.j2 | 2 +- lib/ansible/galaxy/data/container/meta/main.yml.j2 | 2 +- lib/ansible/galaxy/data/container/tasks/main.yml.j2 | 2 +- lib/ansible/galaxy/data/container/tests/ansible.cfg | 2 +- lib/ansible/galaxy/data/container/tests/inventory | 2 +- lib/ansible/galaxy/data/container/tests/test.yml.j2 | 2 +- lib/ansible/galaxy/data/container/vars/main.yml.j2 | 2 +- lib/ansible/galaxy/data/default/collection/galaxy.yml.j2 | 2 +- lib/ansible/galaxy/data/default/collection/meta/runtime.yml | 2 +- lib/ansible/galaxy/data/default/role/defaults/main.yml.j2 | 2 +- lib/ansible/galaxy/data/default/role/handlers/main.yml.j2 | 2 +- lib/ansible/galaxy/data/default/role/meta/main.yml.j2 | 2 +- lib/ansible/galaxy/data/default/role/tasks/main.yml.j2 | 2 +- lib/ansible/galaxy/data/default/role/tests/inventory | 2 +- lib/ansible/galaxy/data/default/role/tests/test.yml.j2 | 2 +- lib/ansible/galaxy/data/default/role/vars/main.yml.j2 | 2 +- lib/ansible/galaxy/data/network/cliconf_plugins/example.py.j2 | 2 +- lib/ansible/galaxy/data/network/defaults/main.yml.j2 | 2 +- lib/ansible/galaxy/data/network/library/example_command.py.j2 | 2 +- lib/ansible/galaxy/data/network/library/example_config.py.j2 | 2 +- lib/ansible/galaxy/data/network/library/example_facts.py.j2 | 2 +- lib/ansible/galaxy/data/network/meta/main.yml.j2 | 2 +- lib/ansible/galaxy/data/network/module_utils/example.py.j2 | 2 +- lib/ansible/galaxy/data/network/netconf_plugins/example.py.j2 | 2 +- lib/ansible/galaxy/data/network/tasks/main.yml.j2 | 2 +- lib/ansible/galaxy/data/network/terminal_plugins/example.py.j2 | 2 +- lib/ansible/galaxy/data/network/tests/inventory | 2 +- lib/ansible/galaxy/data/network/tests/test.yml.j2 | 2 +- lib/ansible/galaxy/data/network/vars/main.yml.j2 | 2 +- test/units/cli/test_galaxy.py | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/lib/ansible/galaxy/data/apb/Dockerfile.j2 b/lib/ansible/galaxy/data/apb/Dockerfile.j2 index f39abc3bd89..0eef6aaa140 100644 --- a/lib/ansible/galaxy/data/apb/Dockerfile.j2 +++ b/lib/ansible/galaxy/data/apb/Dockerfile.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 9278d246094..63f16f1b72d 100644 --- a/lib/ansible/galaxy/data/apb/Makefile.j2 +++ b/lib/ansible/galaxy/data/apb/Makefile.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 e9405dcc359..a5ce8d78d2e 100644 --- a/lib/ansible/galaxy/data/apb/apb.yml.j2 +++ b/lib/ansible/galaxy/data/apb/apb.yml.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 8842d94e345..af60f981571 100644 --- a/lib/ansible/galaxy/data/apb/defaults/main.yml.j2 +++ b/lib/ansible/galaxy/data/apb/defaults/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 89371a09bab..7d2d29d4e6e 100644 --- a/lib/ansible/galaxy/data/apb/handlers/main.yml.j2 +++ b/lib/ansible/galaxy/data/apb/handlers/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 23f870c4c50..033bf52dba4 100644 --- a/lib/ansible/galaxy/data/apb/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/apb/meta/main.yml.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 0a863784990..981372d2486 100644 --- a/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 +++ b/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 f0691e2b875..da2c6956973 100644 --- a/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 +++ b/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 1bba65a7566..645930c18ba 100644 --- a/lib/ansible/galaxy/data/apb/tasks/main.yml.j2 +++ b/lib/ansible/galaxy/data/apb/tasks/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 e2b73526706..4b641a15939 100644 --- a/lib/ansible/galaxy/data/apb/tests/ansible.cfg +++ b/lib/ansible/galaxy/data/apb/tests/ansible.cfg @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 a24f8243f1f..82a06b881c1 100644 --- a/lib/ansible/galaxy/data/apb/tests/inventory +++ b/lib/ansible/galaxy/data/apb/tests/inventory @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 1b03869978c..99f5115efb9 100644 --- a/lib/ansible/galaxy/data/apb/tests/test.yml.j2 +++ b/lib/ansible/galaxy/data/apb/tests/test.yml.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 8fc2f46c5e0..85d8d3ec083 100644 --- a/lib/ansible/galaxy/data/apb/vars/main.yml.j2 +++ b/lib/ansible/galaxy/data/apb/vars/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 f47f1a7efff..3fa0c8e9888 100644 --- a/lib/ansible/galaxy/data/collections_galaxy_meta.yml +++ b/lib/ansible/galaxy/data/collections_galaxy_meta.yml @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 8842d94e345..af60f981571 100644 --- a/lib/ansible/galaxy/data/container/defaults/main.yml.j2 +++ b/lib/ansible/galaxy/data/container/defaults/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 89371a09bab..7d2d29d4e6e 100644 --- a/lib/ansible/galaxy/data/container/handlers/main.yml.j2 +++ b/lib/ansible/galaxy/data/container/handlers/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 97b39617192..39bc4d9ab79 100644 --- a/lib/ansible/galaxy/data/container/meta/container.yml.j2 +++ b/lib/ansible/galaxy/data/container/meta/container.yml.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 d3fe1495a25..ec85f5649f9 100644 --- a/lib/ansible/galaxy/data/container/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/container/meta/main.yml.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 1bba65a7566..645930c18ba 100644 --- a/lib/ansible/galaxy/data/container/tasks/main.yml.j2 +++ b/lib/ansible/galaxy/data/container/tasks/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 e2b73526706..4b641a15939 100644 --- a/lib/ansible/galaxy/data/container/tests/ansible.cfg +++ b/lib/ansible/galaxy/data/container/tests/ansible.cfg @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 a24f8243f1f..82a06b881c1 100644 --- a/lib/ansible/galaxy/data/container/tests/inventory +++ b/lib/ansible/galaxy/data/container/tests/inventory @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 1b03869978c..99f5115efb9 100644 --- a/lib/ansible/galaxy/data/container/tests/test.yml.j2 +++ b/lib/ansible/galaxy/data/container/tests/test.yml.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 8fc2f46c5e0..85d8d3ec083 100644 --- a/lib/ansible/galaxy/data/container/vars/main.yml.j2 +++ b/lib/ansible/galaxy/data/container/vars/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# SPDX-License-Identifier: MIT-0 --- # vars file for {{ role_name }} diff --git a/lib/ansible/galaxy/data/default/collection/galaxy.yml.j2 b/lib/ansible/galaxy/data/default/collection/galaxy.yml.j2 index 842bdb10ce1..dbcfcd826d8 100644 --- a/lib/ansible/galaxy/data/default/collection/galaxy.yml.j2 +++ b/lib/ansible/galaxy/data/default/collection/galaxy.yml.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 936cae9f714..af57aea3394 100644 --- a/lib/ansible/galaxy/data/default/collection/meta/runtime.yml +++ b/lib/ansible/galaxy/data/default/collection/meta/runtime.yml @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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/role/defaults/main.yml.j2 b/lib/ansible/galaxy/data/default/role/defaults/main.yml.j2 index 8842d94e345..af60f981571 100644 --- a/lib/ansible/galaxy/data/default/role/defaults/main.yml.j2 +++ b/lib/ansible/galaxy/data/default/role/defaults/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 89371a09bab..7d2d29d4e6e 100644 --- a/lib/ansible/galaxy/data/default/role/handlers/main.yml.j2 +++ b/lib/ansible/galaxy/data/default/role/handlers/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 b23f47cc5bc..742b304de43 100644 --- a/lib/ansible/galaxy/data/default/role/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/default/role/meta/main.yml.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 1bba65a7566..645930c18ba 100644 --- a/lib/ansible/galaxy/data/default/role/tasks/main.yml.j2 +++ b/lib/ansible/galaxy/data/default/role/tasks/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 03ca42fd173..7df9d145a91 100644 --- a/lib/ansible/galaxy/data/default/role/tests/inventory +++ b/lib/ansible/galaxy/data/default/role/tests/inventory @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 bf4f028593e..15e6a521ff7 100644 --- a/lib/ansible/galaxy/data/default/role/tests/test.yml.j2 +++ b/lib/ansible/galaxy/data/default/role/tests/test.yml.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 8fc2f46c5e0..85d8d3ec083 100644 --- a/lib/ansible/galaxy/data/default/role/vars/main.yml.j2 +++ b/lib/ansible/galaxy/data/default/role/vars/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 51e41111117..6a88bfaae2a 100644 --- a/lib/ansible/galaxy/data/network/cliconf_plugins/example.py.j2 +++ b/lib/ansible/galaxy/data/network/cliconf_plugins/example.py.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 8842d94e345..af60f981571 100644 --- a/lib/ansible/galaxy/data/network/defaults/main.yml.j2 +++ b/lib/ansible/galaxy/data/network/defaults/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 9aa6ef62d4d..806a85235de 100644 --- a/lib/ansible/galaxy/data/network/library/example_command.py.j2 +++ b/lib/ansible/galaxy/data/network/library/example_command.py.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 2913af08a0c..7597a350d71 100644 --- a/lib/ansible/galaxy/data/network/library/example_config.py.j2 +++ b/lib/ansible/galaxy/data/network/library/example_config.py.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 f90f456eab0..39b4fbc8d82 100644 --- a/lib/ansible/galaxy/data/network/library/example_facts.py.j2 +++ b/lib/ansible/galaxy/data/network/library/example_facts.py.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 0cd67263113..2e963d1e739 100644 --- a/lib/ansible/galaxy/data/network/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/network/meta/main.yml.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 a3d9aeac236..2bc4484f8d0 100644 --- a/lib/ansible/galaxy/data/network/module_utils/example.py.j2 +++ b/lib/ansible/galaxy/data/network/module_utils/example.py.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 fb9ddfad86c..25f66b07294 100644 --- a/lib/ansible/galaxy/data/network/netconf_plugins/example.py.j2 +++ b/lib/ansible/galaxy/data/network/netconf_plugins/example.py.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 1bba65a7566..645930c18ba 100644 --- a/lib/ansible/galaxy/data/network/tasks/main.yml.j2 +++ b/lib/ansible/galaxy/data/network/tasks/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 d3562d15136..987a33512e1 100644 --- a/lib/ansible/galaxy/data/network/terminal_plugins/example.py.j2 +++ b/lib/ansible/galaxy/data/network/terminal_plugins/example.py.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 03ca42fd173..7df9d145a91 100644 --- a/lib/ansible/galaxy/data/network/tests/inventory +++ b/lib/ansible/galaxy/data/network/tests/inventory @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# 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 93263043bf1..4e17fc2c556 100644 --- a/lib/ansible/galaxy/data/network/tests/test.yml.j2 +++ b/lib/ansible/galaxy/data/network/tests/test.yml.j2 @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: MIT-0 +# 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 8fc2f46c5e0..85d8d3ec083 100644 --- a/lib/ansible/galaxy/data/network/vars/main.yml.j2 +++ b/lib/ansible/galaxy/data/network/vars/main.yml.j2 @@ -1,3 +1,3 @@ -#SPDX-License-Identifier: MIT-0 +# SPDX-License-Identifier: MIT-0 --- # vars file for {{ role_name }} diff --git a/test/units/cli/test_galaxy.py b/test/units/cli/test_galaxy.py index 9b486b2fa2e..7678568cc19 100644 --- a/test/units/cli/test_galaxy.py +++ b/test/units/cli/test_galaxy.py @@ -320,7 +320,7 @@ class ValidRoleTests(object): 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) + 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())