Merge "Add virtualbox support"
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 483afe2..a4429b9 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -576,7 +576,7 @@
net.ipv4.conf.all.rp_filter=0
net.ipv4.conf.default.rp_filter=0
EOF
- for iface in /proc/sys/net/ipv4/conf/ens*/rp_filter; do
+ for iface in /proc/sys/net/ipv4/conf/en[sp]*/rp_filter; do
echo 0 > $iface
done
diff --git a/trymos/image_build/files/usr/share/trymos/launch.sh b/trymos/image_build/files/usr/share/trymos/launch.sh
index c37dfd6..33025d3 100755
--- a/trymos/image_build/files/usr/share/trymos/launch.sh
+++ b/trymos/image_build/files/usr/share/trymos/launch.sh
@@ -22,7 +22,7 @@
function get_instance_type {
if grep "OpenStack" -i /sys/devices/virtual/dmi/id/product_name -q; then
echo "openstack"
- elif grep "amazon" -i /sys/devices/virtual/dmi/id/product_version -q; then
+ elif grep -iq 'amazon' /sys/devices/virtual/dmi/id/{product_version,sys_vendor}; then
echo "amazon"
elif grep "virtualbox" -i /sys/devices/virtual/dmi/id/product_name -q; then
echo "virtualbox"
@@ -224,6 +224,9 @@
}
function install_release_controllers {
+ if [[ -f "${RELEASE_OPENSTACK_K8S}/release/ci/50-nodemaintenance.yaml" ]]; then
+ kubectl apply -f ${RELEASE_OPENSTACK_K8S}/release/ci/50-nodemaintenance.yaml
+ fi
for release_object in $(ls ${RELEASE_OPENSTACK_K8S}/release/*.yaml -1); do
info "Installing ${release_object}"