X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fmetal3%2Fscripts%2F01_metal3.sh;h=08d8c760bd04f2945c360cc6d6dfef5dfa53b229;hb=a6869afd7e0619422d78166a0190c8a17971231e;hp=75719e33525bebeb9ec7e97b31081236a4733640;hpb=b82ae6975d26581802457364993bee061350ae32;p=icn.git

diff --git a/deploy/metal3/scripts/01_metal3.sh b/deploy/metal3/scripts/01_metal3.sh
index 75719e3..08d8c76 100755
--- a/deploy/metal3/scripts/01_metal3.sh
+++ b/deploy/metal3/scripts/01_metal3.sh
@@ -15,7 +15,7 @@ fi
 IMAGE_URL=http://172.22.0.1/images/${BM_IMAGE}
 IMAGE_CHECKSUM=http://172.22.0.1/images/${BM_IMAGE}.md5sum
 
-function get_default_inteface_ipaddress {
+function get_default_interface_ipaddress {
     local _ip=$1
     local _default_interface=$(awk '$2 == 00000000 { print $1 }' /proc/net/route)
     local _ipv4address=$(ip addr show dev $_default_interface | awk '$1 == "inet" { sub("/.*", "", $2); print $2 }')
@@ -48,7 +48,7 @@ function deprovision_compute_node {
 }
 
 function set_compute_ssh_config {
-    get_default_inteface_ipaddress default_addr
+    get_default_interface_ipaddress default_addr
     cat << EOF
 - path: /root/.ssh/config
     owner: root:root
@@ -93,32 +93,22 @@ function create_userdata {
 }
 
 function launch_baremetal_operator {
-    if [ ! -d $GOPATH/src/github.com/metal3-io/baremetal-operator ]; then
-        go get github.com/metal3-io/baremetal-operator
-        git checkout 3d40caa29dce82878d83aeb7f8dab4dc4a856160
-    fi
-
-    pushd $GOPATH/src/github.com/metal3-io/baremetal-operator
-    docker pull quay.io/metal3-io/baremetal-operator:master
-    make deploy
-    popd
+    docker pull integratedcloudnative/baremetal-operator:v1.0-icn
+    kubectl apply -f bmo/namespace/namespace.yaml
+    kubectl apply -f bmo/rbac/service_account.yaml -n metal3
+    kubectl apply -f bmo/rbac/role.yaml -n metal3
+    kubectl apply -f bmo/rbac/role_binding.yaml
+    kubectl apply -f bmo/crds/metal3.io_baremetalhosts_crd.yaml
+    kubectl apply -f bmo/operator/no_ironic/operator.yaml -n metal3
 }
 
 function remove_baremetal_operator {
-    if [ ! -d $GOPATH/src/github.com/metal3-io/baremetal-operator ]; then
-        go get github.com/metal3-io/baremetal-operator
-        git checkout 3d40caa29dce82878d83aeb7f8dab4dc4a856160
-    fi
-
-    pushd $GOPATH/src/github.com/metal3-io/baremetal-operator
-        kubectl delete -f deploy/operator.yaml -n metal3
-        kubectl delete -f deploy/crds/metal3_v1alpha1_baremetalhost_crd.yaml
-        kubectl delete -f deploy/role_binding.yaml
-        kubectl delete -f deploy/role.yaml -n metal3
-        kubectl delete -f deploy/service_account.yaml -n metal3
-        kubectl delete ns metal3
-        docker rmi quay.io/metal3-io/baremetal-operator:master
-    popd
+    kubectl delete -f bmo/operator/no_ironic/operator.yaml -n metal3
+    kubectl delete -f bmo/crds/metal3.io_baremetalhosts_crd.yaml
+    kubectl delete -f bmo/rbac/role_binding.yaml
+    kubectl delete -f bmo/rbac/role.yaml -n metal3
+    kubectl delete -f bmo/rbac/service_account.yaml -n metal3
+    kubectl delete -f bmo/namespace/namespace.yaml
 }
 
 function network_config_files {
@@ -210,11 +200,25 @@ function cleanup {
         kubectl delete bmh $name -n metal3
         kubectl delete secrets $name-bmc-secret -n metal3
         kubectl delete secrets $name-user-data -n metal3
+        if [ -f $name-bm-node.yaml ]; then
+            rm -rf $name-bm-node.yaml
+        fi
+
+        if [ -f $name-user-data-credential.yaml ]; then
+            rm -rf $name-user-data-credential.yaml
+        fi
+
+        if [ -f $name-userdata.yaml ]; then
+            rm -rf $name-userdata.yaml
+        fi
     done
 }
 
 function clean_all {
     list_nodes | cleanup
+    if [ -f $IRONIC_DATA_DIR/nodes.json ]; then
+        rm -rf $IRONIC_DATA_DIR/nodes.json
+    fi
 }
 
 function apply_bm_hosts {