Skip to content

Commit

Permalink
Show file tree
Hide file tree
Showing 38 changed files with 79 additions and 65 deletions.
9 changes: 9 additions & 0 deletions .yamllint.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion ci/playbooks/architecture/validate-architecture.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
{{
Expand Down
1 change: 1 addition & 0 deletions ci/playbooks/crc/reconfigure-kubelet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@

- name: Reboot host after kubelet is reconfigured
ansible.builtin.reboot:
msg: "Rebooting machine now"

- include_role:
name: start-zuul-console
6 changes: 3 additions & 3 deletions playbooks/ceph.yml
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
cidr: 64

- name: Generate a cephx key
cephx_key:
cephx_key: # noqa: yaml[empty-values]
register: cephx
no_log: true

Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion roles/build_containers/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions roles/build_push_container/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
Expand All @@ -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
2 changes: 1 addition & 1 deletion roles/cert_manager/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion roles/ci_metallb/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ cifmw_ci_metallb_operator_config:
spec:
logLevel: debug
nodeSelector:
node-role.kubernetes.io/worker: ""
node-role.kubernetes.io/worker: null
4 changes: 2 additions & 2 deletions roles/ci_nmstate/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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: []
2 changes: 1 addition & 1 deletion roles/cifmw_ceph_spec/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions roles/cifmw_cephadm/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions roles/cifmw_external_dns/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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: {}
4 changes: 2 additions & 2 deletions roles/config_drive/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions roles/dlrn_promote/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion roles/dlrn_promote/tasks/check_for_previous_promotions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion roles/dlrn_promote/tasks/check_reported_jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion roles/dlrn_promote/tasks/promote_hash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions roles/dlrn_report/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion roles/dlrn_report/tasks/dlrn_report_results.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion roles/dnsmasq/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down
2 changes: 1 addition & 1 deletion roles/edpm_deploy/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion roles/edpm_prepare/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"

Expand Down
1 change: 1 addition & 0 deletions roles/idrac_configuration/tasks/racreset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@

- name: Wait For iDRAC To Be Online (Using SSH)
ansible.builtin.wait_for:
timeout: 300
4 changes: 2 additions & 2 deletions roles/install_yamls/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion roles/install_yamls/tasks/zuul_set_operators_repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'] }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/libvirt_manager/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# TODO(Lewis): Need to find what this is for
bind-utils:
gcc:
git:
Expand Down
2 changes: 1 addition & 1 deletion roles/openshift_adm/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion roles/openshift_adm/files/regenerate-certificate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion roles/openshift_obs/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/ovirt/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
12 changes: 6 additions & 6 deletions roles/reportportal/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion roles/shiftstack/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions roles/ssh_jumper/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
1 change: 1 addition & 0 deletions roles/switch_config/tasks/onyx_config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
- name: Collect switch facts
mellanox.onyx.onyx_facts:
gather_subset: version
register: onyx_facts
failed_when: false

Expand Down
Loading

0 comments on commit cfa1b27

Please sign in to comment.