openstack/ironic
Code Issues Proposed changes

Merge "Devstack - run vbmc as sudo"

Browse Source
This commit is contained in:
Zuul 2019-02-19 14:00:29 +00:00 committed by Gerrit Code Review
commit 6cb27e71f7
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/ironic
View File

@ -2438,6 +2438,8 @@ function cleanup_baremetal_basic_ops {
done
done
sudo killall vbmc || true
sudo ovs-vsctl --if-exists del-br $IRONIC_VM_NETWORK_BRIDGE
sudo rm -rf /etc/xinetd.d/tftp /etc/init/tftpd-hpa.override

2
devstack/tools/ironic/scripts/cleanup-node.sh
View File

@ -23,7 +23,7 @@ virsh list --inactive | grep -q $NAME && virsh undefine $NAME --nvram
# Delete the Virtual BMC
if [[ $(type -P vbmc) != "" ]]; then
vbmc list | grep -a $NAME && vbmc delete $NAME
sudo vbmc list | grep -a $NAME && sudo vbmc delete $NAME
fi
if virsh pool-list | grep -q $LIBVIRT_STORAGE_POOL ; then

4
devstack/tools/ironic/scripts/create-node.sh
View File

@ -131,8 +131,8 @@ if ! virsh list --all | grep -q $NAME; then
# Createa Virtual BMC for the node if IPMI is used
if [[ $(type -P vbmc) != "" ]]; then
vbmc add $NAME --port $VBMC_PORT
vbmc start $NAME
sudo vbmc add $NAME --port $VBMC_PORT
sudo vbmc start $NAME
fi
fi