storage: fill NVMe-oF gaps in non-interactive mode, HA config, and target VM setup

Add NVMEOF_NQN, NVMEOF_ADDR, NVMEOF_PORT to the non-interactive
detection guard so that answer-file deployment works for NVMe-oF.

Define NVMEOF_DOMAIN=12 in VDSMConstants and NVMEOF in
StorageDomainType for consistency with engine and VDSM.

Include nvmeof_address, nvmeof_port, nvmeof_nqn, nvmeof_host_nqn,
and nvmeof_dhchap_key in hosted-engine.conf template so the HA
broker can reconnect NVMe-oF storage after a failover or restart.

Pass all five NVMe-oF variables through to the ansible target-vm
role so the engine VM can be provisioned on NVMe-oF storage.

Part of the NVMe-oF/TCP storage domain feature.

Signed-off-by: Thibaut Demaret <thidem@worteks.com>

Author: Thibaut Demaret

src/ovirt_hosted_engine_setup/constants.py

@@ -114,6 +114,7 @@ class VDSMConstants(object):
     ISCSI_DOMAIN = 3
     POSIXFS_DOMAIN = 6
     GLUSTERFS_DOMAIN = 7
+    NVMEOF_DOMAIN = 12
     DATA_DOMAIN = 1
 
 
@@ -128,6 +129,7 @@ class StorageDomainType(object):
     CIFS = "CIFS"
     SHAREDFS = "SHAREDFS"
     GLUSTERFS = "GLUSTERFS"
+    NVMEOF = "NVMEOF"
 
 
 @util.export

src/plugins/gr-he-ansiblesetup/core/storage_domain.py

@@ -551,7 +551,9 @@ def _closeup(self):
             or self.environment[ohostedcons.StorageEnv.ISCSI_USER] is not None
             or self.environment[ohostedcons.StorageEnv.ISCSI_PASSWORD] is not None
             or self.environment[ohostedcons.StorageEnv.ISCSI_TARGET] is not None
-            or self.environment[ohostedcons.StorageEnv.ISCSI_TARGET] is not None
+            or self.environment[ohostedcons.StorageEnv.NVMEOF_NQN] is not None
+            or self.environment[ohostedcons.StorageEnv.NVMEOF_ADDR] is not None
+            or self.environment[ohostedcons.StorageEnv.NVMEOF_PORT] is not None
         ):
             interactive = False
         while not created:

src/plugins/gr-he-ansiblesetup/core/target_vm.py

@@ -164,6 +164,21 @@ def _closeup(self):
             'he_lun_id': self.environment[
                 ohostedcons.StorageEnv.LUN_ID
             ],
+            'he_nvmeof_address': self.environment[
+                ohostedcons.StorageEnv.NVMEOF_ADDR
+            ],
+            'he_nvmeof_port': self.environment[
+                ohostedcons.StorageEnv.NVMEOF_PORT
+            ],
+            'he_nvmeof_nqn': self.environment[
+                ohostedcons.StorageEnv.NVMEOF_NQN
+            ],
+            'he_nvmeof_host_nqn': self.environment[
+                ohostedcons.StorageEnv.NVMEOF_HOST_NQN
+            ],
+            'he_nvmeof_dhchap_key': self.environment[
+                ohostedcons.StorageEnv.NVMEOF_DHCHAP_KEY
+            ],
             'he_cdrom_uuid': self.environment[ohostedcons.VMEnv.CDROM_UUID],
             'he_nic_uuid': self.environment[ohostedcons.VMEnv.NIC_UUID],
             'he_maxvcpus': self.environment[ohostedcons.VMEnv.MAXVCPUS],

templates/hosted-engine.conf.in

@@ -29,3 +29,10 @@ portal=@PORTAL@
 user=@USER@
 password=@PASSWORD@
 port=@PORT@
+
+# The following are used only for NVMe-oF storage
+nvmeof_address=@NVMEOF_ADDR@
+nvmeof_port=@NVMEOF_PORT@
+nvmeof_nqn=@NVMEOF_NQN@
+nvmeof_host_nqn=@NVMEOF_HOST_NQN@
+nvmeof_dhchap_key=@NVMEOF_DHCHAP_KEY@