Merge branch 'devel' into nvidia

control_plane/input_params/powervault_me4_vars.yml

@@ -15,7 +15,7 @@
 
 ### Usage: powervault_me4 ###
 
-# This variable indicates the language selection
+# This variable indicates the language of installation
 # Currently, only "English" is supported
 locale: "English"
 
@@ -25,7 +25,7 @@ locale: "English"
 # Optional
 powervault_me4_system_name: "Unintialized_Name"
 
-# Specify the snmp notification level
+# Specifies the minimum snmp notification level used
 # crit: Sends notifications for Critical events only.
 # error: Sends notifications for Error and Critical events.
 # warn: Sends notifications for Warning, Error, and Critical events.
@@ -42,7 +42,7 @@ powervault_me4_snmp_notify_level: "none"
 # Default value: "linear"
 powervault_me4_pool_type: "linear"
 
-# Specify the required RAID Level
+# Specifies the required RAID Level
 # The different RAID levels and the min and max number of disks supported for each RAID are
 # r1/raid1: 2
 # r5/raid5: 3-16
@@ -53,7 +53,7 @@ powervault_me4_pool_type: "linear"
 # Required field
 powervault_me4_raid_levels: "raid1"
 
-# Specify the range of disks
+# Specifies the range of disks
 # Select a range of disks within an enclosure by entering a comma-separated list that contains 
 # the enclosure number and disk range in the Enter Range of Disks text box. 
 # Use the format enclosure-number.disk-range,enclosure-number.disk-range. 
@@ -65,37 +65,37 @@ powervault_me4_raid_levels: "raid1"
 # Required field
 powervault_me4_disk_range: "0.1-2"
 
-# Specify the volume names
+# Specifies the volume names
 # Default value "k8s_volume" and "slurm_volume"
 # Required field
 powervault_me4_k8s_volume_name: "k8s_volume"
 powervault_me4_slurm_volume_name: "slurm_volume"
 
-# Specify the disk group name
+# Specifies the disk group name
 # Required field
 powervault_me4_disk_group_name: "omnia"
 
-# Specify the percentage for partition in disk
+# Specifies the percentage for partition in disk
 # Default value is "60%"
 # Min: 5
 # Max: 90
 # Required field
 powervault_me4_disk_partition_size: "60"
 
-# Specify the volume size
+# Specifies the volume size
 # Format: 100GB <SizeGB>
 # Default: 100GB
 # Required field
 powervault_me4_volume_size: "100GB"
 
-# Specify the pool for disk and volumes
+# Specifies the pool for disk and volumes
 # Pool can either be  a/A or b/B.
-# Mandatory if powervault_me4_pool_type selected as "virtual".
+# Mandatory if powervault_me4_pool_type selected is "virtual".
 powervault_me4_pool: "a"
 
-# Specify the nic of the server with which Powervault is connected.
+# Specifies the nic of the server with which Powervault is connected.
 # Make sure nfs server also has 3 nics (for internet, OS provision and powervault connection)
-# The nic should be according to the provisioned OS on nfs server.
+# The nic should be specified based on the provisioned OS on nfs server.
 # Example: em1 for CentOS-7, eno1 for RockyOS etc.
 # Default value: "eno1"
 # Required field

docs/FAQ.md

@@ -186,4 +186,7 @@ Potential Cause: Your Docker pull limit has been exceeded. For more information,
 1. Delete Kubeflow deployment by executing the following command in manager node: `kfctl delete -V -f /root/k8s/omnia-kubeflow/kfctl_k8s_istio.v1.0.2.yaml`
 2. Re-execute kubeflow.yml after 8-9 hours
 
+## Can Cobbler deploy both Rocky and CentOS at the same time?
+No. During Cobbler based deployment, only one OS is supported at a time. If the user would like to deploy both, please deploy one first, **unmount `/mnt/iso`** and then re-run cobbler for the second OS.
+
 

docs/control_plane/device_templates/CONFIGURE_POWERVAULT_STORAGE.md

@@ -29,7 +29,7 @@ Under the `control_plane/input_params` directory, edit the following files:
 	powervault_me4_disk_partition_size [Required] |	<ul><li>**5**</li><li>Any value between 5-90</li></ul> |	Enter the partition size which would be used as an NFS share.  
 	powervault_me4_volume_size [Required] |	<ul><li>**100GB**</li><li>Custom value</li></ul> |	Enter the volume size in the format: *SizeTB*, *SizeGB*, *SizeMB*, or *SizeB*.  
 	powervault_me4_pool [Required] |	<ul><li>**a** (or A)</li><li>b (or B)</li></ul> |	Enter the pool for the volume.  
-	powervault_me4_server_nic [Required] |	<ul><li>**em1**</li></ul> |	Enter the NIC of the server to which the PowerVault Storage is connected.
+	powervault_me4_server_nic [Required] |	<ul><li>**eno1**</li></ul> |	Enter the NIC of the server to which the PowerVault Storage is connected.
 	powervault_me4_pool_type [Required] |	<ul><li>Virtual</li><li>**Linear** </li></ul> |	Select the type of pool to be deployed on PowerVault. Ensure that all pools on the device are exclusively virtual or linear.
 	
 ## Configuring PowerVault Storage

docs/control_plane/device_templates/PROVISION_SERVERS.md

@@ -52,7 +52,7 @@ The **provision_idrac** file configures and validates the following:
 
 After the configurations are validated, the **provision_idrac** file provisions the custom ISO on the PowerEdge Servers. After the OS is provisioned successfully, iDRAC IP addresses are updated in the *provisioned_idrac_inventory* in AWX.
 
-**NOTE**: The `idrac.yml` file initiates the provisioning of custom ISO on the PowerEdge servers. Wait for some time for the node inventory to be updated on the AWX UI. 
+>>**NOTE**: The `idrac.yml` file initiates the provisioning of custom ISO on the PowerEdge servers. Wait for some time for the node inventory to be updated on the AWX UI. 
 
 ### Provisioning newly added PowerEdge servers in the cluster
 To provision newly added servers, wait till the iDRAC IP addresses are automatically added to the *idrac_inventory*. After the iDRAC IP addresses are added, launch the iDRAC template on the AWX UI to provision CentOS custom OS on the servers.  
@@ -73,11 +73,13 @@ To create the Cobbler image, Omnia configures the following:
 To access the Cobbler dashboard, enter `https://<IP>/cobbler_web` where `<IP>` is the Global IP address of the management station. For example, enter
 `https://100.98.24.225/cobbler_web` to access the Cobbler dashboard.
 
-__Note__: After the Cobbler Server provisions the operating system on the servers, IP addresses and hostnames are assigned by the DHCP service.  
-* If a mapping file is not provided, the hostname to the server is provided based on the following format: **computexxx-xxx** where "xxx-xxx" is the last two octets of the Host IP address. For example, if the Host IP address is 172.17.0.11 then the assigned hostname by Omnia is compute0-11.  
-* If a mapping file is provided, the hostnames follow the format provided in the mapping file.  
+>>__Note__: After the Cobbler Server provisions the operating system on the servers, IP addresses and hostnames are assigned by the DHCP service.  
+>>* If a mapping file is not provided, the hostname to the server is provided based on the following format: **computexxx-xxx** where "xxx-xxx" is the last two octets of the Host IP address. For example, if the Host IP address is 172.17.0.11 then the assigned hostname by Omnia is compute0-11.  
+>>* If a mapping file is provided, the hostnames follow the format provided in the mapping file.  
 
-__Note__: If you want to add more nodes, append the new nodes in the existing mapping file. However, do not modify the previous nodes in the mapping file as it may impact the existing cluster.
+>>__Note__: If you want to add more nodes, append the new nodes in the existing mapping file. However, do not modify the previous nodes in the mapping file as it may impact the existing cluster.
+
+>> __Note__: During a Cobbler based deployment, only one OS is supported at a time. If the user would like to deploy both, please deploy one first, **unmount `/mnt/iso`** and then re-run Cobbler for the second OS.
 
 ## Security enhancements  
 Omnia provides the following options to enhance security on the provisioned PowerEdge servers:
@@ -101,7 +103,7 @@ Omnia provides the following options to enhance security on the provisioned Powe
 	<br>	|	smtp_username</br> [Optional]	|		|	Username for SMTP.
 	<br>	|	smtp_password</br> [Optional]	|		|	Password for SMTP.
 
-	**NOTE**: 2FA will be enabled on the iDRAC only if SMTP server details are valid and a test email notification is working using SMTP.  
+	>>**NOTE**: 2FA will be enabled on the iDRAC only if SMTP server details are valid and a test email notification is working using SMTP.  
 * **LDAP Directory Services**: To enable or disable the LDAP directory services, set the *ldap_directory_services* variable to "enabled" in the `idrac_vars.yml` file.  
 
 	Before executing the **idrac_ldap.yml** file, you must edit `idrac_tools_vars.yml` by running the following command: `ansible-vault edit idrac_tools_vars.yml --vault-password-file .idrac_vault_key`.  
@@ -125,7 +127,7 @@ Omnia provides the following options to enhance security on the provisioned Powe
 	
 	To view the `idrac_tools_vars.yml` file, run the following command: `ansible-vault view idrac_tools_vars.yml --vault-password-file .idrac_vault_key`  
 	
-	**NOTE**: It is suggested that you use the ansible-vault view or edit commands and that you do not use the ansible-vault decrypt or encrypt commands. If you have used the ansible-vault decrypt or encrypt commands, provide 644 permission to `idrac_tools_vars.yml`.  
+	>>**NOTE**: It is suggested that you use the ansible-vault view or edit commands and that you do not use the ansible-vault decrypt or encrypt commands. If you have used the ansible-vault decrypt or encrypt commands, provide 644 permission to `idrac_tools_vars.yml`.  
 
 On the AWX Dashboard, select the respective security requirement playbook and launch the iDRAC template by performing the following steps.
 1. On the AWX Dashboard, under __RESOURCES__ -> __Templates__, select the **idrac_template**.

docs/control_plane/input_parameters/POWERVAULT_STORAGE.md

@@ -30,6 +30,7 @@ Under the `control_plane/input_params` directory, edit the following files:
 	powervault_me4_volume_size [Required] |	<ul><li>**100GB**</li><li>Custom value</li></ul> |	Enter the volume size in the format: *SizeTB*, *SizeGB*, *SizeMB*, or *SizeB*.  
 	powervault_me4_pool [Required] |	<ul><li>**a** (or A)</li><li>b (or B)</li></ul> |	Enter the pool for the volume.
 	powervault_me4_pool_type [Required] |	<ul><li>Virtual</li><li>**Linear** </li></ul> |	Select the type of pool to be deployed on PowerVault. Ensure that all pools on the device are exclusively virtual or linear.
+	powervault_me4_server_nic [Required] |	<ul><li>**eno1**</li></ul> |	Enter the NIC of the server to which the PowerVault Storage is connected.
 		
 	
 ## Deploy Omnia Control Plane