Browse code
Set VIRSH_DEFAULT_CONNECT_URI in Ironic scripts
Ironic setup scripts that interface with virsh should default to always
connecting to the 'qemu:///system' URI. Adds LIBVIRT_CONNECT_URI that
ends up exported as VIRSH_DEFAULT_CONNECT_URI in scripts that require
it.
Change-Id: Ib660bd51a8c7bfe96e14aab4b6d3a6e83a5a4220
Adam Gandelman authored on 2014/03/18 08:31:49Showing 3 changed files
- tools/ironic/scripts/cleanup-nodes
- tools/ironic/scripts/create-nodes
- tools/ironic/scripts/setup-network
| ... | ... |
@@ -8,10 +8,13 @@ |
| 8 | 8 |
set -exu |
| 9 | 9 |
|
| 10 | 10 |
LIBVIRT_STORAGE_POOL=${LIBVIRT_STORAGE_POOL:-"default"}
|
| 11 |
+LIBVIRT_CONNECT_URI=${LIBVIRT_CONNECT_URI:-"qemu:///system"}
|
|
| 11 | 12 |
|
| 12 | 13 |
VM_COUNT=$1 |
| 13 | 14 |
NETWORK_BRIDGE=$2 |
| 14 | 15 |
|
| 16 |
+export VIRSH_DEFAULT_CONNECT_URI=$LIBVIRT_CONNECT_URI |
|
| 17 |
+ |
|
| 15 | 18 |
for (( idx=0; idx<$VM_COUNT; idx++ )); do |
| 16 | 19 |
NAME="baremetal${NETWORK_BRIDGE}_${idx}"
|
| 17 | 20 |
VOL_NAME="baremetal${NETWORK_BRIDGE}-${idx}.qcow2"
|
| ... | ... |
@@ -27,6 +27,9 @@ EMULATOR=$7 |
| 27 | 27 |
|
| 28 | 28 |
LIBVIRT_NIC_DRIVER=${LIBVIRT_NIC_DRIVER:-"e1000"}
|
| 29 | 29 |
LIBVIRT_STORAGE_POOL=${LIBVIRT_STORAGE_POOL:-"default"}
|
| 30 |
+LIBVIRT_CONNECT_URI=${LIBVIRT_CONNECT_URI:-"qemu:///system"}
|
|
| 31 |
+ |
|
| 32 |
+export VIRSH_DEFAULT_CONNECT_URI=$LIBVIRT_CONNECT_URI |
|
| 30 | 33 |
|
| 31 | 34 |
if ! virsh pool-list --all | grep -q $LIBVIRT_STORAGE_POOL; then |
| 32 | 35 |
virsh pool-define-as --name $LIBVIRT_STORAGE_POOL dir --target /var/lib/libvirt/images >&2 |
| ... | ... |
@@ -7,11 +7,15 @@ |
| 7 | 7 |
|
| 8 | 8 |
set -exu |
| 9 | 9 |
|
| 10 |
+LIBVIRT_CONNECT_URI=${LIBVIRT_CONNECT_URI:-"qemu:///system"}
|
|
| 11 |
+ |
|
| 10 | 12 |
# Keep track of the devstack directory |
| 11 | 13 |
TOP_DIR=$(cd $(dirname "$0")/.. && pwd) |
| 12 | 14 |
BRIDGE_SUFFIX=${1:-''}
|
| 13 | 15 |
BRIDGE_NAME=brbm$BRIDGE_SUFFIX |
| 14 | 16 |
|
| 17 |
+export VIRSH_DEFAULT_CONNECT_URI="$LIBVIRT_CONNECT_URI" |
|
| 18 |
+ |
|
| 15 | 19 |
# Only add bridge if missing |
| 16 | 20 |
(sudo ovs-vsctl list-br | grep ${BRIDGE_NAME}$) || sudo ovs-vsctl add-br ${BRIDGE_NAME}
|
| 17 | 21 |
|