X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fmetal3%2Fscripts%2F01_metal3.sh;h=2ad233c9fcfe8508840c21b6fb92882dde8d0f84;hb=31a860f56b53eb51a7dc4189e6959a004733115e;hp=e8bad408a6f693edfde45a5b0955e951895fe308;hpb=deb3ca8295b2e585e47e51730252dc2ec1daa429;p=icn.git diff --git a/deploy/metal3/scripts/01_metal3.sh b/deploy/metal3/scripts/01_metal3.sh index e8bad40..2ad233c 100755 --- a/deploy/metal3/scripts/01_metal3.sh +++ b/deploy/metal3/scripts/01_metal3.sh @@ -15,6 +15,22 @@ fi IMAGE_URL=http://172.22.0.1/images/${BM_IMAGE} IMAGE_CHECKSUM=http://172.22.0.1/images/${BM_IMAGE}.md5sum +function clone_repos { + mkdir -p "${M3PATH}" + if [[ -d ${BMOPATH} && "${FORCE_REPO_UPDATE}" == "true" ]]; then + rm -rf "${BMOPATH}" + fi + if [ ! -d "${BMOPATH}" ] ; then + pushd "${M3PATH}" + git clone "${BMOREPO}" + popd + fi + pushd "${BMOPATH}" + git checkout "${BMOBRANCH}" + git pull -r || true + popd +} + function get_default_interface_ipaddress { local _ip=$1 local _default_interface=$(awk '$2 == 00000000 { print $1 }' /proc/net/route) @@ -43,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 { @@ -112,12 +130,17 @@ 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 } +create_networkdata() { + name="$1" + node_networkdata $name > $name-networkdata.json +} + 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 @@ -135,34 +158,22 @@ 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 - owner: root:root - permissions: '0777' - content: | - #!/usr/bin/env bash - set -xe - for intf in /sys/class/net/*; do - sudo ifconfig `basename $intf` up - sudo dhclient -nw `basename $intf` - done -EOF -cat << EOF -- path: /opt/user_net.sh +- path: /var/lib/cloud/scripts/per-instance/set_kernel_cmdline.sh owner: root:root permissions: '0777' content: | #!/usr/bin/env bash - set -xe - route add default gw $PROVIDER_NETWORK_GATEWAY - 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 ] + 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 } @@ -181,12 +192,29 @@ EOF kubectl apply -n metal3 -f $name-user-data-credential.yaml } +apply_networkdata_credential() { + name="$1" + cat < ./$name-network-data-credential.yaml +apiVersion: v1 +data: + networkData: $(base64 -w 0 $name-networkdata.json) +kind: Secret +metadata: + name: $name-network-data + namespace: metal3 +type: Opaque +EOF + kubectl apply -n metal3 -f $name-network-data-credential.yaml +} + function make_bm_hosts { while IFS=',' read -r name ipmi_username ipmi_password ipmi_address os_username os_password os_image_name; do create_userdata $name $os_username $os_password apply_userdata_credential $name + create_networkdata $name + apply_networkdata_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" \ @@ -197,7 +225,12 @@ 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 networkData:" >> $name-bm-node.yaml + printf "\n name: ""%s" "$name""-network-data" >> $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 } @@ -221,9 +254,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 @@ -254,6 +287,7 @@ function deprovision_all_hosts { } if [ "$1" == "launch" ]; then + clone_repos launch_baremetal_operator exit 0 fi