summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
c8483ee)
This is a necessary prerequisite for QAT support.
Issue-ID: ICN-513
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I54d9a8906210ea467fc6822388da981abf9afa48
kubectl apply -f $BMODIR/operator/no_ironic/operator.yaml -n metal3
}
kubectl apply -f $BMODIR/operator/no_ironic/operator.yaml -n metal3
}
-network_config_files() {
-cat << 'EOF'
+function cloud_init_scripts() {
+ cat << 'EOF'
-- path: /opt/ironic_net.sh
+- path: /var/lib/cloud/scripts/per-boot/run_dhclient.sh
owner: root:root
permissions: '0777'
content: |
owner: root:root
permissions: '0777'
content: |
sudo ifconfig `basename $intf` up
sudo dhclient -nw `basename $intf`
done
sudo ifconfig `basename $intf` up
sudo dhclient -nw `basename $intf`
done
-runcmd:
- - [ /opt/ironic_net.sh ]
fi
cat $HOME/.ssh/id_rsa.pub >> $name-userdata.yaml
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
}
printf "\n" >> $name-userdata.yaml
}
fi
cat $HOME/.ssh/id_rsa.pub >> $name-userdata.yaml
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
}
printf "\n" >> $name-userdata.yaml
}
kubectl delete -f bmo/namespace/namespace.yaml
}
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:
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: |
owner: root:root
permissions: '0777'
content: |
sudo dhclient -nw `basename $intf`
done
EOF
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: |
owner: root:root
permissions: '0777'
content: |
sed -i -e 's/^#DNS=.*/DNS=$PROVIDER_NETWORK_DNS/g' /etc/systemd/resolved.conf
systemctl daemon-reload
systemctl restart systemd-resolved
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 ]