Merge branch 'devel' into devel

control_plane/input_params/base_vars.yml

@@ -19,20 +19,43 @@
 # If ansible is installed using pip, this path should be set
 ansible_conf_file_path: /etc/ansible
 
+# This variable is used to support the management network container.
+# This container configures IP for all the different devices like idrac, switches and powervaults.
+# Accepted value: "true" or "false"
+# Default value: "true"
+device_config_support: false
+
+# This variable is used to enable idrac support
+# Enable this support
+# Accepted values:  "true" or "false".
+# Default value: "false".
+# If idrac support is needed set this to "true"
+idrac_support: false
+
+# List of all the configured IPs for different types of supported devices.
+# Accepted values: " File path for the list of IPs of different devices."
+# Give this value if minimum idrac_support is true.
+# Format: Set of IPs in new line
+# e.g:
+# 172.19.0.1
+# 172.19.0.5
+# A template for this file exists in omnia/examples and is named as device_ip_list.yml
+device_ip_list_path: ""
+
 # This variable is used to enable ethernet switch configuration
-# Accepted values:  "true" or "false". 
-# Default value: "true".
+# Accepted values:  "true" or "false".
+# Default value: "false".
 # If ethernet switch support is needed set this to "true"
-ethernet_switch_support: true
+ethernet_switch_support: false
 
 # This variable is used to enable infiniband switch configuration
-# Accepted values:  "true" or "false". 
-# Default value: "true".
+# Accepted values:  "true" or "false".
+# Default value: "false".
 # If infiniband configuration is needed set this to "true"
-ib_switch_support: true
+ib_switch_support: false
 
 # This variable is used to enable powervault configuration
-# Accepted values:  "true" or "false". 
+# Accepted values:  "true" or "false".
 # Default value: "false".
 # If powervault configuration is needed, set this to "true"
 powervault_support: false
@@ -71,16 +94,16 @@ awx_organization: "DellEMC"
 
 ### Usage: webui_grafana ###
 # At this location grafana persistent volume will be created.
-mount_location: /mnt/omnia/
+mount_location: /opt/omnia/
 
 ### Usage: provision_cobbler, provision_idrac ###
 
 # This variable is used to set node provisioning method
 # Accepted values: idrac, PXE
-# Default value: "idrac"
+# Default value: "PXE"
 # If provisioning needs to be done through cobbler, set it to "PXE"
 # If idrac license is not present, provisioning mode will be set to "PXE"
-provision_method: "idrac"
+provision_method: "PXE"
 
 # This variable is used to set provisioning type
 # Accepted values: stateful
@@ -121,7 +144,7 @@ default_lease_time: "86400"
 
 ### Usage: control_plane_device ###
 
-# The nic/ethernet card that needs to be connected to provision 
+# The nic/ethernet card that needs to be connected to provision
 # the fabric, idrac and powervault.
 # This nic will be configured by Omnia for the DHCP server.
 # Default value: "eno1"

control_plane/input_params/login_vars.yml

@@ -33,12 +33,12 @@ cobbler_password: ""
 
 # The username for idrac
 # The username must not contain -,\, ',"
-# Required field
+# Required only if idrac_support: true
 idrac_username: ""
 
 # Password used for idrac
 # The password must not contain -,\, ',"
-# Required field
+# Required only if idrac_support: true
 idrac_password: ""
 
 ### Usage: webui_awx ###

control_plane/roles/control_plane_common/tasks/device_config_validations.yml

@@ -0,0 +1,96 @@
+# 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.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+---
+
+- name: Initialize variables
+  set_fact:
+    mngmnt_network_container_status: false
+
+- name: Check mngmnt_network_container status on the machine
+  command: kubectl get pods -n network-config
+  register: mngmnt_network_container_result
+  failed_when: false
+  changed_when: false
+
+- name: Validate if mngmnt_network is present if device_config is false
+  set_fact:
+    mngmnt_network_container_status: true
+  when: "'mngmnt-network-container' in mngmnt_network_container_result.stdout"
+
+- name: Validate if mngmnt_network is present if device_config is false
+  assert:
+    that: device_config_support != false
+    success_msg: "{{ mgmnt_device_fail }}"
+    fail_msg: "{{ mgmnt_device_fail }}"
+  when: mngmnt_network_container_status
+
+- name: Assert value of idrac_support if mngmnt_network container needed
+  assert:
+    that: idrac_support == true
+    success_msg: "{{ idrac_support_valid }}"
+    fail_msg: " {{ failed_idrac_support }}"
+  when: device_config_support
+
+- block:
+    - name: Assert ethernet_switch_support
+      assert:
+        that: ethernet_switch_support == true or ethernet_switch_support == false
+        success_msg: "{{ ethernet_switch_support_success_msg }}"
+        fail_msg: "{{ ethernet_switch_support_fail_msg }}"
+
+    - name: Assert ib_switch_support
+      assert:
+        that:  ib_switch_support == true or ib_switch_support == false
+        success_msg: "{{ ib_switch_support_success_msg }}"
+        fail_msg: "{{ ib_switch_support_fail_msg }}"
+
+    - name: Assert powervault_support
+      assert:
+        that: powervault_support == true or powervault_support == false
+        success_msg: "{{ powervault_support_success_msg }}"
+        fail_msg: "{{ powervault_support_fail_msg }}"
+
+  when: device_support_status
+
+- block:
+  - name: Check value of ethernet_switch_support when not device_config_support
+    assert:
+      that: ethernet_switch_support == true
+      success_msg: "{{ ethernet_device_config }}"
+    failed_when: false
+
+  - name: Set ethernet_switch_support when not device_config_support
+    set_fact:
+      ethernet_switch_support: false
+
+  - name: Check value of ib_switch_support when not device_config_support
+    assert:
+      that: ib_switch_support == true
+      success_msg: "{{ ib_device_config }}"
+    failed_when: false
+
+  - name: Set ib_switch_support when not device_config_support
+    set_fact:
+      ib_switch_support: false
+
+  - name: Check value of powervault_support when not device_config_support
+    assert:
+      that: powervault_support == true
+      success_msg: "{{ pv_device_config }}"
+    failed_when: false
+
+  - name: Set powervault_support when not device_config_support
+    set_fact:
+      powervault_support: false
+  when: not device_support_status

control_plane/roles/control_plane_common/tasks/fetch_base_inputs.yml

@@ -31,9 +31,6 @@
       timezone | length < 1 or
       language | length < 1 or
       iso_file_path | length < 1 or
-      mngmnt_network_nic | length < 1 or
-      mngmnt_network_dhcp_start_range | length < 1 or
-      mngmnt_network_dhcp_end_range | length < 1 or
       host_network_nic | length < 1 or
       host_network_dhcp_start_range | length < 1 or
       host_network_dhcp_end_range | length < 1 or
@@ -43,6 +40,66 @@
       provision_state | length < 1 or
       mount_location | length < 1
 
+- name: Validate management network nic
+  assert:
+    that: mngmnt_network_nic | length < 1
+    fail_msg: "{{ input_base_failure_msg }}"
+  when: device_config_support
+  
+- name: Validate the value of device config support
+  assert:
+    that:
+      - device_config_support | lower == "true" or device_config_support | lower == "false"
+    success_msg: "{{ success_device_config }}"
+    fail_msg: "{{ fail_device_config }}"
+  tags: init
+
+- name: Set fact for device_ip_list_path
+  set_fact:
+    device_config_ip_file: false
+  tags: init
+
+- name: Set the mapping file value for device network
+  set_fact:
+    device_config_ip_file: true
+  when:
+    - device_ip_list_path | length > 0
+    - '"/" in device_ip_list_path'
+    - idrac_support
+  tags: init
+
+- name: Warning msg if idrac_support is false and device_ip_list is given
+  assert:
+    that:
+      - '"/"  in device_ip_list_path'
+    success_msg: "{{ device_ip_list_not_supported  }}"
+  when: not idrac_support
+  failed_when: false
+
+- name: Set status for device_config_support
+  set_fact:
+     device_support_status: false
+  tags: init
+
+- name: Validate contents of device_ip_list
+  set_fact:
+    device_support_status: true
+  when: (device_config_support) or (idrac_support and device_config_ip_file)
+  tags: init
+
+- name: Assert valid mngmnt_mapping_file_path
+  stat:
+    path: "{{ device_ip_list_path }}"
+  when: device_config_ip_file
+  register: result_device_ip_file
+  tags: init
+
+- name : Valid device_ip_list
+  fail:
+    msg: "{{ invalid_mapping_file_path }} for configurations"
+  when: device_config_ip_file and not result_device_ip_file.stat.exists
+  tags: init
+
 - name: Validate default lease time
   assert:
     that:
@@ -58,21 +115,9 @@
     max_lease_time: "{{ default_lease_time|int + 10000 }}"
   tags: init
 
-- name: Validate infiniband base_vars are not empty
-  assert:
-    that:
-      - ib_network_nic | length > 2
-      - ib_network_dhcp_start_range | length > 6
-      - ib_network_dhcp_end_range | length > 6
-    success_msg: "{{ success_msg_ib }}"
-    fail_msg: "{{ fail_msg_ib }}"
-  register: ib_check
-  when: ib_switch_support
-  tags: [ validate, network-ib ]
-
 - name: Set facts to validate snmp support
   set_fact:
-    snmp_enabled: false   
+    snmp_enabled: false
     mngmnt_mapping_file: false
     host_mapping_file: false
   tags: init
@@ -80,9 +125,11 @@
 - name: Verify snmp_trap_destination IP address
   set_fact:
     snmp_enabled: true
-  when: snmp_trap_destination | length > 1
+  when:
+    - device_support_status
+    - snmp_trap_destination | length > 1
   tags: init
-  
+
 - name: Assert snmp trap destination address
   assert:
     that:
@@ -129,29 +176,17 @@
   when: not ansible_conf_exists.stat.exists
   tags: init
 
-- name: Assert ethernet_switch_support
-  assert:
-    that:
-      - ethernet_switch_support == true or ethernet_switch_support == false
-    success_msg: "{{ ethernet_switch_support_success_msg }}"
-    fail_msg: "{{ ethernet_switch_support_fail_msg }}"
-  tags: [ validate, init ]
-
-- name: Assert ib_switch_support
-  assert:
-    that:
-      - ib_switch_support == true or ib_switch_support == false
-    success_msg: "{{ ib_switch_support_success_msg }}"
-    fail_msg: "{{ ib_switch_support_fail_msg }}"
-  tags: [ validate, init ]
-
-- name: Assert powervault_support
+- name: Validate infiniband base_vars are not empty
   assert:
     that:
-      - powervault_support == true or powervault_support == false
-    success_msg: "{{ powervault_support_success_msg }}"
-    fail_msg: "{{ powervault_support_fail_msg }}"
-  tags: [ validate, init ]
+        - ib_network_nic | length > 2
+        - ib_network_dhcp_start_range | length > 6
+        - ib_network_dhcp_end_range | length > 6
+    success_msg: "{{ success_msg_ib }}"
+    fail_msg: "{{ fail_msg_ib }}"
+    register: ib_check
+  when: ib_switch_support
+  tags: [ validate, network-ib ]
 
 - name: Assert enable_security_support
   assert:
@@ -160,7 +195,7 @@
     success_msg: "{{ enable_security_support_success_msg }}"
     fail_msg: "{{ enable_security_support_fail_msg }}"
   tags: [ validate, init ]
-  
+
 - name: Assert kubernetes pod network CIDR
   assert:
     that:
@@ -197,5 +232,14 @@
   import_tasks: validate_provision_vars.yml
   tags: [ validate, idrac, pxe ]
 
+- name: Validate device_config_support
+  import_tasks: device_config_validations.yml
+  tags: [ validate, init ]
+
+- name: Validate device_config_support
+  import_tasks: validate_device_ip_file.yml
+  when: device_config_ip_file
+  tags: [ validate, init ]
+
 - name: Validate NIC parameters
   import_tasks: validate_nic_vars.yml

control_plane/roles/control_plane_common/tasks/nfs_server_setup.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.
@@ -52,11 +52,27 @@
     path: "{{ exports_file_path }}"
     line: "{{ item.path }} {{ item.ip }}(rw,sync,no_root_squash)"
   with_items:
-    - { path: "{{ nfs_share_offline_repo }}", ip: "{{ mngmnt_network_ip }}" }
     - { path: "{{ nfs_share_offline_repo }}", ip: "{{ public_ip }}" }
-    - { path: "{{ nfs_share_awx }}", ip: "{{ mngmnt_network_ip }}" }
     - { path: "{{ nfs_share_awx }}", ip: "{{ public_ip }}" }
+
+- name: Adding NFS share entries in /etc/exports when device_config_support
+  lineinfile:
+    path: "{{ exports_file_path }}"
+    line: "{{ item.path }} {{ item.ip }}(rw,sync,no_root_squash)"
+  with_items:
+    - { path: "{{ nfs_share_offline_repo }}", ip: "{{ mngmnt_network_ip }}" }
+    - { path: "{{ nfs_share_awx }}", ip: "{{ mngmnt_network_ip }}" }
     - { path: "{{ nfs_share_offline_repo }}", ip: "{{ mngmnt_network_subnet }}/{{ mngmnt_network_netmask }}" }
+  when: device_config_support
+
+- name: Adding NFS share entries in /etc/exports when device_config_support
+  lineinfile:
+    path: "{{ exports_file_path }}"
+    line: "{{ nfs_share_offline_repo  }} {{ item }}(rw,sync,no_root_squash)"
+  with_items: "{{ device_ip }}"
+  when:
+    - idrac_support
+    - device_config_ip_file
 
 - name: Exporting the shared directories
   command: exportfs -r
@@ -78,4 +94,4 @@
   service:
     name: firewalld
     state: stopped
-    enabled: no
+    enabled: no

control_plane/roles/control_plane_common/tasks/validate_device_ip_file.yml

@@ -0,0 +1,40 @@
+#  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.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+---
+
+- name: Check IP
+  set_fact:
+    device_ip: "{{ lookup('file', '{{ device_ip_list_path }}').splitlines() |list }}"
+
+- name: Filter all the IP present
+  set_fact:
+    len1: "{{ device_ip | length }}"
+    device_ip_temp: "{{ device_ip | ipv4('address') | list }}"
+
+- name: size
+  set_fact:
+    len2: "{{ device_ip_temp | length }}"
+
+- name: Assert if valid device_ip_file
+  assert:
+    that:
+      - len1 == len2
+    fail_msg: "{{ fail_device_ip_format }}"
+    success_msg: "{{ success_device_ip_format }}"
+
+- name: Copy the Ips to file
+  copy:
+    src: "{{ device_ip_list_path }}"
+    dest: "{{ mgmnt_ip_path }}"
+    mode: "{{ file_perm }}"

control_plane/roles/control_plane_common/tasks/validate_device_mapping_file.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.
@@ -11,62 +11,63 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # limitations under the License.
 ---
+- block:
+  - name: Check that device mapping file exists at mentioned path
+    stat:
+      path: "{{ mngmnt_mapping_file_path }}"
+    register: stat_result
 
-- name: Check that device mapping file exists at mentioned path
-  stat:
-    path: "{{ mngmnt_mapping_file_path }}"
-  register: stat_result
+  - name: Fail if config file doesn't exist
+    fail:
+      msg: "{{ fail_msg_mapping_file + mngmnt_mapping_file_path }}"
+    when: not stat_result.stat.exists
 
-- name: Fail if config file doesn't exist
-  fail:
-    msg: "{{ fail_msg_mapping_file + mngmnt_mapping_file_path }}"
-  when: not stat_result.stat.exists
+  - name: Read device mapping file from CSV file and return a dictionary
+    read_csv:
+      path: "{{ mngmnt_mapping_file_path }}"
+      key: "{{ mapping_file_key }}"
+    register: device_mapping_file
+    delegate_to: localhost
 
-- name: Read device mapping file from CSV file and return a dictionary
-  read_csv:
-    path: "{{ mngmnt_mapping_file_path }}"
-    key: "{{ mapping_file_key }}"
-  register: device_mapping_file
-  delegate_to: localhost
+  - name: Check if header is present in mapping file
+    shell:  set -o pipefail && awk 'NR==1 { print $1}' "{{ mngmnt_mapping_file_path }}"
+    register: mngmnt_header
+    changed_when: false
 
-- name: Check if header is present in mapping file
-  shell:  set -o pipefail && awk 'NR==1 { print $1}' "{{ mngmnt_mapping_file_path }}"
-  register: mngmnt_header
-  changed_when: false
+  - name: Fail if header not in correct format
+    fail:
+      msg: "{{ fail_device_mapping_file_header }}"
+    when: mngmnt_header.stdout !=  device_mapping_header_format
 
-- name: Fail if header not in correct format
-  fail:
-    msg: "{{ fail_device_mapping_file_header }}"
-  when: mngmnt_header.stdout !=  device_mapping_header_format
+  - name: Check if mapping file is comma seperated
+    shell: awk -F\, '{print NF-1}' "{{ mngmnt_mapping_file_path }}"
+    register: mngmnt_comma_seperated
+    changed_when: false
 
-- name: Check if mapping file is comma seperated
-  shell: awk -F\, '{print NF-1}' "{{ mngmnt_mapping_file_path }}"
-  register: mngmnt_comma_seperated
-  changed_when: false
+  - name: Fail if not comma seperated or if all fields are not given
+    fail:
+      msg: "{{ fail_mapping_file_field_seperation }}"
+    when: not(item =="1")
+    with_items: "{{ mngmnt_comma_seperated.stdout_lines }}"
 
-- name: Fail if not comma seperated or if all fields are not given
-  fail:
-    msg: "{{ fail_mapping_file_field_seperation }}"
-  when: not(item =="1")
-  with_items: "{{ mngmnt_comma_seperated.stdout_lines }}"
+  - name: Initialize count variables
+    set_fact:
+      list_of_ips: []
+      count_total_items: "{{ device_mapping_file.dict |length }}"
 
-- name: Initialize count variables
-  set_fact:
-    list_of_ips: []
-    count_total_items: "{{ device_mapping_file.dict |length }}"
+  - name: Create list of IPs in mapping file
+    set_fact:
+      list_of_ips: "{{ [ item.value.IP ] + list_of_ips }}"
+    loop: "{{ device_mapping_file.dict | dict2items }}"
+    loop_control:
+      label: "{{ item.value.MAC }}"
 
-- name: Create list of IPs in mapping file
-  set_fact:
-    list_of_ips: "{{ [ item.value.IP ] + list_of_ips }}"
-  loop: "{{ device_mapping_file.dict | dict2items }}"
-  loop_control:
-    label: "{{ item.value.MAC }}"
+  - name: Find count of unique IPs
+    set_fact:
+      count_of_unique_ip : "{{ list_of_ips| unique| length }}"
 
-- name: Find count of unique IPs
-  set_fact:
-    count_of_unique_ip : "{{ list_of_ips| unique| length }}"
-
-- name: Validation to check if unique IPs are provided for each node
-  fail:
-    msg: "{{ fail_mapping_file_duplicate_ip + mngmnt_mapping_file_path }}"
-  when: not(count_of_unique_ip|int == count_total_items|int)
+  - name: Validation to check if unique IPs are provided for each node
+    fail:
+      msg: "{{ fail_mapping_file_duplicate_ip + mngmnt_mapping_file_path }}"
+    when: not(count_of_unique_ip|int == count_total_items|int)
+  when: device_config_support

control_plane/roles/control_plane_common/tasks/validate_idrac_vars.yml

@@ -12,34 +12,35 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
+- block:
+  - name: Include variable file idrac_vars.yml
+    include_vars: "{{ idrac_input_filename }}"
+    run_once: true
+    tags: init
 
-- name: Include variable file idrac_vars.yml
-  include_vars: "{{ idrac_input_filename }}"
-  run_once: true
-  tags: init
+  - name: Assert firmware_update_required value
+    assert:
+      that:
+        - firmware_update_required == true or firmware_update_required == false
+      success_msg: "{{ firmware_update_success_msg }}"
+      fail_msg: "{{ firmware_update_fail_msg }}"
+    tags: [ validate, firmware-repo ]
 
-- name: Assert firmware_update_required value
-  assert:
-    that:
-      - firmware_update_required == true or firmware_update_required == false
-    success_msg: "{{ firmware_update_success_msg }}"
-    fail_msg: "{{ firmware_update_fail_msg }}"
-  tags: [ validate, firmware-repo ]
+  - name: Read poweredge_model file
+    command: cat {{ role_path }}/files/poweredge_models.txt
+    failed_when: false
+    register: poweredge_models_file_output
+    changed_when: false
+    tags: [ validate, firmware-repo ]
 
-- name: Read poweredge_model file
-  command: cat {{ role_path }}/files/poweredge_models.txt
-  failed_when: false
-  register: poweredge_models_file_output
-  changed_when: false
-  tags: [ validate, firmware-repo ]
-
-- name: Assert poweredge_model value
-  assert:
-    that:
-      - item | length > 1
-      - item in poweredge_models_file_output.stdout
-    success_msg: "{{ poweredge_model_success_msg }}"
-    fail_msg: "{{ poweredge_model_fail_msg }}"
-  when: firmware_update_required
-  with_items: "{{ poweredge_model.split(',') | map('trim') }}"
-  tags: [ validate, firmware-repo ]
+  - name: Assert poweredge_model value
+    assert:
+      that:
+        - item | length > 1
+        - item in poweredge_models_file_output.stdout
+      success_msg: "{{ poweredge_model_success_msg }}"
+      fail_msg: "{{ poweredge_model_fail_msg }}"
+    when: firmware_update_required
+    with_items: "{{ poweredge_model.split(',') | map('trim') }}"
+    tags: [ validate, firmware-repo ]
+  when: idrac_support

control_plane/roles/control_plane_common/tasks/validate_nic_vars.yml

@@ -35,97 +35,97 @@
   tags: init
 
 ### management network
-
-- name: Assert management network nic
-  assert:
-    that:
-      - mngmnt_network_nic in nic_addr_up.stdout
-    success_msg: "{{ success_msg_mngmnt_network_nic }}"
-    fail_msg: "{{ fail_msg_mngmnt_network_nic }}"
-  tags: [ validate, network-device ]
-
-- name: Fetch the management network ip, netmask and subnet
-  set_fact:
-    mngmnt_network_ip: "{{ lookup('vars','ansible_'+mngmnt_network_nic).ipv4.address }}"
-    mngmnt_network_netmask: "{{ lookup('vars','ansible_'+mngmnt_network_nic).ipv4.netmask }}"
-    mngmnt_network_subnet: "{{ lookup('vars','ansible_'+mngmnt_network_nic).ipv4.network }}"
-  tags: init
-
-- name: Check the subnet of management network dhcp start range
-  shell: |
-    IFS=. read -r i1 i2 i3 i4 <<< "{{ mngmnt_network_dhcp_start_range }}"
-    IFS=. read -r m1 m2 m3 m4 <<< "{{ mngmnt_network_netmask }}"
-    printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$((i2 & m2))" "$((i3 & m3))" "$((i4 & m4))"
-  args:
-    warn: no
-  register: dhcp_start_mgmnt_result
-  changed_when: false
-  tags: init
-
-- name: Set the start dhcp subnet for management network
-  set_fact:
-    dhcp_start_mgmnt: "{{ dhcp_start_mgmnt_result.stdout }}"
-  tags: init
-
-- name: Check the subnet of dhcp end range for management network
-  shell: |
-    IFS=. read -r i1 i2 i3 i4 <<< "{{ mngmnt_network_dhcp_end_range }}"
-    IFS=. read -r m1 m2 m3 m4 <<< "{{ mngmnt_network_netmask }}"
-    printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$((i2 & m2))" "$((i3 & m3))" "$((i4 & m4))"
-  register: dhcp_end_mgmnt_result
-  changed_when: false
-  tags: init
-
-- name: Set the end dhcp subnet for management network
-  set_fact:
-    dhcp_end_mgmnt: "{{ dhcp_end_mgmnt_result.stdout }}"
-  tags: init
-
-- name: Assert management_net_dhcp_start_range
-  assert:
-    that:
-      - mngmnt_network_dhcp_start_range |  length > 1
-      - mngmnt_network_dhcp_start_range | ipv4
-      - mngmnt_network_dhcp_start_range != mngmnt_network_ip
-      - mngmnt_network_dhcp_start_range != mngmnt_network_dhcp_end_range
-      - dhcp_start_mgmnt == mngmnt_network_subnet
-      - dhcp_start_mgmnt == dhcp_end_mgmnt
-    success_msg: "{{ success_dhcp_range }} for management network"
-    fail_msg: "{{ fail_dhcp_range }} for management network"
-  tags: [ validate, network-device ]
-
-- name: Assert management_net_dhcp_end_range
-  assert:
-    that:
-      - mngmnt_network_dhcp_end_range |  length > 1
-      - mngmnt_network_dhcp_end_range | ipv4
-      - mngmnt_network_dhcp_end_range != mngmnt_network_ip
-      - mngmnt_network_dhcp_start_range != mngmnt_network_dhcp_end_range
-      - dhcp_end_mgmnt == mngmnt_network_subnet
-      - dhcp_start_mgmnt == dhcp_end_mgmnt
-    success_msg: "{{ success_dhcp_range }} for management network"
-    fail_msg: "{{ fail_dhcp_range }} for management network"
-  tags: [ validate, network-device ]
-
-- name: Set the mapping file value for management network
-  set_fact:
-    mngmnt_mapping_file: true
-  when: mngmnt_mapping_file_path | length > 0
-  tags: init
-
-- name: Assert valid mngmnt_mapping_file_path
-  stat:
-    path: "{{ mngmnt_mapping_file_path }}"
-  when: mngmnt_mapping_file
-  register: result_mngmnt_mapping_file
-  tags: init
-
-- name : Valid mngmnt_mapping_file_path
-  fail:
-    msg: "{{ invalid_mapping_file_path }} for management network"
-  when: mngmnt_mapping_file and not result_mngmnt_mapping_file.stat.exists
-  tags: init
-
+- block:
+  - name: Assert management network nic
+    assert:
+      that:
+        - mngmnt_network_nic in nic_addr_up.stdout
+      success_msg: "{{ success_msg_mngmnt_network_nic }}"
+      fail_msg: "{{ fail_msg_mngmnt_network_nic }}"
+    tags: [ validate, network-device ]
+
+  - name: Fetch the management network ip, netmask and subnet
+    set_fact:
+      mngmnt_network_ip: "{{ lookup('vars','ansible_'+mngmnt_network_nic).ipv4.address }}"
+      mngmnt_network_netmask: "{{ lookup('vars','ansible_'+mngmnt_network_nic).ipv4.netmask }}"
+      mngmnt_network_subnet: "{{ lookup('vars','ansible_'+mngmnt_network_nic).ipv4.network }}"
+    tags: init
+
+  - name: Check the subnet of management network dhcp start range
+    shell: |
+      IFS=. read -r i1 i2 i3 i4 <<< "{{ mngmnt_network_dhcp_start_range }}"
+      IFS=. read -r m1 m2 m3 m4 <<< "{{ mngmnt_network_netmask }}"
+      printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$((i2 & m2))" "$((i3 & m3))" "$((i4 & m4))"
+    args:
+      warn: no
+    register: dhcp_start_mgmnt_result
+    changed_when: false
+    tags: init
+
+  - name: Set the start dhcp subnet for management network
+    set_fact:
+      dhcp_start_mgmnt: "{{ dhcp_start_mgmnt_result.stdout }}"
+    tags: init
+
+  - name: Check the subnet of dhcp end range for management network
+    shell: |
+      IFS=. read -r i1 i2 i3 i4 <<< "{{ mngmnt_network_dhcp_end_range }}"
+      IFS=. read -r m1 m2 m3 m4 <<< "{{ mngmnt_network_netmask }}"
+      printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$((i2 & m2))" "$((i3 & m3))" "$((i4 & m4))"
+    register: dhcp_end_mgmnt_result
+    changed_when: false
+    tags: init
+
+  - name: Set the end dhcp subnet for management network
+    set_fact:
+      dhcp_end_mgmnt: "{{ dhcp_end_mgmnt_result.stdout }}"
+    tags: init
+
+  - name: Assert management_net_dhcp_start_range
+    assert:
+      that:
+        - mngmnt_network_dhcp_start_range |  length > 1
+        - mngmnt_network_dhcp_start_range | ipv4
+        - mngmnt_network_dhcp_start_range != mngmnt_network_ip
+        - mngmnt_network_dhcp_start_range != mngmnt_network_dhcp_end_range
+        - dhcp_start_mgmnt == mngmnt_network_subnet
+        - dhcp_start_mgmnt == dhcp_end_mgmnt
+      success_msg: "{{ success_dhcp_range }} for management network"
+      fail_msg: "{{ fail_dhcp_range }} for management network"
+    tags: [ validate, network-device ]
+
+  - name: Assert management_net_dhcp_end_range
+    assert:
+      that:
+        - mngmnt_network_dhcp_end_range |  length > 1
+        - mngmnt_network_dhcp_end_range | ipv4
+        - mngmnt_network_dhcp_end_range != mngmnt_network_ip
+        - mngmnt_network_dhcp_start_range != mngmnt_network_dhcp_end_range
+        - dhcp_end_mgmnt == mngmnt_network_subnet
+        - dhcp_start_mgmnt == dhcp_end_mgmnt
+      success_msg: "{{ success_dhcp_range }} for management network"
+      fail_msg: "{{ fail_dhcp_range }} for management network"
+    tags: [ validate, network-device ]
+
+  - name: Set the mapping file value for management network
+    set_fact:
+      mngmnt_mapping_file: true
+    when: mngmnt_mapping_file_path | length > 0
+    tags: init
+
+  - name: Assert valid mngmnt_mapping_file_path
+    stat:
+      path: "{{ mngmnt_mapping_file_path }}"
+    when: mngmnt_mapping_file
+    register: result_mngmnt_mapping_file
+    tags: init
+
+  - name : Valid mngmnt_mapping_file_path
+    fail:
+      msg: "{{ invalid_mapping_file_path }} for management network"
+    when: mngmnt_mapping_file and not result_mngmnt_mapping_file.stat.exists
+    tags: init
+  when: device_config_support
 ### host network
 
 - name: Fetch the host network ip, netmask and subnet
@@ -196,14 +196,14 @@
     host_mapping_file: true
   when: host_mapping_file_path | length > 0
   tags: init
-  
+
 - name: Assert valid mapping_file_path
-  stat: 
+  stat:
     path: "{{ host_mapping_file_path }}"
   when: host_mapping_file
   register: result_host_mapping_file
   tags: init
-  
+
 - name: Valid mapping_file_path
   fail:
     msg: "{{ invalid_mapping_file_path }} for host_network"
@@ -218,12 +218,19 @@
       - public_nic != host_network_nic
     success_msg: "{{ success_msg_different_nics }}"
     fail_msg: "{{ fail_msg_different_nics }}"
+  when: device_config_support
   tags: [ validate, pxe, network-device ]
 
-### ib network
+- name: Verify different nics
+  assert:
+    that:
+      - public_nic != host_network_nic
+    success_msg: "{{ success_msg_different_nics }}"
+    fail_msg: "{{ fail_msg_different_nics }}"
+  tags: [ validate, pxe, network-device ]
 
-- name: Validate ib network vars
-  block:
+### ib network
+- block:
     - name: Fetch the infiniband network ip, netmask and subnet
       set_fact:
         ib_ip: "{{ lookup('vars','ansible_'+ib_network_nic).ipv4.address }}"

control_plane/roles/control_plane_common/tasks/verify_login_inputs.yml

@@ -39,9 +39,7 @@
   register: input_config_check
   when:
     - provision_password | length < 1 or
-      cobbler_password | length < 1 or      
-      idrac_username | length < 1 or
-      idrac_password | length < 1
+      cobbler_password | length < 1
   tags: [ validate, pxe, idrac ]
 
 - name: Validate security parameters when enable_security_support is set to true
@@ -111,6 +109,7 @@
     - name: idrac credentials validation check
       fail:
         msg: "{{ fail_msg_idrac_credentials }}"
+  when: device_support_status
   tags: [ validate, idrac ]
 
 - name: Assert grafana credentials
@@ -160,7 +159,9 @@
     - name: ethernet switch credentials validation check
       fail:
         msg: "{{ fail_msg_ethernet_credentials }}"
-  when: ethernet_switch_support
+  when:
+    - device_support_status
+    - ethernet_switch_support
   tags: [ validate, network-device ]
 
 - name: Assert username and password for IB switches
@@ -185,7 +186,9 @@
     - name: IB switch credentials validation check
       fail:
         msg: "{{ fail_msg_ib_credentials }}"
-  when: ib_switch_support
+  when:
+    - device_support_status
+    - ib_switch_support
   tags: [ validate, network-ib ]
 
 - name: Assert username and password for powervault me4
@@ -217,7 +220,9 @@
     - name: Powervault me4 credentials validation check
       fail:
         msg: "{{ fail_msg_me4_credentials }}"
-  when: powervault_support
+  when:
+    - device_support_status
+    - powervault_support
   tags: [ validate, network-device ]
 
 - name: Assert ms_directory_manager_password

control_plane/roles/control_plane_common/vars/main.yml

@@ -103,10 +103,8 @@ fail_msg_directory_manager_password: "Failed. Incorrect format provided for dire
 success_msg_ipa_admin_password: "ipa_admin_password successfully validated"
 fail_msg_ipa_admin_password: "Failed. Incorrect format provided for ipa_admin_password"
 omnia_input_config_failure_msg: "Failed. Please provide all the required parameters in omnia_config.yml for for login_node"
-login_node_required_success_msg: "login_node_required successfully validated"
-login_node_required_fail_msg: "Failed. login_node_required should be either true or false"
-secure_login_node_success_msg: "enable_secure_login_node successfully validated"
-secure_login_node_fail_msg: "Failed. enable_secure_login_node should be either true or false"
+login_node_required_success_msg: "Login_node_required successfully validated"
+login_node_required_fail_msg: "Failed. login_node_required can be either true or false"
 
 # Usage: fetch_base_inputs.yml
 base_vars_filename: "input_params/base_vars.yml"
@@ -148,8 +146,6 @@ success_msg_different_nics: "The nics of different containers and public nic are
 fail_msg_different_nics: "Failed. Incorrect nic information. public nic, management network nic and host network nic should not be the same"
 success_msg_different_nics_ib: "The nics of different containers and public nic are not the same as infiniband nic- Validated"
 fail_msg_different_nics_ib: "Failed. Infiniband nic cannot be the same as other nics"
-success_msg_ib: "Infiniband variables validated"
-fail_msg_ib: "Failed. Please provide all the InfiniBand related parameters in base_vars.yml"
 success_msg_lease_time: "Default lease time validated"
 fail_msg_lease_time: "Failed. Please provide a valid default lease time"
 provision_os_success_msg: "provision_os validated"
@@ -158,23 +154,24 @@ provision_state_success_msg: "provision_state validated"
 provision_state_fail_msg: "Failed. Incorrect provision_state selected. Supported only stateful"
 enable_security_support_success_msg: "enable_security_support validated"
 enable_security_support_fail_msg: "Failed. enable_security_support only accepts boolean values true or false"
-dns_empty_warning_msg: "[WARNING] primary_dns and secondary_dns is empty. DHCP routing in compute nodes for internet access won't be configured. Stop and re-run control_plane.yml, if DHCP routing is required."
-primary_dns_empty_msg: "primary_dns is empty and secondary_dns provided. If one dns entry present, provide primary_dns only."
-primary_dns_success_msg: "primary_dns successfully validated"
-primary_dns_fail_msg: "Failed. Incorrect primary_dns provided in base_vars.yml"
-primary_dns_not_reachable_msg: "Failed. primary_dns is not reachable. Provide valid dns"
-secondary_dns_success_msg: "secondary_dns successfully validated"
-secondary_dns_fail_msg: "Failed. Incorrect secondary_dns provided in base_vars.yml"
-secondary_dns_not_reachable_msg: "[WARNING] secondary_dns is not reachable"
-ping_search_key: "100% packet loss"
+success_device_config: " Success. Device_config_support has valid values"
+fail_device_config: "Failed. Give a valid value in device_config_support"
+device_ip_list_not_supported: "[Warning] Device_ip_list is invalid as minimum idrac_support should be true"
+mgmnt_device_fail: "Failed. Container already present. Either delete the container or make device_config_support as true"
+# Usage: device_config_validations
+success_msg_ib: "Infiniband variables validated"
+fail_msg_ib: "Failed. Please provide all the InfiniBand related parameters in base_vars.yml"
+ethernet_device_config: " Ethernet_switch_support will be set to false only since device_config_support is set to false"
+ib_device_config: " Ib_switch_support will be set to false only since device_config_support is set to false"
+pv_device_config: " Powervault_support will be set to false only since device_config_support is set to false"
+idrac_support_valid: "Idrac support is initiated."
+failed_idrac_support: " Failed. Atleast idrac_support should be true."
 
 # Usage: fetch_sm_inputs.yml
 ib_config_file: "{{ role_path }}/../../input_params/ib_vars.yml"
 opensm_conf_file: "{{ role_path }}/../../input_params/opensm.conf"
-
 fail_msg_config_file: ib_vars.yml file doesn't exist.
 fail_msg_opensm_config_file: opensm.conf file doesn't exist.
-
 fail_msg_ib_input_definition: Infiniband config directories must be defined.
 fail_msg_ib_input: Infiniband config directories can't be left empty.
 
@@ -265,3 +262,8 @@ firmware_update_success_msg: "firmware_update_required validated"
 firmware_update_fail_msg: "Failed. firmware_update_required accepts only true or false in idrac_vars.yml"
 poweredge_model_success_msg: "poweredge_model validated"
 poweredge_model_fail_msg: "Failed. poweredge_model is incorrect or unsupported. Please update the list with the supported models in the correct format"
+
+# Usage: validate_device_ip_file.yml
+fail_device_ip_format: "Failed.Incorrect file format. File should only contain IPs"
+success_device_ip_format: "File is correct"
+mgmnt_ip_path: "{{ role_path}}/../collect_device_info/files/mgmt_provisioned_hosts.yml"

control_plane/roles/control_plane_customiso/tasks/check_prerequisites.yml

@@ -70,3 +70,12 @@
     line: "{{ mngmnt_network_ip }}"
     mode: "{{ file_permission }}"
     create: yes
+  when: device_config_support
+
+- name: Copy management station ip to {{ management_station_ip_file }}
+  lineinfile:
+    path: "{{ role_path }}/../provision_idrac/files/{{ management_station_ip_file }}"
+    line: "{{ public_ip }}"
+    mode: "{{ file_permission }}"
+    create: yes
+  when: not device_config_support

control_plane/roles/control_plane_customiso/tasks/main.yml

@@ -15,20 +15,22 @@
 
 # tasks file for control_plane_customiso
 
-- name: Check iso mount path
-  include_tasks: check_prerequisites.yml
+- block:
+  - name: Check iso mount path
+    include_tasks: check_prerequisites.yml
 
-- name: Edit iso config files
-  include_tasks: edit_iso_config.yml
+  - name: Edit iso config files
+    include_tasks: edit_iso_config.yml
 
-- name: Create unattended iso file rocky
-  include_tasks: create_unattended_iso_rocky.yml
-  when: provision_os == os_supported_rocky
+  - name: Create unattended iso file rocky
+    include_tasks: create_unattended_iso_rocky.yml
+    when: provision_os == os_supported_rocky
 
-- name: Create unattended iso file leap
-  include_tasks: create_unattended_iso_leap.yml
-  when: provision_os == os_supported_leap
+  - name: Create unattended iso file leap
+    include_tasks: create_unattended_iso_leap.yml
+    when: provision_os == os_supported_leap
 
-- name: Create unattended iso file centos
-  include_tasks: create_unattended_iso_centos.yml
-  when: provision_os == os_supported_centos
+  - name: Create unattended iso file centos
+    include_tasks: create_unattended_iso_centos.yml
+    when: provision_os == os_supported_centos
+  when: device_support_status

control_plane/roles/control_plane_device/tasks/check_prerequisites.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.
@@ -15,11 +15,9 @@
 
 - name: Initialize variables
   set_fact:
-    mngmnt_network_container_status: false
     mngmnt_network_container_image_status: false
     backup_mngmnt_map_status: false
     new_mngmnt_node_status: false
-  tags: install
 
 - name: Check if any backup file exists
   block:
@@ -43,23 +41,19 @@
   register: mngmnt_network_container_image_result
   failed_when: false
   changed_when: false
-  tags: install
 
 - name: Check mngmnt_network_container status on the machine
   command: kubectl get pods -n network-config
   register: mngmnt_network_container_result
   failed_when: false
   changed_when: false
-  tags: install
 
 - name: Update mngmnt_network_container image status
   set_fact:
     mngmnt_network_container_image_status: true
   when: mngmnt_network_image_name in mngmnt_network_container_image_result.stdout
-  tags: install
 
 - name: Update mngmnt_network_container container status
   set_fact:
     mngmnt_network_container_status: true
   when: "'mngmnt-network-container' in mngmnt_network_container_result.stdout"
-  tags: install

control_plane/roles/control_plane_device/tasks/main.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.
@@ -14,50 +14,50 @@
 ---
 
 # Tasks file for mngmnt_network
-
-- name: Check mngmnt_network_container status on machine
-  include_tasks: check_prerequisites.yml
-
-- name: Modify firewall settings for mngmnt_network_container
-  import_tasks: firewall_settings.yml
-  when: not mngmnt_network_container_status
-
-- name: Include common variables
-  include_vars:  ../../control_plane_common/vars/main.yml
-  when: not mngmnt_network_container_status
-
-- name: Internet validation
-  include_tasks: ../../control_plane_common/tasks/internet_validation.yml
-  when: not mngmnt_network_container_status
-
-- name: Include variable file base_vars.yml
-  include_vars: "{{ base_mngmnt_file }}"
-
-- name: Dhcp Configuration
-  import_tasks: dhcp_configure.yml
-  when: (not mngmnt_network_container_image_status) or ( backup_mngmnt_map_status)
-
-- name: Mapping file validation
-  import_tasks: mapping_file.yml
-  when: (not mngmnt_network_container_image_status) and (mngmnt_mapping_file_path) or ( backup_mngmnt_map_status)
-
-- name: mngmnt_network_container image creation
-  import_tasks: mngmnt_network_container_image.yml
-  when: not mngmnt_network_container_status
-
-- name: mngmnt_network_container configuration
-  import_tasks: configure_mngmnt_network_container.yml
-
-- name: mngmnt_network_container container status message
-  block:
-    - name: management network container running
-      debug:
-        msg: "{{ message_skipped }}"
-        verbosity: 2
-      when: mngmnt_network_container_status
-    - name: management network container not running
-      debug:
-        msg: "{{ message_installed }}"
-        verbosity: 2
-      when: not mngmnt_network_container_status
-  tags: install
+- block:
+  - name: Check mngmnt_network_container status on machine
+    include_tasks: check_prerequisites.yml
+
+  - name: Modify firewall settings for mngmnt_network_container
+    include_tasks: firewall_settings.yml
+    when: not mngmnt_network_container_status
+
+  - name: Include common variables
+    include_vars:  ../../control_plane_common/vars/main.yml
+    when: not mngmnt_network_container_status
+
+  - name: Internet validation
+    include_tasks: ../../control_plane_common/tasks/internet_validation.yml
+    when: not mngmnt_network_container_status
+
+  - name: Include variable file base_vars.yml
+    include_vars: "{{ base_mngmnt_file }}"
+
+  - name: Dhcp Configuration
+    include_tasks: dhcp_configure.yml
+    when: (not mngmnt_network_container_image_status) or ( backup_mngmnt_map_status)
+
+  - name: Mapping file validation
+    include_tasks: mapping_file.yml
+    when: (not mngmnt_network_container_image_status) and (mngmnt_mapping_file_path) or ( backup_mngmnt_map_status)
+
+  - name: mngmnt_network_container image creation
+    include_tasks: mngmnt_network_container_image.yml
+    when: not mngmnt_network_container_status
+
+  - name: mngmnt_network_container configuration
+    include_tasks: configure_mngmnt_network_container.yml
+
+  - name: mngmnt_network_container container status message
+    block:
+      - name: management network container running
+        debug:
+          msg: "{{ message_skipped }}"
+          verbosity: 2
+        when: mngmnt_network_container_status
+      - name: management network container not running
+        debug:
+          msg: "{{ message_installed }}"
+          verbosity: 2
+        when: not mngmnt_network_container_status
+  when: device_config_support

control_plane/roles/control_plane_ib/tasks/configure_infiniband_container.yml

@@ -22,22 +22,18 @@
 - name: Deploy infiniband pod
   command: "kubectl apply -f {{ role_path }}/files/k8s_infiniband.yml"
   changed_when: true
-  tags: install
   when: infiniband_container_status and  (not infiniband_container_config_status)
 
 - name: Wait for infiniband pod to come to ready state
   command: kubectl wait --for=condition=ready -n network-config pod -l app=infiniband
   changed_when: false
-  tags: install
 
 - name: Get infiniband pod name
   command: 'kubectl get pod -n network-config -l app=infiniband -o jsonpath="{.items[0].metadata.name}"'
   changed_when: false
   register: infiniband_pod_name
-  tags: install
 
 - name: Configuring infiniband container
   command: 'kubectl exec --stdin --tty -n network-config {{ infiniband_pod_name.stdout }} \
-    -- ansible-playbook /root/omnia/control_plane/roles/control_plane_ib/files/infiniband_container_configure.yml -e ib_nic= "{{ ib_network_nic }}"'
+    -- ansible-playbook /root/omnia/control_plane/roles/control_plane_ib/files/infiniband_container_configure.yml -e ib_nic="{{ ib_network_nic }}"'
   changed_when: false
-  tags: install

control_plane/roles/control_plane_ib/tasks/main.yml

@@ -44,14 +44,17 @@
 
     - name: infiniband_container container status message
       block:
-        - debug:
+        - name: Infiniband container skipped
+          debug:
             msg: "{{ infiniband_message_skipped }}"
             verbosity: 2
           when: infiniband_container_status
-        - debug:
+        - name: Infiniband container installed
+          debug:
             msg: "{{ infiniband_message_installed }}"
             verbosity: 2
           when: not infiniband_container_status
   when:
+    - device_support_status
     - ib_switch_support
     - mgmt_os in os_supported_rocky

control_plane/roles/control_plane_ib/vars/main.yml

@@ -25,5 +25,5 @@ mount_path: /root/omnia
 infiniband_message_skipped: "The container is already present"
 infiniband_message_installed: "The container is installed"
 ib_kube_config_file: "{{ role_path }}/files/k8s_infiniband.yml"
-ib_container_name: inifiniband-container"
+ib_container_name: infiniband-container
 infiniband_message_installed: "The container is installed"

control_plane/roles/control_plane_repo/tasks/main.yml

@@ -22,4 +22,6 @@
 
     - name: Download iDRAC firmware updates
       include_tasks: download_fmw_updates.yml
-  when: firmware_update_required
+  when:
+    - device_support_status
+    - firmware_update_required

control_plane/roles/deploy_job_templates/tasks/main.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,220 +12,223 @@
 # 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
-  no_log: true
-  register: config_content
-
-- name: Decrpyt {{ tower_config_file }}
-  command: >-
-    ansible-vault decrypt {{ tower_config_file }}
-    --vault-password-file {{ tower_vault_file }}
-  when: "'$ANSIBLE_VAULT;' in config_content.stdout"
-  changed_when: false
-
-- name: Change file permissions
-  file:
-    path: "{{ tower_config_file }}"
-    mode: "{{ file_perm }}"
-
-- name: Fetch awx host
-  command: grep "host:" "{{ tower_config_file }}"
-  changed_when: false
-  register: fetch_awx_host
-
-- name: Fetch awx password
-  command: grep "password:" "{{ tower_config_file }}"
-  changed_when: false
-  no_log: true
-  register: fetch_awx_password
-
-- name: Set awx variables
-  set_fact:
-    awx_host: "{{ fetch_awx_host.stdout | regex_replace('host: ','') }}"
-    awx_password: "{{ fetch_awx_password.stdout | regex_replace('password: ','') }}"
-  no_log: true
-
-- name: Launch dynamic inventory
-  block:
-    - name: Launch device inventory job template
-      awx.awx.tower_job_launch:
-        job_template: "{{ device_inventory_template }}"
-        tower_config_file: "{{ tower_config_file }}"
-        wait: yes
-        timeout: "{{ awx_max_wait_time }}"
-      register: inventory_job_status
-  rescue:
-    - name: Restart awx pod
-      command: kubectl rollout restart deployment awx -n awx
-      changed_when: false
-      when:
-        - inventory_job_status.status is defined
-        - '"pending" in inventory_job_status.status'
-
-    - name: Wait for the awx pod to be up and running
-      wait_for:
-        timeout: "{{ pod_restart_time }}"
-      when:
-        - inventory_job_status.status is defined
-        - '"pending" in inventory_job_status.status'
-
-    - name: Launch device inventory job template
-      awx.awx.tower_job_launch:
-        job_template: "{{ device_inventory_template }}"
-        tower_config_file: "{{ tower_config_file }}"
-        wait: yes
-        timeout: "{{ awx_max_wait_time }}"
-      when:
-        - inventory_job_status.status is defined
-        - '"pending" in inventory_job_status.status'
-
-    - name: Warning message for device inventory template
-      debug:
-        msg: "{{ device_inventory_template_warn_msg }}"
-      when:
-        - inventory_job_status.status is defined
-        - '"pending" not in inventory_job_status.status'
-
-- name: Configure TOR Switches
-  block:
-    - name: Launch ethernet job template for TOR switches
-      awx.awx.tower_job_launch:
-        job_template: "{{ ethernet_job_template }}"
-        tower_config_file: "{{ tower_config_file }}"
-        wait: yes
-        timeout: "{{ awx_max_wait_time }}"
-      register: ethernet_job_status
-  rescue:
-    - name: Warning message for ethernet template
-      debug:
-        msg: "{{ ethernet_template_warn_msg }}"
-  when: ethernet_switch_support
-
-- name: Wait for 15 mins for DHCP to assign IP to devices
-  wait_for:
-    timeout: "{{ dhcp_wait_time }}"
-
-- name: Launch device inventory job template
-  awx.awx.tower_job_launch:
-    job_template: "{{ device_inventory_template }}"
-    tower_config_file: "{{ tower_config_file }}"
-    wait: yes
-    timeout: "{{ awx_max_wait_time }}"
-  register: inventory_job_status
-
-- name: Execute ethernet template
-  block:
-    - name: Launch ethernet job template for all switches
-      awx.awx.tower_job_launch:
-        job_template: "{{ ethernet_job_template }}"
-        tower_config_file: "{{ tower_config_file }}"
-        wait: yes
-        timeout: "{{ awx_max_wait_time }}"
-      register: ethernet_job_status
-  rescue:
-    - name: Warning message for ethernet template
-      debug:
-        msg: "{{ ethernet_template_warn_msg }}"
-  when: ethernet_switch_support
-
-- name: Execute infiniband template
-  block:
-    - name: Launch infiniband job template
-      awx.awx.tower_job_launch:
-        job_template: "{{ infiniband_job_template }}"
-        tower_config_file: "{{ tower_config_file }}"
-        wait: yes
-        timeout: "{{ awx_max_wait_time }}"
-      register: ib_job_status
-  rescue:
-    - name: Warning message for infiniband template
-      debug:
-        msg: "{{ infiniband_template_warn_msg }}"
-  when: ib_switch_support
-
-- name: Execute powervault_me4 template
-  block:
-    - name: Launch powervault_me4 job template
-      awx.awx.tower_job_launch:
-        job_template: "{{ powervault_me4_job_template }}"
-        tower_config_file: "{{ tower_config_file }}"
-        wait: yes
-        timeout: "{{ awx_max_wait_time }}"
-      register: powervault_job_status
-  rescue:
-    - name: Warning message for powervault_me4 template
-      debug:
-        msg: "{{ powervault_template_warn_msg }}"
-  when: powervault_support
-
-- name: Execute idrac template
-  block:
-    - name: Launch idrac job template
-      awx.awx.tower_job_launch:
-        job_template: "{{ idrac_job_template }}"
-        tower_config_file: "{{ tower_config_file }}"
-        wait: yes
-      register: idrac_job_status
-  rescue:
-    - name: Warning message for idrac template
-      debug:
-        msg: "{{ idrac_template_warn_msg }}"
-
-- name: Wait for 30 mins for idrac provisioning to be completed and inventory to be updated in AWX
-  wait_for:
-    timeout: "{{ provisioning_wait_time }}"
-  when: host_mapping_file
-
-- name: Check the host_mapping_file_path output
-  command: cat {{ host_mapping_file_path }}
-  changed_when: false
-  register: mapping_file
-  when: host_mapping_file
-
-- name: Group the hosts in node_inventory when mapping file is present
-  include_tasks: "{{ role_path }}/tasks/group_inventory.yml"
-  when: host_mapping_file and component_role_support
-
-- name: Launch deploy_omnia job template
-  awx.awx.tower_job_launch:
-    job_template: "{{ component_role_job_template }}"
-    tower_config_file: "{{ tower_config_file }}"
-    wait: yes
-  register: component_role_job_status
-  when: host_mapping_file and component_role_support
-
-- name: Create awx job template for configuring new devices
-  awx.awx.tower_job_template:
-    name: "{{ item.name }}"
-    job_type: "run"
-    organization: "{{ awx_organization }}"
-    inventory: "{{ item.inventory }}"
-    project: "{{ project_name }}"
-    playbook: "{{ item.playbook }}"
-    credentials:
-     - "{{ item.credential }}"
-    state: present
-    tower_config_file: "{{ tower_config_file }}"
-  loop: "{{ job_template_details }}"
-
-- name: Build a schedule for configure new devices
-  awx.awx.tower_schedule:
-    name: "{{ item.name }}"
-    unified_job_template: "{{ item.template }}"
-    rrule: "{{ item.rrule }}"
-    state: present
-    tower_config_file: "{{ tower_config_file }}"
-  loop: "{{ scheduled_template }}"
-
-- name: Encrypt {{ tower_config_file }}
-  command: >-
-    ansible-vault encrypt {{ tower_config_file }}
-    --vault-password-file {{ tower_vault_file }}
-  changed_when: false
-
-- name: Change file permissions
-  file:
-    path: "{{ tower_config_file }}"
-    mode: "{{ file_perm }}"
+- block:
+  - name: Check if {{ tower_config_file }} file is encrypted
+    command: cat {{ tower_config_file }}
+    changed_when: false
+    no_log: true
+    register: config_content
+
+  - name: Decrpyt {{ tower_config_file }}
+    command: >-
+      ansible-vault decrypt {{ tower_config_file }}
+      --vault-password-file {{ tower_vault_file }}
+    when: "'$ANSIBLE_VAULT;' in config_content.stdout"
+    changed_when: false
+
+  - name: Change file permissions
+    file:
+      path: "{{ tower_config_file }}"
+      mode: "{{ file_perm }}"
+
+  - name: Fetch awx host
+    command: grep "host:" "{{ tower_config_file }}"
+    changed_when: false
+    register: fetch_awx_host
+
+  - name: Fetch awx password
+    command: grep "password:" "{{ tower_config_file }}"
+    changed_when: false
+    no_log: true
+    register: fetch_awx_password
+
+  - name: Set awx variables
+    set_fact:
+      awx_host: "{{ fetch_awx_host.stdout | regex_replace('host: ','') }}"
+      awx_password: "{{ fetch_awx_password.stdout | regex_replace('password: ','') }}"
+    no_log: true
+
+  - name: Launch dynamic inventory
+    block:
+      - name: Launch device inventory job template
+        awx.awx.tower_job_launch:
+          job_template: "{{ device_inventory_template }}"
+          tower_config_file: "{{ tower_config_file }}"
+          wait: yes
+          timeout: "{{ awx_max_wait_time }}"
+        register: inventory_job_status
+    rescue:
+      - name: Restart awx pod
+        command: kubectl rollout restart deployment awx -n awx
+        changed_when: false
+        when:
+          - inventory_job_status.status is defined
+          - '"pending" in inventory_job_status.status'
+
+      - name: Wait for the awx pod to be up and running
+        wait_for:
+          timeout: "{{ pod_restart_time }}"
+        when:
+          - inventory_job_status.status is defined
+          - '"pending" in inventory_job_status.status'
+
+      - name: Launch device inventory job template
+        awx.awx.tower_job_launch:
+          job_template: "{{ device_inventory_template }}"
+          tower_config_file: "{{ tower_config_file }}"
+          wait: yes
+          timeout: "{{ awx_max_wait_time }}"
+        when:
+          - inventory_job_status.status is defined
+          - '"pending" in inventory_job_status.status'
+
+      - name: Warning message for device inventory template
+        debug:
+          msg: "{{ device_inventory_template_warn_msg }}"
+        when:
+          - inventory_job_status.status is defined
+          - '"pending" not in inventory_job_status.status'
+
+  - name: Configure TOR Switches
+    block:
+      - name: Launch ethernet job template for TOR switches
+        awx.awx.tower_job_launch:
+          job_template: "{{ ethernet_job_template }}"
+          tower_config_file: "{{ tower_config_file }}"
+          wait: yes
+          timeout: "{{ awx_max_wait_time }}"
+        register: ethernet_job_status
+    rescue:
+      - name: Warning message for ethernet template
+        debug:
+          msg: "{{ ethernet_template_warn_msg }}"
+    when: ethernet_switch_support
+
+  - name: Wait for 15 mins for DHCP to assign IP to devices
+    wait_for:
+      timeout: "{{ dhcp_wait_time }}"
+    when: device_config_support
+
+  - name: Launch device inventory job template
+    awx.awx.tower_job_launch:
+      job_template: "{{ device_inventory_template }}"
+      tower_config_file: "{{ tower_config_file }}"
+      wait: yes
+      timeout: "{{ awx_max_wait_time }}"
+    register: inventory_job_status
+
+  - name: Execute ethernet template
+    block:
+      - name: Launch ethernet job template for all switches
+        awx.awx.tower_job_launch:
+          job_template: "{{ ethernet_job_template }}"
+          tower_config_file: "{{ tower_config_file }}"
+          wait: yes
+          timeout: "{{ awx_max_wait_time }}"
+        register: ethernet_job_status
+    rescue:
+      - name: Warning message for ethernet template
+        debug:
+          msg: "{{ ethernet_template_warn_msg }}"
+    when: ethernet_switch_support
+
+  - name: Execute infiniband template
+    block:
+      - name: Launch infiniband job template
+        awx.awx.tower_job_launch:
+          job_template: "{{ infiniband_job_template }}"
+          tower_config_file: "{{ tower_config_file }}"
+          wait: yes
+          timeout: "{{ awx_max_wait_time }}"
+        register: ib_job_status
+    rescue:
+      - name: Warning message for infiniband template
+        debug:
+          msg: "{{ infiniband_template_warn_msg }}"
+    when: ib_switch_support
+
+  - name: Execute powervault_me4 template
+    block:
+      - name: Launch powervault_me4 job template
+        awx.awx.tower_job_launch:
+          job_template: "{{ powervault_me4_job_template }}"
+          tower_config_file: "{{ tower_config_file }}"
+          wait: yes
+          timeout: "{{ awx_max_wait_time }}"
+        register: powervault_job_status
+    rescue:
+      - name: Warning message for powervault_me4 template
+        debug:
+          msg: "{{ powervault_template_warn_msg }}"
+    when: powervault_support
+
+  - name: Execute idrac template
+    block:
+      - name: Launch idrac job template
+        awx.awx.tower_job_launch:
+          job_template: "{{ idrac_job_template }}"
+          tower_config_file: "{{ tower_config_file }}"
+          wait: yes
+        register: idrac_job_status
+    rescue:
+      - name: Warning message for idrac template
+        debug:
+          msg: "{{ idrac_template_warn_msg }}"
+
+  - name: Wait for 30 mins for idrac provisioning to be completed and inventory to be updated in AWX
+    wait_for:
+      timeout: "{{ provisioning_wait_time }}"
+    when: host_mapping_file
+
+  - name: Check the host_mapping_file_path output
+    command: cat {{ host_mapping_file_path }}
+    changed_when: false
+    register: mapping_file
+    when: host_mapping_file
+
+  - name: Group the hosts in node_inventory when mapping file is present
+    include_tasks: "{{ role_path }}/tasks/group_inventory.yml"
+    when: host_mapping_file and component_role_support
+
+  - name: Launch deploy_omnia job template
+    awx.awx.tower_job_launch:
+      job_template: "{{ component_role_job_template }}"
+      tower_config_file: "{{ tower_config_file }}"
+      wait: yes
+    register: component_role_job_status
+    when: host_mapping_file and component_role_support
+
+  - name: Create awx job template for configuring new devices
+    awx.awx.tower_job_template:
+      name: "{{ item.name }}"
+      job_type: "run"
+      organization: "{{ awx_organization }}"
+      inventory: "{{ item.inventory }}"
+      project: "{{ project_name }}"
+      playbook: "{{ item.playbook }}"
+      credentials:
+       - "{{ item.credential }}"
+      state: present
+      tower_config_file: "{{ tower_config_file }}"
+    loop: "{{ job_template_details }}"
+
+  - name: Build a schedule for configure new devices
+    awx.awx.tower_schedule:
+      name: "{{ item.name }}"
+      unified_job_template: "{{ item.template }}"
+      rrule: "{{ item.rrule }}"
+      state: present
+      tower_config_file: "{{ tower_config_file }}"
+    loop: "{{ scheduled_template }}"
+
+  - name: Encrypt {{ tower_config_file }}
+    command: >-
+      ansible-vault encrypt {{ tower_config_file }}
+      --vault-password-file {{ tower_vault_file }}
+    changed_when: false
+
+  - name: Change file permissions
+    file:
+      path: "{{ tower_config_file }}"
+      mode: "{{ file_perm }}"
+  when : device_support_status

control_plane/roles/network_ethernet/tasks/main.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.
@@ -32,5 +32,4 @@
       dellos10_command:
         commands: "copy running-configuration startup-configuration"
       when: save_changes_to_startup
-
-  when: ethernet_switch_support
+  when: ethernet_switch_support

control_plane/roles/network_ib/tasks/main.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.
@@ -36,5 +36,4 @@
 
     - name: Save running-config to startup-config
       include_tasks: save_config.yml
-
-  when: ib_switch_support
+  when: ib_switch_support

control_plane/roles/webui_awx/tasks/awx_configuration.yml

@@ -149,7 +149,7 @@
     tower_config_file: "{{ tower_config_file }}"
   loop: "{{ omnia_job_template_details }}"
 
-- name: Build a schedule for idrac job template
+- name: Build a schedule for node inventory and device inventory
   awx.awx.tower_schedule:
     name: "{{ item.name }}"
     unified_job_template: "{{ item.template }}"
@@ -158,6 +158,7 @@
     tower_config_file: "{{ tower_config_file }}"
   register: result
   loop: "{{ scheduled_templates }}"
+  when: item.flag
 
 - name: Encrypt {{ tower_config_file }}
   command: >-
@@ -168,4 +169,4 @@
 - name: Change file permissions
   file:
     path: "{{ tower_config_file }}"
-    mode: "{{ file_perm }}"
+    mode: "{{ file_perm }}"

control_plane/roles/webui_awx/vars/main.yml

@@ -75,31 +75,31 @@ organization_name: 'DellEMC'
 project_name: 'omnia'
 project_description: "Directory which contains configuration playbooks"
 inventory_names:
-  - { name: idrac_inventory, description: "Inventory to store IPs of idrac servers", flag: true }
+  - { name: node_inventory, description: "Inventory to store host IPs of servers", flag: true }
+  - { name: idrac_inventory, description: "Inventory to store IPs of idrac servers", flag: "{{ idrac_support }}" }
   - { name: ethernet_inventory, description: "Inventory to store IPs of ethernet switches", flag: "{{ ethernet_switch_support }}" }
   - { name: infiniband_inventory, description: "Inventory to store IPs of infiniband switches", flag: "{{ ib_switch_support }}" }
   - { name: powervault_me4_inventory, description: "Inventory to store IPs of ME4 servers", flag: "{{ powervault_support }}" }
-  - { name: node_inventory, description: "Inventory to store host IPs of servers", flag: true }
 group_names:
   - { name: manager, description: "Group to store IP of head node" }
   - { name: compute, description: "Group to store IPs of compute nodes" }
   - { name: login_node, description: "Group to store IP of login node" }
   - { name: nfs_node, description: "Group to store IP of NFS node" }
 credential_details:
-  - { name: idrac_credential, type: Network, username: "{{ idrac_username }}", password: "{{ idrac_password }}", flag: true }
+  - { name: node_credential, type: Machine, username: root, password: "{{ provision_password }}", flag: true }
+  - { name: idrac_credential, type: Network, username: "{{ idrac_username }}", password: "{{ idrac_password }}", flag: "{{ idrac_support }}" }
   - { name: ethernet_credential, type: Machine, username: "{{ ethernet_switch_username }}", password: "{{ ethernet_switch_password }}", flag: "{{ ethernet_switch_support }}" }
   - { name: infiniband_credential, type: Network, username: "{{ ib_username }}", password: "{{ ib_password }}", flag: "{{ ib_switch_support }}" }
   - { name: powervault_me4_credential, type: Network, username: "{{ powervault_me4_username }}", password: "{{ powervault_me4_password }}", flag: "{{ powervault_support }}" }
-  - { name: node_credential, type: Machine, username: root, password: "{{ provision_password }}", flag: true }
 job_template_details:
-  - { name: idrac_template, inventory: idrac_inventory, playbook: control_plane/idrac.yml, credential: idrac_credential, flag: true }
+  - { name: node_inventory_job, inventory: node_inventory, playbook: control_plane/collect_node_info.yml, credential: node_credential, flag: true }
+  - { name: device_inventory_job, inventory: node_inventory, playbook: control_plane/collect_device_info.yml, credential: node_credential, flag: "{{ device_support_status }}" }
+  - { name: idrac_template, inventory: idrac_inventory, playbook: control_plane/idrac.yml, credential: idrac_credential, flag: "{{ idrac_support }}" }
   - { name: ethernet_template, inventory: ethernet_inventory, playbook: control_plane/ethernet.yml, credential: ethernet_credential, flag: "{{ ethernet_switch_support }}" }
   - { 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 }}" }
-  - { name: node_inventory_job, inventory: node_inventory, playbook: control_plane/collect_node_info.yml, credential: node_credential, flag: true }
-  - { name: device_inventory_job, inventory: node_inventory, playbook: control_plane/collect_device_info.yml, credential: node_credential, flag: true }
 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 }
 scheduled_templates:
-  - { name: NodeInventorySchedule, template: node_inventory_job, schedule_rule: "DTSTART:20210815T120000Z RRULE:FREQ=MINUTELY;INTERVAL=10" }
-  - { name: DeviceInventorySchedule, template: device_inventory_job, schedule_rule: "DTSTART:20210815T060000Z RRULE:FREQ=DAILY;INTERVAL=1"}
+  - { name: NodeInventorySchedule, template: node_inventory_job, schedule_rule: "DTSTART:20210815T120000Z RRULE:FREQ=MINUTELY;INTERVAL=10", flag: true }
+  - { name: DeviceInventorySchedule, template: device_inventory_job, schedule_rule: "DTSTART:20210815T060000Z RRULE:FREQ=DAILY;INTERVAL=1", flag: "{{ device_support_status }}"}

examples/device_ip_list.yml

@@ -0,0 +1,2 @@
+172.19.0.100
+172.19.0.200