Remove stale offline option to scripts

[icn.git] / env / metal3 / 02_configure.sh

diff --git a/env/metal3/02_configure.sh b/env/metal3/02_configure.sh
index d2842d2..8bb1370 100755 (executable)
--- a/env/metal3/02_configure.sh
+++ b/env/metal3/02_configure.sh
@@ -26,42 +26,14 @@ function check_interface_ip {
     fi
 }
 
-function configure_dhcp_bridge {
-    brctl addbr dhcp0
-    ip link set dhcp0 up
-    brctl addif dhcp0 $BS_DHCP_INTERFACE
-    ip addr add dev dhcp0 $BS_DHCP_INTERFACE_IP
-}
-
 function configure_ironic_bridge {
-    brctl addbr provisioning
+    ip link add dev provisioning type bridge
     ip link set provisioning up
-    brctl addif provisioning $IRONIC_INTERFACE
+    ip link set dev $IRONIC_INTERFACE master provisioning
     ip addr add dev provisioning 172.22.0.1/24
 }
 
-function configure_kubelet {
-    swapoff -a
-    #Todo addition kubelet configuration
-}
-
-function configure_kubeadm {
-    #Todo error handing
-    if [ "$1" == "offline" ]; then
-        for images in kube-apiserver kube-controller-manager kube-scheduler kube-proxy; do
-            docker load --input $CONTAINER_IMAGES_DIR/$images.tar;
-       done
-
-       docker load --input $CONTAINER_IMAGES_DIR/pause.tar
-       docker load --input $CONTAINER_IMAGES_DIR/etcd.tar
-       docker load --input $CONTAINER_IMAGES_DIR/coredns.tar
-        return
-    fi
-    kubeadm config images pull --kubernetes-version=$KUBE_VERSION
-}
-
 function configure_ironic_interfaces {
-    #Todo later to change the CNI networking for podman networking
     # Add firewall rules to ensure the IPA ramdisk can reach httpd, Ironic and the Inspector API on the host
     if [ "$IRONIC_PROVISIONING_INTERFACE" ]; then
         check_interface_ip $IRONIC_PROVISIONING_INTERFACE $IRONIC_PROVISIONING_INTERFACE_IP
@@ -94,45 +66,7 @@ function configure_ironic_interfaces {
     done
 }
 
-function configure_ironic_offline {
-    if [ ! -d $CONTAINER_IMAGES_DIR ] && [ ! -d $BUILD_DIR ]; then
-        exit 1
-    fi
-
-    for image in ironic-inspector-image ironic-image podman-pause \
-       baremetal-operator socat; do
-       if [ ! -f "$CONTAINER_IMAGES_DIR/$image" ]; then
-           exit 1
-       fi
-    done
-
-    if [ ! -f "$BUILD_DIR/ironic-python-agent.initramfs"] && [ ! -f \
-       "$BUILD_DIR/ironic-python-agent.kernel" ] && [ ! -f
-       "$BUILD_DIR/$BM_IMAGE" ]; then
-        exit 1
-    fi
-
-    podman load --input $CONTAINER_IMAGES_DIR/ironic-inspector-image.tar
-    podman load --input $CONTAINER_IMAGES_DIR/ironic-image.tar
-    podman load --input $CONTAINER_IMAGES_DIR/podman-pause.tar
-
-    docker load --input $CONTAINER_IMAGES_DIR/baremetal-operator.tar
-    docker load --input $CONTAINER_IMAGES_DIR/socat.tar
-
-    mkdir -p "$IRONIC_DATA_DIR/html/images"
-
-    cp $BUILD_DIR/ironic-python-agent.initramfs $IRONIC_DATA_DIR/html/images/
-    cp $BUILD_DIR/ironic-python-agent.kernel $IRONIC_DATA_DIR/html/images/
-    cp $BUILD_DIR/$BM_IMAGE $IRONIC_DATA_DIR/html/images/
-    md5sum $BUILD_DIR/$BM_IMAGE | awk '{print $1}' > $BUILD_DIR/${BM_IMAGE}.md5sum
-}
-
 function configure_ironic {
-    if [ "$1" == "offline" ]; then
-        configure_ironic_offline
-       return
-    fi
-
     for name in ironic ironic-inspector dnsmasq httpd mariadb ipa-downloader; do
         sudo docker ps | \
             grep -w "$name$" && sudo docker kill "$name"
@@ -156,19 +90,9 @@ function configure_ironic {
 }
 
 function configure {
-    #Kubeadm usage deprecated for v1.0.0 release
-    #configure_kubeadm $1
-    #configure_kubelet
-    configure_ironic $1
-    configure_dhcp_bridge
+    configure_ironic
     configure_ironic_bridge
     configure_ironic_interfaces
 }
 
-if [ "$#" -eq 0 ]; then
-    configure online
-elif [ "$1" == "-o" ]; then
-    configure offline
-else
-    exit 1
-fi
+configure