Skip to content
Browse files

Move KVM check to settings

  • Loading branch information...
1 parent 33bd73c commit 949ed2f5e2bbc4e15e5d7b1dfbf646646097b38f @kiall kiall committed Jan 22, 2012
Showing with 11 additions and 11 deletions.
  1. +0 −11 nova-compute.sh
  2. +11 −0 settings
View
11 nova-compute.sh
@@ -5,17 +5,6 @@
apt-get install -y nova-api nova-compute nova-network python-keystone python-mysqldb mysql-client curl
-# Check for kvm (hardware based virtualization). If unable to initialize
-# kvm, we drop back to the slower emulation mode (qemu). Note: many systems
-# come with hardware virtualization disabled in BIOS.
-if [[ "$LIBVIRT_TYPE" == "kvm" ]]; then
- modprobe kvm || true
- if [ ! -e /dev/kvm ]; then
- echo "WARNING: Switching to QEMU"
- LIBVIRT_TYPE=qemu
- fi
-fi
-
# Nova Setup
sed -e "s,999888777666,$SERVICE_TOKEN,g" api-paste-keystone.ini.tmpl > api-paste-keystone.ini
View
11 settings
@@ -40,6 +40,17 @@ then
. settings.local
fi
+# Check for kvm (hardware based virtualization). If unable to initialize
+# kvm, we drop back to the slower emulation mode (qemu). Note: many systems
+# come with hardware virtualization disabled in BIOS.
+if [[ "$LIBVIRT_TYPE" == "kvm" ]]; then
+ modprobe kvm || true
+ if [ ! -e /dev/kvm ]; then
+ echo "WARNING: Switching to QEMU"
+ LIBVIRT_TYPE=qemu
+ fi
+fi
+
# Dont change anything below here!
FIXED_RANGE="${FIXED_RANGE_NET}/${FIXED_RANGE_BITS}"
export NOVA_PROJECT_ID="admin" # Tenant

0 comments on commit 949ed2f

Please sign in to comment.
Something went wrong with that request. Please try again.