x
/
fuel-plugin-mellanox
Code Issues Proposed changes

Fix_rediscovering_nodes_fuel_7.0 

In Fuel 7.0, nodes are not rediscovered after an env being reset or deleted because there's
no bootstrap folder included under mellanox plugin folder. In 7.0 when nodes boot they will be using
Mirantis bootstrap images.

Change-Id: Iad1db9fb66f01e798bf53dfda53d76ba899abb40
This commit is contained in:
Rawan Herzallah 2015-11-17 12:31:05 +00:00
parent 1cc660e344
commit d7286d73ba
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
metadata.yaml
View File

@ -5,7 +5,7 @@ name: mellanox-plugin
title: Mellanox Openstack features
# Plugin version
version: 1.0.8
version: 1.0.9
# Description
description: Enable features over Mellanox hardware

24
specs/post.spec
View File

@ -6,17 +6,19 @@ if [ -d "/var/www/nailgun/bootstrap/" ]; then
fi
# If an old bootstrap already exists in the backup dir do not override it with the plugins's new bootstrap
if [ ! -f /opt/old_bootstrap_image/initramfs.img ]; then
mv /var/www/nailgun/bootstrap/initramfs.img /opt/old_bootstrap_image/
mv /var/www/nailgun/bootstrap/linux /opt/old_bootstrap_image/
\cp /var/www/nailgun/bootstrap/initramfs.img /opt/old_bootstrap_image/
\cp /var/www/nailgun/bootstrap/linux /opt/old_bootstrap_image/
fi
\cp $(ls /var/www/nailgun/plugins/mellanox-plugin*/bootstrap/initramfs.img) /var/www/nailgun/bootstrap/
\cp $(ls /var/www/nailgun/plugins/mellanox-plugin*/bootstrap/linux) /var/www/nailgun/bootstrap/
command -v dockerctl >/dev/null 2>&1
if [ $? -eq 0 ];then
dockerctl copy /var/www/nailgun/bootstrap/initramfs.img cobbler:/var/lib/tftpboot/images/bootstrap/initramfs.img
dockerctl copy /var/www/nailgun/bootstrap/linux cobbler:/var/lib/tftpboot/images/bootstrap/linux
\cp $(ls /var/www/nailgun/plugins/mellanox-plugin*/scripts/reboot_bootstrap_nodes) /sbin/
echo " `tput bold`Bootstrap discovery image has been replaced for detecting Mellanox Infiniband HW."
echo " please reboot your old bootstrap nodes ('reboot_bootstrap_nodes [-e environment_id] [-a] [-h]' can be used).`tput sgr0`"
if ! [[ `grep release /etc/fuel/version.yaml | grep "7.0"` ]]; then
\cp $(ls /var/www/nailgun/plugins/mellanox-plugin*/bootstrap/initramfs.img) /var/www/nailgun/bootstrap/
\cp $(ls /var/www/nailgun/plugins/mellanox-plugin*/bootstrap/linux) /var/www/nailgun/bootstrap/
command -v dockerctl >/dev/null 2>&1
if [ $? -eq 0 ];then
dockerctl copy /var/www/nailgun/bootstrap/initramfs.img cobbler:/var/lib/tftpboot/images/bootstrap/initramfs.img
dockerctl copy /var/www/nailgun/bootstrap/linux cobbler:/var/lib/tftpboot/images/bootstrap/linux
\cp $(ls /var/www/nailgun/plugins/mellanox-plugin*/scripts/reboot_bootstrap_nodes) /sbin/
echo " `tput bold`Bootstrap discovery image has been replaced for detecting Mellanox Infiniband HW."
echo " please reboot your old bootstrap nodes ('reboot_bootstrap_nodes [-e environment_id] [-a] [-h]' can be used).`tput sgr0`"
fi
fi
fi