|
...
|
...
|
@@ -74,7 +74,7 @@ NOVNC_DIR=$DEST/noVNC
|
|
74
|
74
|
MUNIN_DIR=$DEST/openstack-munin
|
|
75
|
75
|
|
|
76
|
76
|
# Specify which services to launch. These generally correspond to screen tabs
|
|
77
|
|
-ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,dash,mysql,rabbit}
|
|
|
77
|
+ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,dash,mysql,rabbit,munin}
|
|
78
|
78
|
|
|
79
|
79
|
# Use the first IP unless an explicit is set by ``HOST_IP`` environment variable
|
|
80
|
80
|
if [ ! -n "$HOST_IP" ]; then
|
|
...
|
...
|
@@ -302,7 +302,7 @@ if [[ "$ENABLED_SERVICES" =~ "n-cpu" ]]; then
|
|
302
|
302
|
# qcow images) and kvm (hardware based virtualization). If unable to
|
|
303
|
303
|
# load kvm, set the libvirt type to qemu.
|
|
304
|
304
|
sudo modprobe nbd || true
|
|
305
|
|
- if ! -e /dev/kvm; then
|
|
|
305
|
+ if [ ! -e /dev/kvm ]; then
|
|
306
|
306
|
LIBVIRT_TYPE=qemu
|
|
307
|
307
|
fi
|
|
308
|
308
|
# User needs to be member of libvirtd group for nova-compute to use libvirt.
|