From 8f41a2886d18e09a20a770b131c9973160f1fb2b Mon Sep 17 00:00:00 2001 From: ERIK Date: Thu, 24 Apr 2025 15:56:31 +0800 Subject: [PATCH] Update version comparison syntax and optimize whitespace (#12146) Signed-off-by: bo.jiang --- roles/bootstrap-os/tasks/flatcar.yml | 2 +- roles/container-engine/cri-o/tasks/main.yaml | 2 +- roles/container-engine/docker/tasks/main.yml | 2 +- roles/etcd/vars/main.yml | 4 ++-- .../huaweicloud/defaults/main.yml | 12 ++++++------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/roles/bootstrap-os/tasks/flatcar.yml b/roles/bootstrap-os/tasks/flatcar.yml index f330e0b62..d73e0fc0e 100644 --- a/roles/bootstrap-os/tasks/flatcar.yml +++ b/roles/bootstrap-os/tasks/flatcar.yml @@ -23,7 +23,7 @@ - name: Make interpreter discovery works on Flatcar set_fact: - ansible_interpreter_python_fallback: "{{ (ansible_interpreter_python_fallback | default([])) + [ '/opt/bin/python' ] }}" + ansible_interpreter_python_fallback: "{{ (ansible_interpreter_python_fallback | default([])) + ['/opt/bin/python'] }}" - name: Disable auto-upgrade systemd_service: diff --git a/roles/container-engine/cri-o/tasks/main.yaml b/roles/container-engine/cri-o/tasks/main.yaml index 0e66934cc..5027cdb90 100644 --- a/roles/container-engine/cri-o/tasks/main.yaml +++ b/roles/container-engine/cri-o/tasks/main.yaml @@ -180,7 +180,7 @@ dest: /etc/containers/storage.conf section: storage.options.overlay option: mountopt - value: '{{ ''"nodev"'' if ansible_kernel is version_compare(("4.18" if ansible_os_family == "RedHat" else "4.19"), "<") else ''"nodev,metacopy=on"'' }}' + value: '{{ ''"nodev"'' if ansible_kernel is version(("4.18" if ansible_os_family == "RedHat" else "4.19"), "<") else ''"nodev,metacopy=on"'' }}' mode: "0644" - name: Cri-o | create directory registries configs diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml index e56fe4ca9..46f3bce88 100644 --- a/roles/container-engine/docker/tasks/main.yml +++ b/roles/container-engine/docker/tasks/main.yml @@ -50,7 +50,7 @@ apt_key: id: "{{ item }}" url: "{{ docker_repo_key_info.url }}" - keyring: "{{ docker_repo_key_keyring|default(omit) }}" + keyring: "{{ docker_repo_key_keyring | default(omit) }}" state: present register: keyserver_task_result until: keyserver_task_result is succeeded diff --git a/roles/etcd/vars/main.yml b/roles/etcd/vars/main.yml index 1e5690420..9007e10b2 100644 --- a/roles/etcd/vars/main.yml +++ b/roles/etcd/vars/main.yml @@ -6,5 +6,5 @@ cert_files: - "{{ etcd_cert_dir }}/admin-{{ inventory_hostname }}.pem" - "{{ etcd_cert_dir }}/admin-{{ inventory_hostname }}-key.pem" node: - - "{{ etcd_cert_dir}}/node-{{ inventory_hostname }}.pem" - - "{{ etcd_cert_dir}}/node-{{ inventory_hostname }}-key.pem" + - "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem" + - "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem" diff --git a/roles/kubernetes-apps/external_cloud_controller/huaweicloud/defaults/main.yml b/roles/kubernetes-apps/external_cloud_controller/huaweicloud/defaults/main.yml index 9cd42ed68..ac052d51b 100644 --- a/roles/kubernetes-apps/external_cloud_controller/huaweicloud/defaults/main.yml +++ b/roles/kubernetes-apps/external_cloud_controller/huaweicloud/defaults/main.yml @@ -2,12 +2,12 @@ # The external cloud controller will need credentials to access # openstack apis. Per default these values will be # read from the environment. -external_huaweicloud_auth_url: "{{ lookup('env','OS_AUTH_URL') }}" -external_huaweicloud_access_key: "{{ lookup('env','OS_ACCESS_KEY') }}" -external_huaweicloud_secret_key: "{{ lookup('env','OS_SECRET_KEY') }}" -external_huaweicloud_region: "{{ lookup('env','OS_REGION_NAME') }}" -external_huaweicloud_project_id: "{{ lookup('env','OS_TENANT_ID')| default(lookup('env','OS_PROJECT_ID'),true) }}" -external_huaweicloud_cloud: "{{ lookup('env','OS_CLOUD') }}" +external_huaweicloud_auth_url: "{{ lookup('env', 'OS_AUTH_URL') }}" +external_huaweicloud_access_key: "{{ lookup('env', 'OS_ACCESS_KEY') }}" +external_huaweicloud_secret_key: "{{ lookup('env', 'OS_SECRET_KEY') }}" +external_huaweicloud_region: "{{ lookup('env', 'OS_REGION_NAME') }}" +external_huaweicloud_project_id: "{{ lookup('env', 'OS_TENANT_ID') | default(lookup('env', 'OS_PROJECT_ID'), true) }}" +external_huaweicloud_cloud: "{{ lookup('env', 'OS_CLOUD') }}" ## A dictionary of extra arguments to add to the huawei cloud controller manager deployment ## Format: