X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=deploy%2Fmetal3%2Fscripts%2F01_metal3.sh;h=ac6a80b2d58877278cfd932eb6fbfab2ef379e80;hb=289b3d43bcbaa090619d60f5ccec3beeb808f904;hp=f1b827b9cd2471dac6320609f0ccd57ef93e4acd;hpb=4af76f3aff2833922846f7cbf6fc3490dd72ea93;p=icn.git

diff --git a/deploy/metal3/scripts/01_metal3.sh b/deploy/metal3/scripts/01_metal3.sh
index f1b827b..ac6a80b 100755
--- a/deploy/metal3/scripts/01_metal3.sh
+++ b/deploy/metal3/scripts/01_metal3.sh
@@ -59,8 +59,10 @@ EOF
 
 function deprovision_compute_node {
     name="$1"
-    kubectl patch baremetalhost $name -n metal3 --type merge \
-    -p '{"spec":{"image":{"url":"","checksum":""}}}'
+    if kubectl get baremetalhost $name -n metal3 &>/dev/null; then
+        kubectl patch baremetalhost $name -n metal3 --type merge \
+        -p '{"spec":{"image":{"url":"","checksum":""}}}'
+    fi
 }
 
 function set_compute_ssh_config {
@@ -128,12 +130,12 @@ EOF
     fi
 
     cat $HOME/.ssh/id_rsa.pub >>  $name-userdata.yaml
-    network_config_files >> $name-userdata.yaml
+    cloud_init_scripts >> $name-userdata.yaml
     printf "\n" >>  $name-userdata.yaml
 }
 
 function launch_baremetal_operator {
-    docker pull integratedcloudnative/baremetal-operator:v1.0-icn
+    docker pull $IRONIC_BAREMETAL_IMAGE
     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
@@ -151,10 +153,25 @@ function remove_baremetal_operator {
     kubectl delete -f bmo/namespace/namespace.yaml
 }
 
-function network_config_files {
+function cloud_init_scripts {
+    # The "intel_iommu=on iommu=pt" kernel command line is necessary
+    # for QAT support.
     cat << 'EOF'
 write_files:
-- path: /opt/ironic_net.sh
+- path: /var/lib/cloud/scripts/per-instance/set_kernel_cmdline.sh
+  owner: root:root
+  permissions: '0777'
+  content: |
+    #!/usr/bin/env bash
+    set -eux -o pipefail
+    grub_file=${1:-"/etc/default/grub"}
+    kernel_parameters="intel_iommu=on iommu=pt"
+    sed -i~ "/^GRUB_CMDLINE_LINUX=/{h;s/\(=\".*\)\"/\1 ${kernel_parameters}\"/};\${x;/^$/{s//GRUB_CMDLINE_LINUX=\"${kernel_parameters}\"/;H};x}" "$grub_file"
+    update-grub
+    reboot
+EOF
+    cat << 'EOF'
+- path: /var/lib/cloud/scripts/per-boot/run_dhclient.sh
   owner: root:root
   permissions: '0777'
   content: |
@@ -165,8 +182,8 @@ write_files:
         sudo dhclient -nw `basename $intf`
     done
 EOF
-cat << EOF
-- path: /opt/user_net.sh
+    cat << EOF
+- path: /var/lib/cloud/scripts/per-boot/set_provider_network.sh
   owner: root:root
   permissions: '0777'
   content: |
@@ -176,9 +193,6 @@ cat << EOF
     sed -i -e 's/^#DNS=.*/DNS=$PROVIDER_NETWORK_DNS/g' /etc/systemd/resolved.conf
     systemctl daemon-reload
     systemctl restart systemd-resolved
-runcmd:
- - [ /opt/ironic_net.sh ]
- - [ /opt/user_net.sh ]
 EOF
 }
 
@@ -202,7 +216,7 @@ function make_bm_hosts {
         create_userdata $name $os_username $os_password
         apply_userdata_credential $name
 
-        go run $GOPATH/src/github.com/metal3-io/baremetal-operator/cmd/make-bm-worker/main.go \
+        GO111MODULE=auto go run $GOPATH/src/github.com/metal3-io/baremetal-operator/cmd/make-bm-worker/main.go \
            -address "ipmi://$ipmi_address" \
            -password "$ipmi_password" \
            -user "$ipmi_username" \
@@ -213,7 +227,9 @@ function make_bm_hosts {
         printf "\n    checksum: ""%s" "$IMAGE_CHECKSUM" >> $name-bm-node.yaml
         printf "\n  userData:" >> $name-bm-node.yaml
         printf "\n    name: ""%s" "$name""-user-data" >> $name-bm-node.yaml
-        printf "\n    namespace: metal3\n" >> $name-bm-node.yaml
+        printf "\n    namespace: metal3" >> $name-bm-node.yaml
+        printf "\n  rootDeviceHints:" >> $name-bm-node.yaml
+        printf "\n    minSizeGigabytes: 48\n" >> $name-bm-node.yaml
         kubectl apply -f $name-bm-node.yaml -n metal3
     done
 }
@@ -237,9 +253,9 @@ function remove_bm_hosts {
 
 function cleanup {
     while IFS=',' read -r name ipmi_username ipmi_password ipmi_address os_username os_password os_image_name; do
-        kubectl delete bmh $name -n metal3
-        kubectl delete secrets $name-bmc-secret -n metal3
-        kubectl delete secrets $name-user-data -n metal3
+        kubectl delete --ignore-not-found=true bmh $name -n metal3
+        kubectl delete --ignore-not-found=true secrets $name-bmc-secret -n metal3
+        kubectl delete --ignore-not-found=true secrets $name-user-data -n metal3
         if [ -f $name-bm-node.yaml ]; then
             rm -rf $name-bm-node.yaml
         fi