Improve Jinja2 spacing

wbclark · wbclark · commit 32250be7b762 · 2022-08-28T23:41:46.000-04:00
diff --git a/roles/fips/tasks/el7.yml b/roles/fips/tasks/el7.yml
@@ -14,7 +14,7 @@
 - name: 'Generate boot=UUID=XXXX kernel command'
   ansible.builtin.set_fact:
     boot_cmd: "boot=UUID={{ boot_mount[0]['uuid'] }}"
-  when: boot_mount|length > 0
+  when: boot_mount | length > 0
 
 - name: 'Edit kernel command-line to include the fips=1 and boot=UUID=XXXX argument'
   ansible.builtin.shell: 'grubby --update-kernel=DEFAULT --args="fips=1 {{ boot_cmd | default() }}"'
diff --git a/roles/foreman_installer/tasks/install.yml b/roles/foreman_installer/tasks/install.yml
@@ -23,10 +23,10 @@
 
 - name: 'Run installer'
   ansible.builtin.shell: >
-      {{ foreman_installer_command }} {{ (foreman_installer_verbose|bool) | ternary("-v", "") }}
-      {{ (foreman_installer_no_colors|bool) | ternary("--no-colors", "") }}
-      {{ (foreman_installer_version is version('3.4', '<') and foreman_installer_disable_system_checks|bool) | ternary("--disable-system-checks", "") }}
-      {{ (foreman_installer_version is version('3.4', '>=') and foreman_installer_disable_system_checks|bool and foreman_installer_scenario in ['katello']) | ternary("--tuning development", "") }}
+      {{ foreman_installer_command }} {{ (foreman_installer_verbose | bool) | ternary("-v", "") }}
+      {{ (foreman_installer_no_colors | bool) | ternary("--no-colors", "") }}
+      {{ (foreman_installer_version is version('3.4', '<') and foreman_installer_disable_system_checks | bool) | ternary("--disable-system-checks", "") }}
+      {{ (foreman_installer_version is version('3.4', '>=') and foreman_installer_disable_system_checks | bool and foreman_installer_scenario in ['katello']) | ternary("--tuning development", "") }}
       {{ foreman_installer_scenario_flag }} {{ foreman_installer_scenario }}
       {{ foreman_installer_options_joined }}
   when: not foreman_installer_skip_installer
diff --git a/roles/foreman_installer/tasks/upgrade.yml b/roles/foreman_installer/tasks/upgrade.yml
@@ -19,7 +19,7 @@
 
 - name: 'Set internal installer options'
   ansible.builtin.set_fact:
-    foreman_installer_options_internal_use_only: "{{ [ '--upgrade', '--certs-update-all' ] + foreman_installer_options_internal_use_only }}"
+    foreman_installer_options_internal_use_only: "{{ ['--upgrade', '--certs-update-all'] + foreman_installer_options_internal_use_only }}"
   when:
     - foreman_installer_version is version('2.1', '<')
     - foreman_installer_scenario != 'foreman'
diff --git a/roles/foreman_provisioning/tasks/configure_centos_7.yml b/roles/foreman_provisioning/tasks/configure_centos_7.yml
@@ -17,7 +17,7 @@
 
 - name: 'Get CentOS 7 info'
   ansible.builtin.set_fact:
-    foreman_provisioning_centos73: "{{ foreman_provisioning_centos73_json.stdout|from_json }}"
+    foreman_provisioning_centos73: "{{ foreman_provisioning_centos73_json.stdout | from_json }}"
 
 - name: 'Find kickstart templates'
   ansible.builtin.shell: >
@@ -27,7 +27,7 @@
 
 - name: 'Set kickstart templates'
   ansible.builtin.set_fact:
-    kickstart_templates: "{{ kickstart_templates_json.stdout|from_json }}"
+    kickstart_templates: "{{ kickstart_templates_json.stdout | from_json }}"
 
 - name: 'Associate kickstart templates to CentOS 7'
   ansible.builtin.shell: >
diff --git a/roles/foreman_provisioning/tasks/configure_debian_9_3.yml b/roles/foreman_provisioning/tasks/configure_debian_9_3.yml
@@ -13,7 +13,7 @@
 
 - name: 'Get CentOS 9.3 info'
   ansible.builtin.set_fact:
-    foreman_provisioning_debian93: "{{ foreman_provisioning_debian93_json.stdout|from_json }}"
+    foreman_provisioning_debian93: "{{ foreman_provisioning_debian93_json.stdout | from_json }}"
 
 - name: 'Find preseed templates'
   ansible.builtin.shell: >
@@ -23,7 +23,7 @@
 
 - name: 'Set preseed templates'
   ansible.builtin.set_fact:
-    preseed_templates: "{{ preseed_templates_json.stdout|from_json }}"
+    preseed_templates: "{{ preseed_templates_json.stdout | from_json }}"
 
 - name: 'Associate preseed templates to Debian 9.3'
   ansible.builtin.shell: >
diff --git a/roles/foreman_provisioning/tasks/configure_fedora_27.yml b/roles/foreman_provisioning/tasks/configure_fedora_27.yml
@@ -13,7 +13,7 @@
 
 - name: 'Get Fedora 27 info'
   ansible.builtin.set_fact:
-    foreman_provisioning_fedora27: "{{ foreman_provisioning_fedora27_json.stdout|from_json }}"
+    foreman_provisioning_fedora27: "{{ foreman_provisioning_fedora27_json.stdout | from_json }}"
 
 - name: 'Find kickstart templates'
   ansible.builtin.shell: >
@@ -23,7 +23,7 @@
 
 - name: 'Set kickstart templates'
   ansible.builtin.set_fact:
-    kickstart_templates: "{{ kickstart_templates_json.stdout|from_json }}"
+    kickstart_templates: "{{ kickstart_templates_json.stdout | from_json }}"
 
 - name: 'Associate kickstart templates to Fedora 27'
   ansible.builtin.shell: >
diff --git a/roles/foreman_provisioning/tasks/configure_ubuntu_17_10.yml b/roles/foreman_provisioning/tasks/configure_ubuntu_17_10.yml
@@ -13,7 +13,7 @@
 
 - name: 'Get Ubuntu 17.10 info'
   ansible.builtin.set_fact:
-    foreman_provisioning_ubuntu1710: "{{ foreman_provisioning_ubuntu1710_json.stdout|from_json }}"
+    foreman_provisioning_ubuntu1710: "{{ foreman_provisioning_ubuntu1710_json.stdout | from_json }}"
 
 - name: 'Find preseed templates'
   ansible.builtin.shell: >
@@ -23,7 +23,7 @@
 
 - name: 'Set preseed templates'
   ansible.builtin.set_fact:
-    preseed_templates: "{{ preseed_templates_json.stdout|from_json }}"
+    preseed_templates: "{{ preseed_templates_json.stdout | from_json }}"
 
 - name: 'Associate preseed templates to Ubuntu 17.10'
   ansible.builtin.shell: >
diff --git a/roles/foreman_provisioning_infrastructure/tasks/main.yml b/roles/foreman_provisioning_infrastructure/tasks/main.yml
@@ -12,7 +12,7 @@
 
 - name: 'Set smart proxy id'
   ansible.builtin.set_fact:
-    foreman_provisioning_smart_proxy: "{{ foreman_provisioning_smart_proxy_json.stdout|from_json }}"
+    foreman_provisioning_smart_proxy: "{{ foreman_provisioning_smart_proxy_json.stdout | from_json }}"
 
 - name: 'Refresh features'
   ansible.builtin.shell: >
diff --git a/roles/foreman_seeder/hostgroups/tasks/main.yml b/roles/foreman_seeder/hostgroups/tasks/main.yml
@@ -3,9 +3,9 @@
 - name: 'Create operating systems'
   ansible.builtin.shell: >
     {% if 'minor' in item %}
-    {% set title = item.name +' '+ item.major +'.'+ item.minor %}
+    {% set title = item.name + ' ' + item.major + '.' + item.minor %}
     {% else %}
-    {% set title = item.name +' '+ item.major %}
+    {% set title = item.name + ' ' + item.major %}
     {% endif %}
     {{ foreman_seeder_hostgroups_hammer }} --output=silent os info --name "{{ title }}" ||
     {{ foreman_seeder_hostgroups_hammer }} --output=silent os info --title "{{ title }}" ||
@@ -53,7 +53,7 @@
 
 - name: 'Set kickstart templates'
   ansible.builtin.set_fact:
-    kickstart_templates: "{{ kickstart_templates_json.stdout|from_json }}"
+    kickstart_templates: "{{ kickstart_templates_json.stdout | from_json }}"
   tags:
     - seed
 
@@ -67,16 +67,16 @@
 
 - name: 'Set preseed templates'
   ansible.builtin.set_fact:
-    preseed_templates: "{{ preseed_templates_json.stdout|from_json }}"
+    preseed_templates: "{{ preseed_templates_json.stdout | from_json }}"
   tags:
     - seed
 
 - name: 'Associate kickstart templates to operating systems'
   ansible.builtin.shell: >
     {% if 'minor' in item[0] %}
-    {% set title = item[0].name +' '+ item[0].major +'.'+ item[0].minor %}
+    {% set title = item[0].name + ' ' + item[0].major + '.' + item[0].minor %}
     {% else %}
-    {% set title = item[0].name +' '+ item[0].major %}
+    {% set title = item[0].name + ' ' + item[0].major %}
     {% endif %}
     {% if item[0].family == 'Redhat' %}
         {{ foreman_seeder_hostgroups_hammer }} template add-operatingsystem --id {{ item[1].Id }} --operatingsystem '{{ title }}'
@@ -92,9 +92,9 @@
 - name: 'Associate preseed templates to operating systems'
   ansible.builtin.shell: >
     {% if 'minor' in item[0] %}
-    {% set title = item[0].name +' '+ item[0].major +'.'+ item[0].minor %}
+    {% set title = item[0].name + ' ' + item[0].major + '.' + item[0].minor %}
     {% else %}
-    {% set title = item[0].name +' '+ item[0].major %}
+    {% set title = item[0].name + ' ' + item[0].major %}
     {% endif %}
     {% if item[0].family == 'Debian' %}
         {{ foreman_seeder_hostgroups_hammer }} template add-operatingsystem --id {{ item[1].Id }} --operatingsystem '{{ title }}'
@@ -121,11 +121,11 @@
 - name: 'Create hostgroups'
   ansible.builtin.shell: >
     {% if 'minor' in item %}
-    {% set os_title = item.name +' '+ item.major +'.'+ item.minor %}
+    {% set os_title = item.name + ' ' + item.major + '.' + item.minor %}
     {% else %}
-    {% set os_title = item.name +' '+ item.major %}
+    {% set os_title = item.name + ' ' + item.major %}
     {% endif %}
-    {% set name = 'Forklift '+ os_title %}
+    {% set name = 'Forklift ' + os_title %}
     {{ foreman_seeder_hostgroups_hammer }} --output=silent hostgroup info --name "{{ name }}" ||
     {{ foreman_seeder_hostgroups_hammer }} hostgroup create
     --name '{{ name }}'
diff --git a/roles/foreman_server_repositories/tasks/main.yml b/roles/foreman_server_repositories/tasks/main.yml
@@ -10,19 +10,19 @@
   ansible.builtin.include_role:
     role: theforeman.operations.puppet_repositories
   when:
-    - foreman_server_repositories_puppet|bool
+    - foreman_server_repositories_puppet | bool
 
 - name: Load foreman_repositories
   ansible.builtin.include_role:
     role: foreman_repositories
-  when: foreman_server_repositories_foreman|bool
+  when: foreman_server_repositories_foreman | bool
 
 - name: Load katello_repositories
   ansible.builtin.include_role:
     role: katello_repositories
-  when: foreman_server_repositories_katello|bool
+  when: foreman_server_repositories_katello | bool
 
 - name: Load foreman_client_repositories
   ansible.builtin.include_role:
     role: foreman_client_repositories
-  when: foreman_server_repositories_foreman_client|bool
+  when: foreman_server_repositories_foreman_client | bool
diff --git a/roles/forklift/tasks/destroy.yml b/roles/forklift/tasks/destroy.yml
@@ -1,6 +1,6 @@
 ---
 - name: 'Destroy boxes'
-  ansible.builtin.command: "vagrant destroy -f {{ forklift_boxes.keys()|join(' ') }}"
+  ansible.builtin.command: "vagrant destroy -f {{ forklift_boxes.keys() | join(' ') }}"
   args:
     chdir: "{{ forklift_directory }}"
 
diff --git a/roles/forklift/tasks/halt.yml b/roles/forklift/tasks/halt.yml
@@ -1,5 +1,5 @@
 ---
 - name: 'Halt boxes'
-  ansible.builtin.command: "vagrant halt {{ forklift_boxes.keys()|join(' ') }}"
+  ansible.builtin.command: "vagrant halt {{ forklift_boxes.keys() | join(' ') }}"
   args:
     chdir: "{{ forklift_directory }}"
diff --git a/roles/forklift/tasks/up.yml b/roles/forklift/tasks/up.yml
@@ -7,6 +7,6 @@
 # using --no-parallel here to avoid problems with libvirt storage volumes
 # see https://github.com/vagrant-libvirt/vagrant-libvirt/issues/850
 - name: 'Bring up boxes'
-  ansible.builtin.command: "vagrant up --no-parallel {{ forklift_boxes.keys()|join(' ') }}"
+  ansible.builtin.command: "vagrant up --no-parallel {{ forklift_boxes.keys() | join(' ') }}"
   args:
     chdir: "{{ forklift_directory }}"
diff --git a/roles/freeipa_server/defaults/main.yml b/roles/freeipa_server/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 server_group: "server-{{ inventory_hostname }}"
 katello_server_origin: "{{ groups[server_group][0] }}"
-katello_server: "{{ katello_server_origin.replace('centos','c') }}"
+katello_server: "{{ katello_server_origin.replace('centos', 'c') }}"
 katello_server_ip: "{{ hostvars[katello_server_origin]['ansible_host'] }}"
 
 freeipa_server_ip: "{{ ansible_eth0.ipv4.address }}"
diff --git a/roles/katello_provisioning/defaults/main.yml b/roles/katello_provisioning/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 katello_provisioning_hammer: hammer
 katello_provisioning_organization: Default Organization
-katello_provisioning_organization_label: "{{ katello_provisioning_organization|regex_replace('\\s', '_') }}"
+katello_provisioning_organization_label: "{{ katello_provisioning_organization | regex_replace('\\s', '_') }}"
 katello_provisioning_location: Default Location
 katello_provisioning_sync_repos: True
 katello_provisioning_download_policy: on_demand
diff --git a/roles/katello_provisioning/tasks/main.yml b/roles/katello_provisioning/tasks/main.yml
@@ -201,7 +201,7 @@
 
 - name: 'Get CentOS 7 info'
   ansible.builtin.set_fact:
-    katello_provisioning_centos7: "{{ katello_provisioning_centos7_json.stdout|from_json }}"
+    katello_provisioning_centos7: "{{ katello_provisioning_centos7_json.stdout | from_json }}"
   when: katello_provisioning_centos7_json is success
 
 - name: 'Create CentOS 7 os when not found'
@@ -219,7 +219,7 @@
 
     - name: 'Get new CentOS 7 info'
       ansible.builtin.set_fact:
-        katello_provisioning_centos7: "{{ katello_provisioning_centos7_json_new.stdout|from_json }}"
+        katello_provisioning_centos7: "{{ katello_provisioning_centos7_json_new.stdout | from_json }}"
   when: "'not found' in katello_provisioning_centos7_json.stderr"
 
 - name: 'Update partition table for CentOS 7'
@@ -235,7 +235,7 @@
 
 - name: 'Set kickstart templates'
   ansible.builtin.set_fact:
-    kickstart_templates: "{{ kickstart_templates_json.stdout|from_json }}"
+    kickstart_templates: "{{ kickstart_templates_json.stdout | from_json }}"
 
 - name: 'Find katello kickstart templates'
   ansible.builtin.shell: >
@@ -245,7 +245,7 @@
 
 - name: 'Set kickstart templates'
   ansible.builtin.set_fact:
-    katello_kickstart_templates: "{{ katello_kickstart_templates_json.stdout|from_json }}"
+    katello_kickstart_templates: "{{ katello_kickstart_templates_json.stdout | from_json }}"
 
 - name: 'Associate kickstart templates to CentOS 7'
   ansible.builtin.shell: >
@@ -273,7 +273,7 @@
 
 - name: 'Set find centos kickstart repo'
   ansible.builtin.set_fact:
-    katello_provisioning_repo_json: "{{ katello_provisioning_repo.stdout|from_json }}"
+    katello_provisioning_repo_json: "{{ katello_provisioning_repo.stdout | from_json }}"
 
 - name: 'Find hostgroup Katello CentOS 7'
   ansible.builtin.shell: >
diff --git a/roles/pytest_project/tasks/run.yml b/roles/pytest_project/tasks/run.yml
@@ -6,7 +6,7 @@
 - name: 'Limit to markers'
   ansible.builtin.set_fact:
     pytest_project_command: "{{ pytest_project_command }} -m '{{ pytest_project_markers }}'"
-  when: pytest_project_markers|bool
+  when: pytest_project_markers | bool
 
 - name: 'Run tests'
   ansible.builtin.command: "{{ pytest_project_command }}"
diff --git a/roles/smoker/tasks/main.yml b/roles/smoker/tasks/main.yml
@@ -20,7 +20,7 @@
 - name: 'Write variables.json'
   ansible.builtin.copy:
     dest: "{{ smoker_variables_path }}"
-    content: "{{ smoker_variables|to_json }}"
+    content: "{{ smoker_variables | to_json }}"
 
 - name: 'Run Smoker via pytest_project'
   ansible.builtin.include_role:
