Browse Source

Merge pull request #904 from sakshiarora13/devel

Issue#903: Fix to take DBname for mySQL DB in telemetry/input_params/base_vars
Sujit Jadhav 3 years ago
parent
commit
3765d43584

+ 1 - 1
telemetry/roles/idrac_telemetry/tasks/filter_idrac.yml

@@ -60,7 +60,7 @@
         label: "{{ idrac_firmware_info.firmware_info.Firmware[index].FQDD }}"
       when:
           - '"iDRAC" in idrac_firmware_info.firmware_info.Firmware[index].FQDD'
-          - (idrac_firmware_info.firmware_info.Firmware[index].MajorVersion | int) > 4
+          - (idrac_firmware_info.firmware_info.Firmware[index].MajorVersion | int) > min_firmware_version_reqd
     when: datacenter_license is true
 
   rescue:

+ 1 - 1
telemetry/roles/idrac_telemetry/tasks/initiate_telemetry.yml

@@ -44,7 +44,7 @@
       idrac_login_vault_filename: "{{ playbook_dir }}/../control_plane/input_params/.login_vault_key"
       login_vars_file: "{{ playbook_dir }}/input_params/login_vars.yml"
       vault_filename: "{{ playbook_dir }}/input_params/.login_vault_key"
-      min_firmware_version_reqd: 4
+      min_firmware_version_reqd: 3
       datacenter_license: false
       firmware_version: false
       file_perm: '0644'

+ 0 - 1
telemetry/roles/idrac_telemetry/vars/main.yml

@@ -16,7 +16,6 @@
 # Usage: mysqldb_deployment.yml
 mysql_pv_name: mysqldb-storage
 mysqldb_storage: 1Gi
-mysqldb_name: idrac_telemetrysource_services_db
 mysqldb_pvc_name: mysqldb-storage-claim
 mysqldb_k8s_name: mysqldb
 statefulset_replicas: 1