X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=env%2Fmetal3%2F02_configure.sh;h=c20ff116dcc7c29e7fca42830888a970f7977529;hb=038ef9e91d14bb90a81a6273a461a6472e18b408;hp=8bb1370a5c31e68a7e6f1c9e908e1166c885ba54;hpb=ec258715d6f8d779d79555a7c75ba28d4fef9170;p=icn.git

diff --git a/env/metal3/02_configure.sh b/env/metal3/02_configure.sh
index 8bb1370..c20ff11 100755
--- a/env/metal3/02_configure.sh
+++ b/env/metal3/02_configure.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 set -eux -o pipefail
 
-LIBDIR="$(dirname "$PWD")"
+SCRIPTDIR="$(readlink -f $(dirname ${BASH_SOURCE[0]}))"
+LIBDIR="$(dirname ${SCRIPTDIR})/lib"
 
-source $LIBDIR/lib/logging.sh
-source $LIBDIR/lib/common.sh
+source $LIBDIR/logging.sh
+source $LIBDIR/common.sh
 
 if [[ $EUID -ne 0 ]]; then
     echo "confgiure script must be run as root"
@@ -41,23 +42,12 @@ 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
         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
@@ -66,31 +56,7 @@ function configure_ironic_interfaces {
     done
 }
 
-function configure_ironic {
-    for name in ironic ironic-inspector dnsmasq httpd mariadb ipa-downloader; do
-        sudo docker ps | \
-            grep -w "$name$" && sudo docker kill "$name"
-        sudo docker ps --all | \
-            grep -w "$name$" && sudo docker rm "$name" -f
-    done
-    rm -rf "$IRONIC_DATA_DIR"
-
-    docker pull $IRONIC_IMAGE
-    docker pull $IRONIC_INSPECTOR_IMAGE
-    docker pull $IPA_DOWNLOADER_IMAGE
-
-    mkdir -p "$IRONIC_DATA_DIR/html/images"
-    pushd $IRONIC_DATA_DIR/html/images
-
-    if [[ "$BM_IMAGE_URL" && "$BM_IMAGE" ]]; then
-    	curl -o ${BM_IMAGE} --insecure --compressed -O -L ${BM_IMAGE_URL}
-    	md5sum ${BM_IMAGE} | awk '{print $1}' > ${BM_IMAGE}.md5sum
-    fi
-    popd
-}
-
 function configure {
-    configure_ironic
     configure_ironic_bridge
     configure_ironic_interfaces
 }