Merge pull request dell#979 from abhishek-sa1/control_plane_tag

Issue dell#975: Added Operating System to the IP description of the node_inventory
Bhagyashree-shetty · Mar 25, 2022 · 735894b · 735894b
2 parents 1056ece + 5510a85
commit 735894b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/control_plane/roles/collect_node_info/files/add_host.yml b/control_plane/roles/collect_node_info/files/add_host.yml
@@ -19,7 +19,7 @@
 
 - name: Fetch description
   set_fact:
-    host_description: "Service Tag: {{ service_tag }}"
+    host_description: "Service Tag: {{ service_tag }}, Operating System: {{ ansible_distribution }}"
   failed_when: false
   when: hostname_check.stdout is defined
 
@@ -63,4 +63,4 @@
   when:
     - host_description != "Description Unavailable"
     - add_host_awx is defined
-    - add_host_awx is not failed
+    - add_host_awx is not failed
diff --git a/control_plane/roles/webui_awx/tasks/awx_configuration.yml b/control_plane/roles/webui_awx/tasks/awx_configuration.yml
@@ -1,4 +1,4 @@
-# Copyright 2021 Dell Inc. or its subsidiaries. All Rights Reserved.
+# Copyright 2022 Dell Inc. or its subsidiaries. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
+
 - name: Check if {{ tower_config_file }} file is encrypted
   command: cat {{ tower_config_file }}
   changed_when: false
@@ -143,6 +144,7 @@
     project: "{{ project_name }}"
     playbook: "{{ item.playbook }}"
     ask_skip_tags_on_launch: true
+    extra_vars: "{{ item.extra_vars }}"
     credentials:
       - "{{ item.credential }}"
     state: present

diff --git a/control_plane/roles/webui_awx/vars/main.yml b/control_plane/roles/webui_awx/vars/main.yml
@@ -99,7 +99,7 @@ job_template_details:
   - { name: infiniband_template, inventory: infiniband_inventory, playbook: control_plane/infiniband.yml, credential: infiniband_credential, flag: "{{ ib_switch_support }}" }
   - { name: powervault_me4_template, inventory: powervault_me4_inventory, playbook: control_plane/powervault_me4.yml, credential: powervault_me4_credential, flag: "{{ powervault_support }}" }
 omnia_job_template_details:
-  - { name: deploy_omnia_template, inventory: node_inventory, playbook: omnia.yml, credential: node_credential }
+  - { name: deploy_omnia_template, inventory: node_inventory, playbook: omnia.yml, credential: node_credential, extra_vars: "ansible_python_interpreter=/usr/bin/python3" }
 scheduled_templates:
   - { name: NodeInventorySchedule, template: node_inventory_job, schedule_rule: "DTSTART:20210815T120000Z RRULE:FREQ=HOURLY;INTERVAL=1", flag: true }
-  - { name: DeviceInventorySchedule, template: device_inventory_job, schedule_rule: "DTSTART:20210815T060000Z RRULE:FREQ=DAILY;INTERVAL=1", flag: "{{ device_support_status }}"}
+  - { name: DeviceInventorySchedule, template: device_inventory_job, schedule_rule: "DTSTART:20210815T060000Z RRULE:FREQ=DAILY;INTERVAL=1", flag: "{{ device_support_status }}"}
diff --git a/telemetry/roles/idrac_telemetry/tasks/initiate_telemetry.yml b/telemetry/roles/idrac_telemetry/tasks/initiate_telemetry.yml
@@ -19,6 +19,10 @@
   include_vars: "{{ playbook_dir }}/input_params/telemetry_base_vars.yml"
   no_log: true
 
+- name: Include control_plane base_vars.yml file
+  include_vars: "{{ playbook_dir }}/../control_plane/input_params/base_vars.yml"
+  no_log: true
+
 - name: Initiate telemetry process if idrac_support is enabled
   block:
   - name: Include telemetry common vars