Merge 785f981476 into 7f17759bfe

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"=\

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 }}

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 }}

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 }}

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 }}

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 }}

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

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

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 }}

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

lib/ansible/galaxy/data/apb/tests/inventory

@@ -1,4 +1,4 @@
-#SPDX-License-Identifier: MIT-0
+# SPDX-License-Identifier: MIT-0
 localhost
 
 

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

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 }}

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)
 

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 }}

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 }}

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:
   #

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 }}

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 }}

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

lib/ansible/galaxy/data/container/tests/inventory

@@ -1,4 +1,4 @@
-#SPDX-License-Identifier: MIT-0
+# SPDX-License-Identifier: MIT-0
 localhost
 
 

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

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 }}

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 }}

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

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 }}

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 }}

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 }}

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 }}

lib/ansible/galaxy/data/default/role/tests/inventory

@@ -1,3 +1,3 @@
-#SPDX-License-Identifier: MIT-0
+# SPDX-License-Identifier: MIT-0
 localhost
 

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

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 }}

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.
 #

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 }}

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.
 #

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.
 #

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.
 #

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 }}

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.
 #

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.
 #

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 }}

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.
 #

lib/ansible/galaxy/data/network/tests/inventory

@@ -1,3 +1,3 @@
-#SPDX-License-Identifier: MIT-0
+# SPDX-License-Identifier: MIT-0
 localhost
 

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

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 }}

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())