From: Todd Malsbary <todd.malsbary@intel.com>
Date: Fri, 24 Sep 2021 23:23:41 +0000 (-0700)
Subject: Remove IRONIC_IPMI_INTERFACE_IP
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=d98881b7f45d17cc7deb0a772d09576ecce8cdc4;p=icn.git

Remove IRONIC_IPMI_INTERFACE_IP

The scripts don't actually do anything with it except to check that
it's assigned to IRONIC_IPMI_INTERFACE.

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I3699639a2264d184e52df6c6a45caab47dcb0402
---

diff --git a/README.md b/README.md
index a178995..070bd60 100644
--- a/README.md
+++ b/README.md
@@ -314,10 +314,6 @@ export IRONIC_INTERFACE="eno2"
 #Interface to which Ironic IPMI LAN should bind
 #Net C - IPMI LAN Network
 export IRONIC_IPMI_INTERFACE="eno1"
-
-#Interface IP for the IPMI LAN, ICN verfiy the LAN Connection is active or not
-#Net C - IPMI LAN Network
-export IRONIC_IPMI_INTERFACE_IP="10.10.10.10"
 ```
 
 #### Running
diff --git a/env/lib/common.sh b/env/lib/common.sh
index 86332d3..aa8a1e9 100755
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -15,7 +15,6 @@ IRONIC_INTERFACE=${IRONIC_INTERFACE:-}
 IRONIC_PROVISIONING_INTERFACE=${IRONIC_PROVISIONING_INTERFACE:-"provisioning"}
 IRONIC_IPMI_INTERFACE=${IRONIC_IPMI_INTERFACE:-}
 IRONIC_PROVISIONING_INTERFACE_IP=${IRONIC_PROVISIONING_INTERFACE_IP:-"172.22.0.1"}
-IRONIC_IPMI_INTERFACE_IP=${IRONIC_IPMI_INTERFACE_IP:-}
 BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img"}
 BM_IMAGE=${BM_IMAGE:-"bionic-server-cloudimg-amd64.img"}
 
diff --git a/env/metal3/02_configure.sh b/env/metal3/02_configure.sh
index 8bb1370..4531fdb 100755
--- a/env/metal3/02_configure.sh
+++ b/env/metal3/02_configure.sh
@@ -41,12 +41,6 @@ function configure_ironic_interfaces {
         exit 1
     fi
 
-    if [ "$IRONIC_IPMI_INTERFACE" ]; then
-        check_interface_ip $IRONIC_IPMI_INTERFACE $IRONIC_IPMI_INTERFACE_IP
-    else
-        exit 1
-    fi
-
     for port in 80 5050 6385 ; do
         if ! sudo iptables -C INPUT -i $IRONIC_PROVISIONING_INTERFACE -p tcp -m tcp --dport $port -j ACCEPT > /dev/null 2>&1; then
             sudo iptables -I INPUT -i $IRONIC_PROVISIONING_INTERFACE -p tcp -m tcp --dport $port -j ACCEPT
diff --git a/user_config.sh b/user_config.sh
index 5add4a9..8ff2255 100644
--- a/user_config.sh
+++ b/user_config.sh
@@ -5,4 +5,3 @@ export IRONIC_INTERFACE="enp4s0f3"
 
 #Ironic Metal3 setting for IPMI LAN Network
 export IRONIC_IPMI_INTERFACE="eno1"
-export IRONIC_IPMI_INTERFACE_IP="10.10.110.25"