diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-03 18:01:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-03 18:01:15 +0000 |
| commit | 0573da4424daf02e2b8e4932c1c56adfa77cb17d (patch) | |
| tree | 6bb76969df3c3437735169813c3529f875c41eff /docker | |
| parent | c46cdfd53e8b3b629185a61dd5e59156f1ee2c57 (diff) | |
| parent | 2f0f37f97b575fe7b863d086b00f8f5c470d362a (diff) | |
| download | kolla-0573da4424daf02e2b8e4932c1c56adfa77cb17d.tar.gz kolla-0573da4424daf02e2b8e4932c1c56adfa77cb17d.zip | |
Merge "Load appropriate modules for libvirt"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/nova-compute/nova-libvirt/start.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/docker/nova-compute/nova-libvirt/start.sh b/docker/nova-compute/nova-libvirt/start.sh index 8d45070b5..04e5f9792 100755 --- a/docker/nova-compute/nova-libvirt/start.sh +++ b/docker/nova-compute/nova-libvirt/start.sh @@ -1,5 +1,16 @@ #!/bin/sh +if [[ $(cat /proc/cpuinfo | grep vmx) ]]; then + modprobe kvm_intel +elif [[ $(cat /proc/cpuinfo | grep svm) ]]; then + modprobe kvm_amd +else + echo "WARNING: Your hardware does not support hardware virtualization -" \ + "using qemu software virtualization instead" +fi + +modprobe ip6_tables ip_tables ebtable_nat + # If libvirt is not installed on the host permissions need to be set # If running in qemu, we don't need to set anything as /dev/kvm won't exist if [[ -c /dev/kvm ]]; then |