Fix linting issues

electrocucaracha · Oct 4, 2023 · 61b32ab · 61b32ab
1 parent 6105a1b
commit 61b32ab
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 29 deletions.
diff --git a/playbooks/roles/criproxy/defaults/main.yml b/playbooks/roles/criproxy/defaults/main.yml
@@ -11,4 +11,4 @@
 criproxy_dest: "/tmp/criproxy"
 criproxy_version: 0.14.0
 criproxy_url: "https://github.com/Mirantis/criproxy/releases/download/v{{ criproxy_version }}/criproxy"
-cri_socket_path: "/var/run/dockershim.sock"
+criproxy_cri_socket_path: "/var/run/dockershim.sock"
diff --git a/playbooks/roles/criproxy/tasks/main.yml b/playbooks/roles/criproxy/tasks/main.yml
@@ -76,7 +76,7 @@
         - Restart criproxy service
     - name: Wait for dockershim socket to be created
       ansible.builtin.wait_for:
-        path: "{{ cri_socket_path }}"
+        path: "{{ criproxy_cri_socket_path }}"
         delay: 5
         timeout: 600
 

diff --git a/playbooks/roles/criproxy/templates/criproxy.service.j2 b/playbooks/roles/criproxy/templates/criproxy.service.j2
@@ -2,7 +2,7 @@
 Description=CRI Proxy
 
 [Service]
-ExecStart={{ criproxy_dest }}/criproxy -v 3 -logtostderr -connect {{ cri_socket_path }},virtlet.cloud:/run/virtlet.sock -listen /run/criproxy.sock
+ExecStart={{ criproxy_dest }}/criproxy -v 3 -logtostderr -connect {{ criproxy_cri_socket_path }},virtlet.cloud:/run/virtlet.sock -listen /run/criproxy.sock
 Restart=always
 StartLimitInterval=0
 RestartSec=10

diff --git a/playbooks/roles/pmem/defaults/main.yml b/playbooks/roles/pmem/defaults/main.yml
@@ -10,7 +10,7 @@
 
 pmem_template_folder: "/tmp/pmem_k8s"
 pmem_version: v1.1.0
-driver_registrar_version: v2.8.0
-csi_provisioner_version: v3.5.0
-cfssl_version: 1.6.4
+pmem_driver_registrar_version: v2.8.0
+pmem_csi_provisioner_version: v3.5.0
+pmem_cfssl_version: 1.6.4
 pmem_namespace: pmem-csi
diff --git a/playbooks/roles/pmem/tasks/bootstrap.yml b/playbooks/roles/pmem/tasks/bootstrap.yml
@@ -19,7 +19,7 @@
 
 - name: Retrieve binary
   ansible.builtin.get_url:
-    url: https://github.com/cloudflare/cfssl/releases/download/v{{ cfssl_version }}/{{ pmem_cfssl_binary }}_{{ cfssl_version }}_linux_amd64
+    url: https://github.com/cloudflare/cfssl/releases/download/v{{ pmem_cfssl_version }}/{{ pmem_cfssl_binary }}_{{ pmem_cfssl_version }}_linux_amd64
     dest: /usr/local/bin/{{ pmem_cfssl_binary }}
     mode: '0755'
   become: true

diff --git a/playbooks/roles/pmem/templates/pmem-csi-lvm.yaml.j2 b/playbooks/roles/pmem/templates/pmem-csi-lvm.yaml.j2
@@ -511,7 +511,7 @@ spec:
         env:
         - name: PMEM_CSI_DRIVER_NAME
           value: pmem-csi.intel.com
-        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:{{ driver_registrar_version }}
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:{{ pmem_driver_registrar_version }}
         imagePullPolicy: IfNotPresent
         name: driver-registrar
         resources:
@@ -551,7 +551,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: registry.k8s.io/sig-storage/csi-provisioner:{{ csi_provisioner_version }}
+        image: registry.k8s.io/sig-storage/csi-provisioner:{{ pmem_csi_provisioner_version }}
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 6

diff --git a/playbooks/roles/qat_driver/defaults/main.yml b/playbooks/roles/qat_driver/defaults/main.yml
@@ -10,13 +10,12 @@
 
 qat_driver_version: 4.22.0
 qat_driver_revision: "00001"
-qat_version: "QAT.L.{{ qat_driver_version }}-{{ qat_driver_revision }}"
 qat_driver_dest: "/tmp/qat_driver"
-qat_driver_url: "https://downloadmirror.intel.com/780675/{{ qat_version }}.tar.gz"
-qat_plugin_mode: dpdk
+qat_driver_url: "https://downloadmirror.intel.com/780675/QAT.L.{{ qat_driver_version }}-{{ qat_driver_revision }}.tar.gz"
+qat_driver_plugin_mode: dpdk
 
 # User process configuration
-shim:
+qat_driver_shim:
   num_crypto_instances: 1
   num_decompression_instances: 0
   # Indicates the maximum number of processes that can call icp_sal_userStart on

diff --git a/playbooks/roles/qat_driver/tasks/main.yml b/playbooks/roles/qat_driver/tasks/main.yml
@@ -44,7 +44,7 @@
     - Start qat_service service
 
 - name: Configure number of processes per qat device
-  when: qat_plugin_mode == "kernel"
+  when: qat_driver_plugin_mode == "kernel"
   block:
     - name: Get qat devices
       ansible.builtin.shell: >
@@ -60,10 +60,10 @@
         dest: "/etc/{{ item }}.conf"
         block: |
           [SHIM]
-          NumberCyInstances = {{ shim.num_crypto_instances }}
-          NumberDcInstances = {{ shim.num_decompression_instances }}
-          NumProcesses = {{ shim.num_processes }}
-          LimitDevAccess = {{ shim.limit_dev_access }}
+          NumberCyInstances = {{ qat_driver_shim.num_crypto_instances }}
+          NumberDcInstances = {{ qat_driver_shim.num_decompression_instances }}
+          NumProcesses = {{ qat_driver_shim.num_processes }}
+          LimitDevAccess = {{ qat_driver_shim.limit_dev_access }}
           # Crypto - User instance #0
           Cy0Name = "UserCY0"
           Cy0IsPolled = 1

diff --git a/playbooks/roles/qat_plugin/defaults/main.yml b/playbooks/roles/qat_plugin/defaults/main.yml
@@ -8,6 +8,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-qat_template_folder: /tmp/qat_k8s
+qat_plugin_tmpl_dir: /tmp/qat_k8s
 qat_plugin_version: "0.17.0"
 qat_plugin_mode: dpdk
diff --git a/playbooks/roles/qat_plugin/tasks/main.yml b/playbooks/roles/qat_plugin/tasks/main.yml
@@ -15,29 +15,29 @@
   ansible.builtin.file:
     mode: '0755'
     state: directory
-    path: "{{ qat_template_folder }}"
+    path: "{{ qat_plugin_tmpl_dir }}"
 
 - name: Generate QAT DPDK k8s resources based on templates
   ansible.builtin.template:
     mode: preserve
     src: plugin.yaml.j2
-    dest: "{{ qat_template_folder }}/plugin.yml"
+    dest: "{{ qat_plugin_tmpl_dir }}/plugin.yml"
   when: qat_plugin_mode == "dpdk"
 
 - name: Generate QAT kernel k8s resources based on templates
   ansible.builtin.template:
     mode: preserve
     src: plugin_kernel_mode.yaml.j2
-    dest: "{{ qat_template_folder }}/plugin.yml"
+    dest: "{{ qat_plugin_tmpl_dir }}/plugin.yml"
   when: qat_plugin_mode == "kernel"
 
 - name: Get QAT configmap files
   ansible.builtin.copy:
     mode: preserve
     src: configmap.yaml
-    dest: "{{ qat_template_folder }}/configmap.yaml"
+    dest: "{{ qat_plugin_tmpl_dir }}/configmap.yaml"
 
 - name: Create QAT k8s resources
   kubernetes.core.k8s:
     state: present
-    src: "{{ qat_template_folder }}"
+    src: "{{ qat_plugin_tmpl_dir }}"
diff --git a/playbooks/roles/sriov_cni/defaults/main.yml b/playbooks/roles/sriov_cni/defaults/main.yml
@@ -9,7 +9,7 @@
 ##############################################################################
 
 sriov_cni_version: v2.6
-network_attachment_definitions:
+sriov_cni_network_attachment_definitions:
   - name: sriov-net
     resourceName: intel.com/intel_sriov_netdevice
     config:

diff --git a/playbooks/roles/sriov_cni/templates/sriov-network.yaml.j2 b/playbooks/roles/sriov_cni/templates/sriov-network.yaml.j2
@@ -1,4 +1,4 @@
-{% for net_attach_def in network_attachment_definitions %}
+{% for net_attach_def in sriov_cni_network_attachment_definitions %}
 ---
 apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition

diff --git a/playbooks/roles/sriov_plugin/defaults/main.yml b/playbooks/roles/sriov_plugin/defaults/main.yml
@@ -8,9 +8,8 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-sriov_template_folder: /tmp/sriov_k8s
 sriov_plugin_version: v3.3.2
-sriovdp_config:
+sriov_plugin_sriovdp_config:
   resourceList:
     - resourceName: virtio_net_device
       resourcePrefix: redhat.com

diff --git a/playbooks/roles/sriov_plugin/templates/configMap.yaml.j2 b/playbooks/roles/sriov_plugin/templates/configMap.yaml.j2
@@ -5,4 +5,4 @@ metadata:
   namespace: kube-system
 data:
   config.json: |
-{{ sriovdp_config | to_json | safe | indent(4, True) }}
+{{ sriov_plugin_sriovdp_config | to_json | safe | indent(4, True) }}