Merge "Modified BPA controller and fixed bugs"

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

diff --git a/env/metal3/02_configure.sh b/env/metal3/02_configure.sh
index eabf780..3117027 100755 (executable)
--- a/env/metal3/02_configure.sh
+++ b/env/metal3/02_configure.sh
@@ -131,16 +131,21 @@ function configure_ironic {
        return
     fi
 
-    podman pull $IRONIC_IMAGE
-    podman pull $IRONIC_INSPECTOR_IMAGE
+    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 [ ! -f ironic-python-agent.initramfs ]; then
-       curl --insecure --compressed -L https://images.rdoproject.org/master/rdo_trunk/current-tripleo-rdo/ironic-python-agent.tar | tar -xf -
-    fi
-
     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
@@ -149,8 +154,9 @@ function configure_ironic {
 }
 
 function configure {
-    configure_kubeadm $1
-    configure_kubelet
+    #Kubeadm usage deprecated for v1.0.0 release
+    #configure_kubeadm $1
+    #configure_kubelet
     configure_ironic $1
     configure_dhcp_bridge
     configure_ironic_bridge