Remove unnecessary IRONIC_IPMI_INTERFACE

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

diff --git a/README.md b/README.md
index 9ca60b4..6034c97 100644 (file)
--- a/README.md
+++ b/README.md
@@ -138,9 +138,6 @@ The user will find the network configuration file named as
 
 #Ironic Metal3 settings for provisioning network (Net B)
 export IRONIC_INTERFACE="eno2"
-
-#Ironic Metal3 setting for IPMI LAN Network (Net C)
-export IRONIC_IPMI_INTERFACE="eno1"
 ```
 
 #### Running

diff --git a/env/lib/common.sh b/env/lib/common.sh
index 7a91208..07eb7f1 100755 (executable)
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -6,7 +6,6 @@ NODES_FILE=${NODES_FILE:-"${IRONIC_DATA_DIR}/nodes.json"}
 #IRONIC_PROVISIONING_INTERFACE is required to be provisioning, don't change it
 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"}
 BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"}
 BM_IMAGE=${BM_IMAGE:-"focal-server-cloudimg-amd64.img"}

diff --git a/env/metal3/02_configure.sh b/env/metal3/02_configure.sh
index 9855522..c20ff11 100755 (executable)
--- a/env/metal3/02_configure.sh
+++ b/env/metal3/02_configure.sh
@@ -48,11 +48,6 @@ function configure_ironic_interfaces {
         fi
     done
 
-    # Allow ipmi to the bmc processes
-    if ! sudo iptables -C INPUT -i $IRONIC_IPMI_INTERFACE -p udp -m udp --dport 6230:6235 -j ACCEPT 2>/dev/null ; then
-        sudo iptables -I INPUT -i $IRONIC_IPMI_INTERFACE -p udp -m udp --dport 6230:6235 -j ACCEPT
-    fi
-
     #Allow access to dhcp and tftp server for pxeboot
     for port in 67 69 ; do
         if ! sudo iptables -C INPUT -i $IRONIC_PROVISIONING_INTERFACE -p udp --dport $port -j ACCEPT 2>/dev/null ; then

diff --git a/tools/vagrant/create_user_config.sh b/tools/vagrant/create_user_config.sh
index bda1491..33850c8 100755 (executable)
--- a/tools/vagrant/create_user_config.sh
+++ b/tools/vagrant/create_user_config.sh
@@ -6,7 +6,4 @@ cat <<EOF >user_config.sh
 
 #Ironic Metal3 settings for provisioning network
 export IRONIC_INTERFACE="eth1"
-
-#Ironic Metal3 setting for IPMI LAN Network
-export IRONIC_IPMI_INTERFACE="eth0"
 EOF

diff --git a/user_config.sh b/user_config.sh
index 8ff2255..c172caf 100644 (file)
--- a/user_config.sh
+++ b/user_config.sh
@@ -2,6 +2,3 @@
 
 #Ironic Metal3 settings for provisioning network
 export IRONIC_INTERFACE="enp4s0f3"
-
-#Ironic Metal3 setting for IPMI LAN Network
-export IRONIC_IPMI_INTERFACE="eno1"