From cfa1b2795ea41a5f2ed45d00024e91c1ea9df819 Mon Sep 17 00:00:00 2001 From: Lewis Denny Date: Fri, 30 Aug 2024 13:57:28 +1000 Subject: [PATCH] Enable yamllint empty-values rule Notes: https://github.com/ansible/ansible-lint/issues/4305 https://ansible.readthedocs.io/projects/lint/rules/yaml/#yamllint-configuration https://yamllint.readthedocs.io/en/stable/disable_with_comments.html https://yamllint.readthedocs.io/en/latest/rules.html#module-yamllint.rules.empty_values https://github.com/ansible/galaxy_collection/blob/f2a57a1807dd5adbb8e654f3bd5e125d7fad2205/roles/collection/defaults/main.yml#L25 --- .yamllint.yml | 9 +++++++++ .../architecture/validate-architecture.yml | 1 - ci/playbooks/crc/reconfigure-kubelet.yml | 1 + playbooks/ceph.yml | 6 +++--- roles/build_containers/defaults/main.yml | 2 +- roles/build_push_container/defaults/main.yml | 8 ++++---- roles/cert_manager/defaults/main.yml | 2 +- roles/ci_metallb/defaults/main.yml | 2 +- roles/ci_nmstate/defaults/main.yml | 4 ++-- roles/cifmw_ceph_spec/defaults/main.yml | 2 +- roles/cifmw_cephadm/defaults/main.yml | 6 +++--- roles/cifmw_external_dns/defaults/main.yml | 4 ++-- roles/config_drive/defaults/main.yml | 4 ++-- roles/dlrn_promote/defaults/main.yml | 4 ++-- .../tasks/check_for_previous_promotions.yml | 2 +- roles/dlrn_promote/tasks/check_reported_jobs.yml | 2 +- roles/dlrn_promote/tasks/promote_hash.yml | 2 +- roles/dlrn_report/defaults/main.yml | 8 ++++---- roles/dlrn_report/tasks/dlrn_report_results.yml | 2 +- roles/dnsmasq/defaults/main.yml | 2 +- roles/edpm_deploy/defaults/main.yml | 2 +- roles/edpm_prepare/tasks/main.yml | 2 +- roles/idrac_configuration/tasks/racreset.yml | 1 + roles/install_yamls/molecule/default/converge.yml | 4 ++-- .../tasks/zuul_set_operators_repo.yml | 2 +- roles/libvirt_manager/defaults/main.yml | 2 +- .../elements/nat64-router/package-installs.yaml | 1 + roles/openshift_adm/defaults/main.yml | 2 +- .../openshift_adm/files/regenerate-certificate.yml | 2 +- roles/openshift_obs/defaults/main.yml | 2 +- roles/ovirt/defaults/main.yml | 2 +- roles/reportportal/defaults/main.yml | 12 ++++++------ roles/shiftstack/defaults/main.yml | 2 +- roles/ssh_jumper/defaults/main.yml | 6 +++--- roles/switch_config/tasks/onyx_config.yml | 1 + roles/test_operator/defaults/main.yml | 14 +++++++------- .../tasks/edpm/hugepages_and_reboot.yml | 6 ++++-- .../expected_variables_values.yml | 8 ++++---- 38 files changed, 79 insertions(+), 65 deletions(-) create mode 100644 .yamllint.yml diff --git a/.yamllint.yml b/.yamllint.yml new file mode 100644 index 0000000000..2c084d350b --- /dev/null +++ b/.yamllint.yml @@ -0,0 +1,9 @@ +--- +# This expands on the defaults provided by ansible-lint +# https://ansible.readthedocs.io/projects/lint/rules/yaml/#yamllint-configuration +# We don't call yamllint directly, it's called through ansible-lint +rules: + empty-values: + forbid-in-block-mappings: true + forbid-in-flow-mappings: true + forbid-in-block-sequences: true diff --git a/ci/playbooks/architecture/validate-architecture.yml b/ci/playbooks/architecture/validate-architecture.yml index 2f1c5a1c4d..6758dc15c1 100644 --- a/ci/playbooks/architecture/validate-architecture.yml +++ b/ci/playbooks/architecture/validate-architecture.yml @@ -161,7 +161,6 @@ - "{{ cifmw_basedir }}/artifacts/ecdsa_deploy" - name: Generate needed facts out of local files - vars: ansible.builtin.set_fact: cifmw_ci_gen_kustomize_values_ssh_authorizedkeys: >- {{ diff --git a/ci/playbooks/crc/reconfigure-kubelet.yml b/ci/playbooks/crc/reconfigure-kubelet.yml index dc16725c5e..a8879dcf4b 100644 --- a/ci/playbooks/crc/reconfigure-kubelet.yml +++ b/ci/playbooks/crc/reconfigure-kubelet.yml @@ -45,6 +45,7 @@ - name: Reboot host after kubelet is reconfigured ansible.builtin.reboot: + msg: "Rebooting machine now" - include_role: name: start-zuul-console diff --git a/playbooks/ceph.yml b/playbooks/ceph.yml index 09ed924786..bd5e4601c0 100644 --- a/playbooks/ceph.yml +++ b/playbooks/ceph.yml @@ -316,7 +316,7 @@ cidr: 64 - name: Generate a cephx key - cephx_key: + cephx_key: # noqa: yaml[empty-values] register: cephx no_log: true @@ -359,9 +359,9 @@ loop: "{{ _target_hosts }}" # cifmw_cephadm_vip is the VIP reserved in the Storage network - - name: Set VIP var as empty string + - name: Set cifmw_cephadm_vip var to null ansible.builtin.set_fact: - cifmw_cephadm_vip: "" + cifmw_cephadm_vip: null - name: Process VIP ansible.builtin.include_role: diff --git a/roles/build_containers/defaults/main.yml b/roles/build_containers/defaults/main.yml index 2cac373cc3..c31264504b 100644 --- a/roles/build_containers/defaults/main.yml +++ b/roles/build_containers/defaults/main.yml @@ -33,7 +33,7 @@ cifmw_build_containers_registry_namespace: podified-master-centos9 cifmw_build_containers_push_registry: quay.io cifmw_build_containers_hotfix_images: [] cifmw_build_containers_hotfix_rpms_paths: [] -cifmw_build_containers_hotfix_tag: "" +cifmw_build_containers_hotfix_tag: null cifmw_build_containers_run_hotfix: false cifmw_build_containers_volume_mounts: - "/usr/share/tcib/container-images:/usr/share/tcib/container-images:z" diff --git a/roles/build_push_container/defaults/main.yml b/roles/build_push_container/defaults/main.yml index a29b96f6e0..b793f06743 100644 --- a/roles/build_push_container/defaults/main.yml +++ b/roles/build_push_container/defaults/main.yml @@ -22,7 +22,7 @@ cifmw_build_push_container_basedir: "{{ cifmw_basedir | default(ansible_user_dir cifmw_build_push_container_artifacts: "{{ (cifmw_build_push_container_basedir, 'artifacts', 'build_push_container')| ansible.builtin.path_join }}" # Build vars -cifmw_build_push_container_name: +cifmw_build_push_container_name: null cifmw_build_push_container_build_context_path: "{{ (ansible_user_dir, zuul.project.src_dir) | ansible.builtin.path_join }}" cifmw_build_push_container_containerfile_name: Containerfile cifmw_build_push_container_containerfile_path: >- @@ -42,7 +42,7 @@ cifmw_build_push_container_patch_number: "{{ zuul.change }}" cifmw_build_push_container_tag_override: [] # Push vars cifmw_build_push_container_push: false -cifmw_build_push_container_registry_name: -cifmw_build_push_container_registry_username: -cifmw_build_push_container_registry_password: +cifmw_build_push_container_registry_name: null +cifmw_build_push_container_registry_username: null +cifmw_build_push_container_registry_password: null cifmw_build_push_container_registry_tls_verify: true diff --git a/roles/cert_manager/defaults/main.yml b/roles/cert_manager/defaults/main.yml index ba473507ef..2ca29c1fdc 100644 --- a/roles/cert_manager/defaults/main.yml +++ b/roles/cert_manager/defaults/main.yml @@ -48,7 +48,7 @@ cifmw_cert_manager_olm_subscription: kind: Subscription metadata: labels: - operators.coreos.com/openshift-cert-manager-operator.cert-manager-operator: "" + operators.coreos.com/openshift-cert-manager-operator.cert-manager-operator: null name: openshift-cert-manager-operator namespace: "{{ cifmw_cert_manager_operator_namespace }}" spec: diff --git a/roles/ci_metallb/defaults/main.yml b/roles/ci_metallb/defaults/main.yml index 0d3099ba36..db09e52f34 100644 --- a/roles/ci_metallb/defaults/main.yml +++ b/roles/ci_metallb/defaults/main.yml @@ -53,4 +53,4 @@ cifmw_ci_metallb_operator_config: spec: logLevel: debug nodeSelector: - node-role.kubernetes.io/worker: "" + node-role.kubernetes.io/worker: null diff --git a/roles/ci_nmstate/defaults/main.yml b/roles/ci_nmstate/defaults/main.yml index 39cbcdf5e0..c625f5c443 100644 --- a/roles/ci_nmstate/defaults/main.yml +++ b/roles/ci_nmstate/defaults/main.yml @@ -39,7 +39,7 @@ cifmw_ci_nmstate_olm_subscription: kind: Subscription metadata: labels: - operators.coreos.com/kubernetes-nmstate-operator.openshift-nmstate: "" + operators.coreos.com/kubernetes-nmstate-operator.openshift-nmstate: null name: kubernetes-nmstate-operator namespace: "{{ cifmw_ci_nmstate_namespace }}" spec: @@ -64,7 +64,7 @@ cifmw_ci_nmstate_nncp_config_template: desiredState: interfaces: {} nodeSelector: - node-role.kubernetes.io/worker: "" + node-role.kubernetes.io/worker: null cifmw_ci_nmstate_unmanaged_config_template: {} cifmw_ci_nmstate_instances_skip_list: [] diff --git a/roles/cifmw_ceph_spec/defaults/main.yml b/roles/cifmw_ceph_spec/defaults/main.yml index cc78fed4ca..18cabea460 100644 --- a/roles/cifmw_ceph_spec/defaults/main.yml +++ b/roles/cifmw_ceph_spec/defaults/main.yml @@ -25,7 +25,7 @@ cifmw_ceph_spec_host_to_ip: # The ceph spec data devices. Should be passed as a YAML multiline string. # Use the default from the cifmw_block_device role: -cifmw_ceph_spec_data_devices: +cifmw_ceph_spec_data_devices: null # The path of the rendered spec file cifmw_ceph_spec_path: /tmp/ceph_spec.yml diff --git a/roles/cifmw_cephadm/defaults/main.yml b/roles/cifmw_cephadm/defaults/main.yml index 9fbaf7c5fd..d797734087 100644 --- a/roles/cifmw_cephadm/defaults/main.yml +++ b/roles/cifmw_cephadm/defaults/main.yml @@ -61,7 +61,7 @@ cifmw_cephadm_apply_ceph_conf_overrides_on_update: false cifmw_cephadm_standalone: false cifmw_cephadm_default_container: false cifmw_cephadm_single_host_defaults: false -cifmw_cephadm_extra_args: "" +cifmw_cephadm_extra_args: null cifmw_cephadm_pacific_filter: "16.*" # The path of the rendered rgw spec file cifmw_ceph_rgw_spec_path: /tmp/ceph_rgw.yml @@ -90,8 +90,8 @@ cifmw_ceph_rgw_config: rgw_max_attr_size: 1024 cifmw_cephadm_cephfs_name: "cephfs" cifmw_ceph_dashboard_spec_path: /tmp/ceph_dashboard.yml -cifmw_cephadm_certificate: "" -cifmw_cephadm_key: "" +cifmw_cephadm_certificate: null +cifmw_cephadm_key: null cifmw_cephadm_dashboard_port: 8444 cifmw_cephadm_grafana_admin_user: 'admin' cifmw_cephadm_grafana_admin_password: '/home/grafana_password.yml' diff --git a/roles/cifmw_external_dns/defaults/main.yml b/roles/cifmw_external_dns/defaults/main.yml index 25a40d8ca8..5b4e7f4fa4 100644 --- a/roles/cifmw_external_dns/defaults/main.yml +++ b/roles/cifmw_external_dns/defaults/main.yml @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -cifmw_external_dns_domain: "" +cifmw_external_dns_domain: null cifmw_external_dns_name: "{{ cifmw_external_dns_domain | regex_replace('\\.','-')}}-dns" cifmw_external_dns_labels: {} cifmw_external_dns_cert_name: "{{ cifmw_external_dns_domain | regex_replace('\\.','-')}}-cert" @@ -34,7 +34,7 @@ cifmw_external_dns_cert_issuer_duration: 43800h0m0s cifmw_external_dns_retries: 60 cifmw_external_dns_delay: 10 cifmw_external_dns_clean_cert: true -cifmw_external_dns_masq_cluster_ip: "" +cifmw_external_dns_masq_cluster_ip: null cifmw_external_dns_vip_ext: {} cifmw_external_dns_vip_int: {} cifmw_external_dns_extra_subj_alt_names: {} diff --git a/roles/config_drive/defaults/main.yml b/roles/config_drive/defaults/main.yml index dd93b65e5c..dae34d7aec 100644 --- a/roles/config_drive/defaults/main.yml +++ b/roles/config_drive/defaults/main.yml @@ -28,5 +28,5 @@ cifmw_config_drive_instancedir: "{{ cifmw_config_drive_workdir }}/{{ cifmw_confi cifmw_config_drive_iso_image: "{{ cifmw_config_drive_workdir }}/{{ cifmw_config_drive_uuid }}.iso" cifmw_config_drive_name: test cifmw_config_drive_hostname: test.example.com -cifmw_config_drive_userdata: -cifmw_config_drive_networkconfig: +cifmw_config_drive_userdata: null +cifmw_config_drive_networkconfig: null diff --git a/roles/dlrn_promote/defaults/main.yml b/roles/dlrn_promote/defaults/main.yml index 344466ee3c..a74e1e176b 100644 --- a/roles/dlrn_promote/defaults/main.yml +++ b/roles/dlrn_promote/defaults/main.yml @@ -21,8 +21,8 @@ cifmw_dlrn_promote_workspace: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" cifmw_dlrn_promote_dlrnapi_user: "{{ dlrnapi_user | default('review_rdoproject_org') }}" cifmw_dlrn_promote_kerberos_auth: false -cifmw_dlrn_promote_dlrnapi_host_principal: "" -cifmw_dlrn_promote_criteria_file: "" +cifmw_dlrn_promote_dlrnapi_host_principal: null +cifmw_dlrn_promote_criteria_file: null cifmw_dlrn_promote_hash: false cifmw_dlrn_promote_hash_promote_content: false cifmw_dlrn_promote_ssl_ca_bundle: "/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt" diff --git a/roles/dlrn_promote/tasks/check_for_previous_promotions.yml b/roles/dlrn_promote/tasks/check_for_previous_promotions.yml index 2985801429..3bc7f1e5e7 100644 --- a/roles/dlrn_promote/tasks/check_for_previous_promotions.yml +++ b/roles/dlrn_promote/tasks/check_for_previous_promotions.yml @@ -2,7 +2,7 @@ - name: Set empty value for dlrnapi password ansible.builtin.set_fact: dlrnapi: - password: "" + password: null when: - dlrnapi is defined - "'password' not in dlrnapi" diff --git a/roles/dlrn_promote/tasks/check_reported_jobs.yml b/roles/dlrn_promote/tasks/check_reported_jobs.yml index 8fda6dbc5c..0d928b850d 100644 --- a/roles/dlrn_promote/tasks/check_reported_jobs.yml +++ b/roles/dlrn_promote/tasks/check_reported_jobs.yml @@ -2,7 +2,7 @@ - name: Set empty value for dlrnapi password ansible.builtin.set_fact: dlrnapi: - password: "" + password: null when: - dlrnapi is defined - "'password' not in dlrnapi" diff --git a/roles/dlrn_promote/tasks/promote_hash.yml b/roles/dlrn_promote/tasks/promote_hash.yml index 5ef9d67cc8..776ca10123 100644 --- a/roles/dlrn_promote/tasks/promote_hash.yml +++ b/roles/dlrn_promote/tasks/promote_hash.yml @@ -2,7 +2,7 @@ - name: Set empty value for dlrnapi password ansible.builtin.set_fact: dlrnapi: - password: "" + password: null when: - dlrnapi is defined - "'password' not in dlrnapi" diff --git a/roles/dlrn_report/defaults/main.yml b/roles/dlrn_report/defaults/main.yml index 519a443e8f..9d2350a1da 100644 --- a/roles/dlrn_report/defaults/main.yml +++ b/roles/dlrn_report/defaults/main.yml @@ -22,8 +22,8 @@ cifmw_dlrn_report_workspace: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci cifmw_dlrn_report_dlrnapi_user: "{{ dlrnapi_user | default('review_rdoproject_org') }}" cifmw_dlrn_report_kerberos_auth: false cifmw_dlrn_report_result: true -cifmw_dlrn_report_dlrnapi_host_principal: "" -cifmw_dlrn_report_keytab: "" -cifmw_dlrn_report_krb_user_realm: "" +cifmw_dlrn_report_dlrnapi_host_principal: null +cifmw_dlrn_report_keytab: null +cifmw_dlrn_report_krb_user_realm: null cifmw_dlrn_report_zuul_log_path: "https://logserver.rdoproject.org" -cifmw_dlrn_report_promote_source: "" +cifmw_dlrn_report_promote_source: null diff --git a/roles/dlrn_report/tasks/dlrn_report_results.yml b/roles/dlrn_report/tasks/dlrn_report_results.yml index 0abbbc56d7..d85420424d 100644 --- a/roles/dlrn_report/tasks/dlrn_report_results.yml +++ b/roles/dlrn_report/tasks/dlrn_report_results.yml @@ -25,7 +25,7 @@ - name: Set empty value for dlrnapi password ansible.builtin.set_fact: dlrnapi: - password: "" + password: null when: - dlrnapi is defined - "'password' not in dlrnapi" diff --git a/roles/dnsmasq/defaults/main.yml b/roles/dnsmasq/defaults/main.yml index a2b926e6b7..2df6e21690 100644 --- a/roles/dnsmasq/defaults/main.yml +++ b/roles/dnsmasq/defaults/main.yml @@ -20,7 +20,7 @@ cifmw_dnsmasq_basedir: "/etc/cifmw-dnsmasq.d" cifmw_dnsmasq_dns_config_file: "{{ cifmw_dnsmasq_basedir }}/dns.conf" cifmw_dnsmasq_listener_config_file: "{{ cifmw_dnsmasq_basedir }}/listener.conf" -cifmw_dnsmasq_raw_config: "" +cifmw_dnsmasq_raw_config: null cifmw_dnsmasq_forwarders: [] cifmw_dnsmasq_interfaces: [] cifmw_dnsmasq_listen_addresses: [] diff --git a/roles/edpm_deploy/defaults/main.yml b/roles/edpm_deploy/defaults/main.yml index fb85daf66c..4a372ae807 100644 --- a/roles/edpm_deploy/defaults/main.yml +++ b/roles/edpm_deploy/defaults/main.yml @@ -29,6 +29,6 @@ cifmw_edpm_deploy_dryrun: false cifmw_edpm_deploy_timeout: 60 cifmw_edpm_deploy_registry_url: "{{ cifmw_install_yamls_defaults['DATAPLANE_REGISTRY_URL'] }}" cifmw_edpm_deploy_prepare_run: true -cifmw_edpm_deploy_nova_compute_extra_config: "" +cifmw_edpm_deploy_nova_compute_extra_config: null # Defines the kind of resources that should be applied only in step 2 of the EDPM deployment cifmw_edpm_deploy_step2_kind: "OpenStackDataPlaneDeployment" diff --git a/roles/edpm_prepare/tasks/main.yml b/roles/edpm_prepare/tasks/main.yml index 88a7c4b356..1ba9e9af68 100644 --- a/roles/edpm_prepare/tasks/main.yml +++ b/roles/edpm_prepare/tasks/main.yml @@ -25,7 +25,7 @@ operators_build_output: "{{ (cifmw_operator_build_output | default({'operators':{}})).operators }}" ansible.builtin.set_fact: _install_yamls_repos: - OPENSTACK_BRANCH: "" + OPENSTACK_BRANCH: null GIT_CLONE_OPTS': "-l" OPENSTACK_REPO': "{{ operators_build_output[cifmw_operator_build_meta_name].git_src_dir }}" diff --git a/roles/idrac_configuration/tasks/racreset.yml b/roles/idrac_configuration/tasks/racreset.yml index 47a6168a02..8e99b83100 100644 --- a/roles/idrac_configuration/tasks/racreset.yml +++ b/roles/idrac_configuration/tasks/racreset.yml @@ -22,3 +22,4 @@ - name: Wait For iDRAC To Be Online (Using SSH) ansible.builtin.wait_for: + timeout: 300 diff --git a/roles/install_yamls/molecule/default/converge.yml b/roles/install_yamls/molecule/default/converge.yml index 6c5f6f8036..c7f3c07e3f 100644 --- a/roles/install_yamls/molecule/default/converge.yml +++ b/roles/install_yamls/molecule/default/converge.yml @@ -71,9 +71,9 @@ vars: expected_output: OPENSTACK_REPO: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/openstack-operator" - OPENSTACK_BRANCH: "" + OPENSTACK_BRANCH: null BAREMETAL_REPO: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/openstack-baremetal-operator" - BAREMETAL_BRANCH: "" + BAREMETAL_BRANCH: null ansible.builtin.assert: that: - cifmw_install_yamls_operators_repo == expected_output diff --git a/roles/install_yamls/tasks/zuul_set_operators_repo.yml b/roles/install_yamls/tasks/zuul_set_operators_repo.yml index fe64090a1d..b970553310 100644 --- a/roles/install_yamls/tasks/zuul_set_operators_repo.yml +++ b/roles/install_yamls/tasks/zuul_set_operators_repo.yml @@ -29,7 +29,7 @@ - key: "{{ _repo_operator_name | upper }}_REPO" value: "{{ ansible_user_dir }}/{{ zuul_item.project.src_dir }}" - key: "{{ _repo_operator_name | upper }}_BRANCH" - value: "" + value: null ansible.builtin.set_fact: cifmw_install_yamls_operators_repo: "{{ cifmw_install_yamls_operators_repo | default({}) | combine(_repo_operator_info | items2dict) }}" loop: "{{ zuul['items'] }}" diff --git a/roles/libvirt_manager/defaults/main.yml b/roles/libvirt_manager/defaults/main.yml index 1c2741ab66..92903c76fe 100644 --- a/roles/libvirt_manager/defaults/main.yml +++ b/roles/libvirt_manager/defaults/main.yml @@ -48,7 +48,7 @@ cifmw_libvirt_manager_configuration: cifmw_libvirt_manager_crc_pool: "{{ cifmw_crc_pool | default(lookup('env', 'HOME')) ~ '/.crc/machines/crc' }}" cifmw_libvirt_manager_vol_prefix: '' -cifmw_libvirt_manager_pool: +cifmw_libvirt_manager_pool: null cifmw_libvirt_manager_pool_dir: "{{ cifmw_libvirt_manager_basedir }}/volumes" cifmw_libvirt_manager_ocp_pool: "ocp_volumes" cifmw_libvirt_manager_ocp_pool_dir: "{{ cifmw_libvirt_manager_basedir }}/ocp_volumes" diff --git a/roles/nat64_appliance/files/elements/nat64-router/package-installs.yaml b/roles/nat64_appliance/files/elements/nat64-router/package-installs.yaml index fc6d0b74b5..d7c3c0339e 100644 --- a/roles/nat64_appliance/files/elements/nat64-router/package-installs.yaml +++ b/roles/nat64_appliance/files/elements/nat64-router/package-installs.yaml @@ -1,3 +1,4 @@ +# TODO(Lewis): Need to find what this is for bind-utils: gcc: git: diff --git a/roles/openshift_adm/defaults/main.yml b/roles/openshift_adm/defaults/main.yml index fc3b2ccdd5..50947d6d04 100644 --- a/roles/openshift_adm/defaults/main.yml +++ b/roles/openshift_adm/defaults/main.yml @@ -25,7 +25,7 @@ cifmw_openshift_adm_cert_expire_date_file: >- (cifmw_openshift_adm_basedir, 'artifacts', '.ocp_cert_not_after') | ansible.builtin.path_join }} -cifmw_openshift_adm_op: "" +cifmw_openshift_adm_op: null cifmw_openshift_adm_dry_run: false cifmw_openshift_adm_retry_count: 100 cifmw_openshift_adm_stable_period: 3m diff --git a/roles/openshift_adm/files/regenerate-certificate.yml b/roles/openshift_adm/files/regenerate-certificate.yml index eb88c4505b..a0f9858b09 100644 --- a/roles/openshift_adm/files/regenerate-certificate.yml +++ b/roles/openshift_adm/files/regenerate-certificate.yml @@ -85,7 +85,7 @@ spec: - mountPath: /etc/kubernetes/ name: kubelet-dir nodeSelector: - node-role.kubernetes.io/master: "" + node-role.kubernetes.io/master: null priorityClassName: "system-cluster-critical" restartPolicy: Always securityContext: diff --git a/roles/openshift_obs/defaults/main.yml b/roles/openshift_obs/defaults/main.yml index 363e3fc0f5..b4214f68b8 100644 --- a/roles/openshift_obs/defaults/main.yml +++ b/roles/openshift_obs/defaults/main.yml @@ -22,7 +22,7 @@ cifmw_openshift_obs_definition: name: observability-operator namespace: openshift-operators labels: - operators.coreos.com/observability-operator.openshift-operators: "" + operators.coreos.com/observability-operator.openshift-operators: null spec: channel: development installPlanApproval: Automatic diff --git a/roles/ovirt/defaults/main.yml b/roles/ovirt/defaults/main.yml index 6182a925bd..6e239b32c8 100644 --- a/roles/ovirt/defaults/main.yml +++ b/roles/ovirt/defaults/main.yml @@ -21,7 +21,7 @@ cifmw_ovirt_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts" cifmw_ovirt_ssh_key_type: "{{ cifmw_ssh_keytype | default('ecdsa') }}" cifmw_ovirt_ssh_key_size: "{{ cifmw_ssh_keysize | default(521) }}" -cifmw_ovirt_ssh_public_key: "" +cifmw_ovirt_ssh_public_key: null cifmw_ovirt_vm_timeout: 300 cifmw_ovirt_sdk_package: "https://github.com/oVirt/python-ovirt-engine-sdk4/releases/download/4.6.2/python3-ovirt-engine-sdk4-4.6.2-1.el9.x86_64.rpm" diff --git a/roles/reportportal/defaults/main.yml b/roles/reportportal/defaults/main.yml index acbf8f8b0f..ba386b125b 100644 --- a/roles/reportportal/defaults/main.yml +++ b/roles/reportportal/defaults/main.yml @@ -1,9 +1,9 @@ --- cifmw_reportportal_dry_run: false cifmw_reportportal_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" -cifmw_reportportal_datarouter_url: "" -cifmw_reportportal_datarouter_username: "" -cifmw_reportportal_datarouter_password: "" +cifmw_reportportal_datarouter_url: null +cifmw_reportportal_datarouter_username: null +cifmw_reportportal_datarouter_password: null cifmw_reportportal_droute_dir: >- {{ (cifmw_reportportal_basedir, @@ -34,9 +34,9 @@ cifmw_reportportal_results_search: >- }} cifmw_reportportal_droute_version: "1.2.1" cifmw_reportportal_droute_binary: "droute-linux-amd64" -cifmw_reportportal_droute_client_url: "" -cifmw_reportportal_instance: "" -cifmw_reportportal_project: "" +cifmw_reportportal_droute_client_url: null +cifmw_reportportal_instance: null +cifmw_reportportal_project: null cifmw_reportportal_property_filter: - ".*" cifmw_reportportal_launch_name: "Dummy launch" diff --git a/roles/shiftstack/defaults/main.yml b/roles/shiftstack/defaults/main.yml index 02f88809f0..dba3f7c46a 100644 --- a/roles/shiftstack/defaults/main.yml +++ b/roles/shiftstack/defaults/main.yml @@ -27,7 +27,7 @@ cifmw_shiftstack_client_pvc_manifest: "{{ cifmw_shiftstack_client_pod_name }}_pv cifmw_shiftstack_cluster_name: "ostest" cifmw_shiftstack_installation_dir: "{{ cifmw_shiftstack_basedir }}/installation" cifmw_shiftstack_project_name: "shiftstack" -cifmw_shiftstack_qa_gerrithub_change: "" +cifmw_shiftstack_qa_gerrithub_change: null cifmw_shiftstack_qa_repo: "https://review.gerrithub.io/shiftstack/shiftstack-qa" cifmw_shiftstack_run_playbook: "ocp_testing.yaml" cifmw_shiftstack_sc: "local-storage" diff --git a/roles/ssh_jumper/defaults/main.yml b/roles/ssh_jumper/defaults/main.yml index 59af40aa07..410e4d87da 100644 --- a/roles/ssh_jumper/defaults/main.yml +++ b/roles/ssh_jumper/defaults/main.yml @@ -19,9 +19,9 @@ # All variables within this role should have a prefix of "cifmw_ssh_jumper" cifmw_ssh_jumper_config: - - hostname: - proxy_host: - identity_file: + - hostname: null + proxy_host: null + identity_file: null patterns: "{{ cifmw_ssh_jumper_defaults.patterns }}" target: "{{ cifmw_ssh_jumper_defaults.target }}" ssh_dir: "{{ cifmw_ssh_jumper_defaults.ssh_dir }}" diff --git a/roles/switch_config/tasks/onyx_config.yml b/roles/switch_config/tasks/onyx_config.yml index 53729d020e..e40e5e4507 100644 --- a/roles/switch_config/tasks/onyx_config.yml +++ b/roles/switch_config/tasks/onyx_config.yml @@ -1,6 +1,7 @@ --- - name: Collect switch facts mellanox.onyx.onyx_facts: + gather_subset: version register: onyx_facts failed_when: false diff --git a/roles/test_operator/defaults/main.yml b/roles/test_operator/defaults/main.yml index b45bdcbc4e..6c14db48e8 100644 --- a/roles/test_operator/defaults/main.yml +++ b/roles/test_operator/defaults/main.yml @@ -161,13 +161,13 @@ cifmw_test_operator_ansibletest_container: openstack-ansible-tests cifmw_test_operator_ansibletest_image: "{{ cifmw_test_operator_ansibletest_registry }}/{{ cifmw_test_operator_ansibletest_namespace }}/{{ cifmw_test_operator_ansibletest_container }}" cifmw_test_operator_ansibletest_image_tag: current-podified cifmw_test_operator_ansibletest_compute_ssh_key_secret_name: "dataplane-ansible-ssh-private-key-secret" -cifmw_test_operator_ansibletest_workload_ssh_key_secret_name: "" -cifmw_test_operator_ansibletest_ansible_git_repo: "" -cifmw_test_operator_ansibletest_ansible_playbook_path: "" -cifmw_test_operator_ansibletest_ansible_collection: "" -cifmw_test_operator_ansibletest_ansible_var_files: "" -cifmw_test_operator_ansibletest_ansible_extra_vars: "" -cifmw_test_operator_ansibletest_ansible_inventory: "" +cifmw_test_operator_ansibletest_workload_ssh_key_secret_name: null +cifmw_test_operator_ansibletest_ansible_git_repo: null +cifmw_test_operator_ansibletest_ansible_playbook_path: null +cifmw_test_operator_ansibletest_ansible_collection: null +cifmw_test_operator_ansibletest_ansible_var_files: null +cifmw_test_operator_ansibletest_ansible_extra_vars: null +cifmw_test_operator_ansibletest_ansible_inventory: null cifmw_test_operator_ansibletest_openstack_config_map: "openstack-config" cifmw_test_operator_ansibletest_openstack_config_secret: "openstack-config-secret" cifmw_test_operator_ansibletest_debug: false diff --git a/roles/validations/tasks/edpm/hugepages_and_reboot.yml b/roles/validations/tasks/edpm/hugepages_and_reboot.yml index 9a2de54343..2f190a8e57 100644 --- a/roles/validations/tasks/edpm/hugepages_and_reboot.yml +++ b/roles/validations/tasks/edpm/hugepages_and_reboot.yml @@ -9,7 +9,8 @@ # Collect facts from the node in question. this will give us an initial state prior to our changes # that can be compared with the end state. - name: Collect initial state of edpm node - ansible.builtin.gather_facts: + ansible.builtin.setup: + gather_subset: all delegate_to: "{{ cifmw_validations_edpm_check_node }}" register: initial_node_state @@ -133,7 +134,8 @@ # gather facts again to compare against the initial state. - name: Collect post change state of edpm node - ansible.builtin.gather_facts: + ansible.builtin.setup: + gather_subset: all delegate_to: "{{ cifmw_validations_edpm_check_node }}" register: post_change_node_state diff --git a/tests/integration/targets/make/files/get_makefiles_env/expected_variables_values.yml b/tests/integration/targets/make/files/get_makefiles_env/expected_variables_values.yml index 944b06b352..0cc1d10489 100644 --- a/tests/integration/targets/make/files/get_makefiles_env/expected_variables_values.yml +++ b/tests/integration/targets/make/files/get_makefiles_env/expected_variables_values.yml @@ -31,7 +31,7 @@ variables: BMO_IRONIC_HOST: "192.168.122.10" BMO_PROVISIONING_INTERFACE: "enp6s0" BMO_REPO: "https://github.com/metal3-io/baremetal-operator" - BMO_SETUP: "" + BMO_SETUP: null BM_INSTANCE_NAME_PREFIX: "edpm-compute" BM_NETWORK_IPADDRESS: "192.168.122.1" BM_NETWORK_NAME: "default" @@ -54,7 +54,7 @@ variables: CRC_STORAGE_RETRIES: "3" CRC_URL: "'https://developers.redhat.com/content-gateway/file/pub/openshift-v4/clients/crc/2.19.0/crc-linux-amd64.tar.xz'" DATAPLANE_ANSIBLE_SECRET: "dataplane-ansible-ssh-private-key-secret" - DATAPLANE_ANSIBLE_USER: "" + DATAPLANE_ANSIBLE_USER: null DATAPLANE_COMPUTE_1_IP: "192.168.122.101" DATAPLANE_COMPUTE_IP: "192.168.122.100" DATAPLANE_CONTAINER_TAG: "current-podified" @@ -86,8 +86,8 @@ variables: EDPM_CONTAINER_TAG: "current-podified" EDPM_REGISTRY_URL: "quay.io/podified-antelope-centos9" EDPM_TOTAL_NODES: "1" - GALERA_REPLICAS: "" - GIT_CLONE_OPTS: "" + GALERA_REPLICAS: null + GIT_CLONE_OPTS: null GLANCE: "config/samples/glance_v1beta1_glance.yaml" GLANCEAPI_DEPL_IMG: "unused" GLANCE_BRANCH: "main"