add format consistency to tasks yamls files

Author: ayefimov-1

roles/telemetry_chargeback/tasks/gen_synth_loki_data.yml

@@ -1,29 +1,29 @@
 ---
-- name: "Set variables dynamically {{ item }}"
+- name: Set variables dynamically "{{ item }}"
   ansible.builtin.set_fact:
     cloudkitty_data_file: "{{ artifacts_dir_zuul }}/{{ item }}{{ cloudkitty_synth_data_suffix }}"
     cloudkitty_synth_totals_file: "{{ artifacts_dir_zuul }}/{{ item }}{{ cloudkitty_synth_totals_metrics_suffix }}"
     cloudkitty_test_file: "{{ cloudkitty_scenario_dir }}/{{ item }}.yml"
 
-- name: "Check for preexisting output file"
+- name: Check for preexisting output file
   ansible.builtin.stat:
     path: "{{ cloudkitty_data_file }}"
   register: file_preexists
 
-- name: "Generate Synthetic Data {{ item }}"
+- name: Generate Synthetic Data "{{ item }}"
   ansible.builtin.command:
     cmd: >
       python3 "{{ cloudkitty_synth_script }}"
       -r
       --tmpl "{{ cloudkitty_data_template }}"
       -t "{{ cloudkitty_test_file }}"
       -o "{{ cloudkitty_data_file }}"
-      {% if cloudkitty_project_id | default('') %} -p "{{ cloudkitty_project_id }}"{% endif %}
+      {% if cloudkitty_project_id is defined and cloudkitty_project_id %} -p "{{ cloudkitty_project_id }}"{% endif %}
   register: script_output
   when: not file_preexists.stat.exists | bool
   changed_when: script_output.rc == 0
 
-- name: "Generate chargeback rating from synthetic data file {{ item }}"
+- name: Generate chargeback rating from synthetic data file "{{ item }}"
   ansible.builtin.command:
     cmd: >
       python3 "{{ cloudkitty_summary_script }}"
@@ -34,7 +34,7 @@
   when: not file_preexists.stat.exists | bool
   changed_when: synth_rating_info.rc == 0
 
-- name: "Load metrics from YAML file"
+- name: Load metrics from YAML file
   ansible.builtin.include_vars:
     file: "{{ cloudkitty_synth_totals_file }}"
     name: synth_data_rates

roles/telemetry_chargeback/tasks/load_loki_data.yml

@@ -1,12 +1,12 @@
 ---
-- name: "Ingests Cloudkitty Data log: {{ item }}"
+- name: Ingests Cloudkitty Data log "{{ item }}"
   ansible.builtin.include_tasks:
     file: ingest_loki_data.yml
 
-- name: "Flush Data to loki Storage: {{ item }}"
+- name: Flush Data to loki Storage " {{ item }}"
   ansible.builtin.include_tasks:
     file: flush_loki_data.yml
 
-- name: "Retrieve Data log from loki: {{ item }}"
+- name: Retrieve Data log from loki "{{ item }}"
   ansible.builtin.include_tasks:
     file: retrieve_loki_data.yml

roles/telemetry_chargeback/tasks/main.yml

@@ -15,25 +15,25 @@
     cloudkitty_debug_dir: ""
   when: not cloudkitty_debug | bool  
 
-- name: Get admin project ID for CI
+- name: "Get admin project ID for CI"
   ansible.builtin.command:
     cmd: "{{ openstack_cmd }} project show admin -f value -c id"
   register: get_admin_project_id
   changed_when: false
   failed_when: false
 
-- name: Set admin project ID for CI
+- name: "Set admin project ID for CI"
   ansible.builtin.set_fact:
     cloudkitty_project_id: "{{ (get_admin_project_id.stdout | trim) | default('') }}"
 
-- name: Get admin user ID for CI
+- name: "Get admin user ID for CI"
   ansible.builtin.command:
     cmd: "{{ openstack_cmd }} user show admin -f value -c id"
   register: get_admin_user_id
   changed_when: false
   failed_when: false
 
-- name: Set admin user ID for CI
+- name: "Set admin user ID for CI"
   ansible.builtin.set_fact:
     cloudkitty_user_id: "{{ (get_admin_user_id.stdout | trim) | default('') }}"
 

roles/telemetry_chargeback/tasks/retrieve_loki_data.yml

@@ -6,7 +6,7 @@
 # Query Loki
 - name: "Retrieve Logs from Loki via API {{ item }}"
   block:
-    - name: Query Loki API
+    - name: "Query Loki API"
       ansible.builtin.uri:
         url: "{{ loki_query_url }}?query={{ logql_query | urlencode }}&start={{ synth_data_rates.time.begin_step.nanosec }}&limit={{ limit }}"
         method: GET
@@ -26,7 +26,7 @@
       retries: 25
       delay: 60
 
-    - name: Save Loki Data to JSON file
+    - name: "Save Loki Data to JSON file"
       ansible.builtin.copy:
         content: "{{ loki_response.json | to_json }}"
         dest: "{{ artifacts_dir_zuul }}/{{ item }}{{ cloudkitty_loki_data_suffix }}"
@@ -48,15 +48,15 @@
         success_msg: "Query returned all data entries. Input file had {{ synth_data_rates.data_log.log_count }} entries and Loki returned {{ actual_count }}"
 
   rescue:
-    - name: Debug failure
+    - name: "Debug failure"
       ansible.builtin.debug:
         msg:
           - "Status: {{ loki_response.status | default('Unknown') }}"
           - "Body: {{ loki_response.content | default('No Content') }}"
           - "Msg: {{ loki_response.msg | default('Request failed') }}"
 
     # Failure
-    - name: Report Retrieval Failure
+    - name: "Report Retrieval Failure"
       ansible.builtin.fail:
         msg: "Retrieval Failed"
 

roles/telemetry_chargeback/tasks/setup_loki_env.yml

@@ -2,26 +2,26 @@
 # Setup Loki Environment
 
 # Dynamic URL's
-- name: Get Loki Public Route Host
+- name: "Get Loki Public Route Host"
   ansible.builtin.command:
     cmd: oc get route cloudkitty-lokistack -n {{ cloudkitty_namespace }} -o jsonpath='{.spec.host}'
   register: loki_route
   changed_when: false
 
-- name: Set Loki URLs
+- name: "Set Loki URLs"
   ansible.builtin.set_fact:
     # Base URL
     loki_base_url: "https://{{ loki_route.stdout }}"
 
     # Internal Flush URL (Service DNS: https://<service>.<namespace>.svc:3100/flush)
     ingester_flush_url: "https://cloudkitty-lokistack-ingester-http.{{ cloudkitty_namespace }}.svc:3100/flush"
 
-- name: Set Derived Loki URLs
+- name: "Set Derived Loki URLs"
   ansible.builtin.set_fact:
     loki_push_url: "{{ loki_base_url }}/api/logs/v1/cloudkitty/loki/api/v1/push"
     loki_query_url: "{{ loki_base_url }}/api/logs/v1/cloudkitty/loki/api/v1/query_range"
 
-- name: Debug URLs
+- name: "Debug URLs"
   ansible.builtin.debug:
     msg:
       - "Loki Route: {{ loki_base_url }}"
@@ -30,13 +30,13 @@
       - "Query URL:  {{ loki_query_url }}"
 
 # Certs to Ingest & Retrieve data to/from Loki
-- name: Ensure Local Certificate Directory Exists
+- name: "Ensure Local Certificate Directory Exists"
   ansible.builtin.file:
     path: "{{ cert_dir }}"
     state: directory
     mode: '0755'
 
-- name: Extract Certificates from Openshift Secret
+- name: "Extract Certificates from Openshift Secret"
   ansible.builtin.command:
     cmd: >
       oc extract secret/{{ cert_secret_name }}
@@ -52,7 +52,7 @@
 #    state: directory
 #    mode: '0755'
 
-- name: Extract Client Certificates
+- name: "Extract Client Certificates"
   ansible.builtin.command:
     cmd: >
       oc extract {{ client_secret }}
@@ -61,10 +61,11 @@
       -n {{ cloudkitty_namespace }}
   changed_when: true
 
-- name: Extract CA Bundle
+- name: "Extract CA Bundle"
   ansible.builtin.command:
-    cmd: "oc extract {{ ca_configmap }}
-    --to={{ local_cert_dir }}
-    --confirm
-    -n {{ cloudkitty_namespace }}"
+    cmd: >
+      oc extract {{ ca_configmap }}
+      --to={{ local_cert_dir }}
+      --confirm
+      -n {{ cloudkitty_namespace }}"
   changed_when: true