Merge pull request #917 from ASBishop/fix-nvme-hostnqn

Ensure EDPM nodes have a unique NVMe NQN

Author: openshift-merge-bot[bot]

devsetup/scripts/gen-edpm-node-bgp.sh

@@ -218,6 +218,9 @@ sed -i /PERSISTENT_DHCLIENT/d /etc/sysconfig/network-scripts/ifcfg-eth0
 systemctl restart NetworkManager
 ip r add default via 192.168.122.1
 
+# Remove stale artifacts that are auto-generated during EDPM deployment
+rm -f /etc/nvme/hostid /etc/nvme/hostnqn
+
 EOF
 done
 

devsetup/scripts/gen-edpm-node.sh

@@ -273,6 +273,9 @@ echo DNS1=$DNS >> $NETSCRIPT
 sed -i s/dhcp/none/g $NETSCRIPT
 sed -i /PERSISTENT_DHCLIENT/d $NETSCRIPT
 
+# Remove NVMe artifacts that are auto-generated when nvme-cli RPM is installed
+rm -f /etc/nvme/hostid /etc/nvme/hostnqn
+
 # Additional commands
 
 EOF