diff options
| author | Ilya Etingof <etingof@gmail.com> | 2019-03-28 19:25:28 +0100 |
|---|---|---|
| committer | Ilya Etingof <etingof@gmail.com> | 2019-04-09 14:06:20 +0200 |
| commit | 01b0be9db2c2ce87d5d2fc8d84bb1e6339bc0248 (patch) | |
| tree | 3201ddec2af7a8553735a9ce819026b9d342fee9 /devstack/tools/ironic/scripts | |
| parent | 380519c07fc69625f786757e8ecfec9a0fb7ee44 (diff) | |
| download | ironic-01b0be9db2c2ce87d5d2fc8d84bb1e6339bc0248.tar.gz | |
Improve VirtualBMC use in Devstack
This patch brings two somewhat related changes:
1. Older versions of VirtualBMC worked without any server keeping
state on the filesystem. The contemporary version is build around
client-server model. To preserve backward compatibility, the
`vbmc` client would invoke `vbmcd` behind the scenes if the daemon
is not running.
This change inhibits this automatic `vbmcd` start behaviour because
devstack invokes `vbmcd` explicitly through systemd.
2. This patch makes Devstack messing with VirtualBMC only if it is
determined that IPMI deployment is required. Otherwise (e.g.
Redfish deployment is planned) Devstack will not attempt to
start/stop IPMI emulation.
Change-Id: Id9a2ed71a997fb13523a77563d6e941904675f97
Diffstat (limited to 'devstack/tools/ironic/scripts')
| -rwxr-xr-x | devstack/tools/ironic/scripts/cleanup-node.sh | 5 | ||||
| -rwxr-xr-x | devstack/tools/ironic/scripts/create-node.sh | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/devstack/tools/ironic/scripts/cleanup-node.sh b/devstack/tools/ironic/scripts/cleanup-node.sh index 466b7059b..c53daa9ec 100755 --- a/devstack/tools/ironic/scripts/cleanup-node.sh +++ b/devstack/tools/ironic/scripts/cleanup-node.sh @@ -21,11 +21,6 @@ VOL_NAME="$NAME.qcow2" virsh list | grep -q $NAME && virsh destroy $NAME 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 -fi - if virsh pool-list | grep -q $LIBVIRT_STORAGE_POOL ; then virsh vol-list $LIBVIRT_STORAGE_POOL | grep -q $VOL_NAME && virsh vol-delete $VOL_NAME --pool $LIBVIRT_STORAGE_POOL diff --git a/devstack/tools/ironic/scripts/create-node.sh b/devstack/tools/ironic/scripts/create-node.sh index 077d21246..67d261572 100755 --- a/devstack/tools/ironic/scripts/create-node.sh +++ b/devstack/tools/ironic/scripts/create-node.sh @@ -128,12 +128,6 @@ if ! virsh list --all | grep -q $NAME; then --arch $ARCH --cpus $CPU --memory $MEM --libvirt-nic-driver $LIBVIRT_NIC_DRIVER \ --disk-format $DISK_FORMAT $VM_LOGGING --engine $ENGINE $UEFI_OPTS $vm_opts \ --interface-count $INTERFACE_COUNT $MAC_ADDRESS >&2 - - # Create Virtual BMC for the node if IPMI is used - if [[ $(type -P vbmc) != "" ]]; then - vbmc add $NAME --port $VBMC_PORT - vbmc start $NAME - fi fi # echo mac in format mac1,ovs-node-0i1;mac2,ovs-node-0i2;...;macN,ovs-node0iN |