diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-07 18:07:11 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-07 19:07:53 +0000 |
| commit | d6cdd9da20ca3337af9ec7bc3abc04221627c236 (patch) | |
| tree | 054273244e0d8c86de695909adefba8edf119d47 /docker/common/nova/nova-libvirt | |
| parent | a5e907a8e91bc4e1d8f563dc79db0ee96c15d380 (diff) | |
| download | kolla-d6cdd9da20ca3337af9ec7bc3abc04221627c236.tar.gz kolla-d6cdd9da20ca3337af9ec7bc3abc04221627c236.zip | |
Remove config-internal for nova
Change-Id: I7dec09e46232f25fd396d1f2f4076f599833f5e5
Partially-implements: blueprint remove-config-internal
Diffstat (limited to 'docker/common/nova/nova-libvirt')
| -rwxr-xr-x | docker/common/nova/nova-libvirt/config-internal.sh | 31 | ||||
| -rwxr-xr-x | docker/common/nova/nova-libvirt/start.sh | 5 |
2 files changed, 2 insertions, 34 deletions
diff --git a/docker/common/nova/nova-libvirt/config-internal.sh b/docker/common/nova/nova-libvirt/config-internal.sh deleted file mode 100755 index 1f2ddbed8..000000000 --- a/docker/common/nova/nova-libvirt/config-internal.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -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 - chmod 660 /dev/kvm - chown root:kvm /dev/kvm -fi - -# https://bugs.launchpad.net/kolla/+bug/1461635 -# Cinder requires mounting /dev in the cinder-volume, nova-compute, -# and libvirt containers. If /dev/pts/ptmx does not have proper permissions -# on the host, then libvirt will fail to boot an instance. -# This is a bug in Docker where it is not correctly mounting /dev/pts -# Tech Debt tracker: https://bugs.launchpad.net/kolla/+bug/1468962 -# **Temporary fix** -chmod 666 /dev/pts/ptmx - -echo "Starting libvirtd." -exec /usr/sbin/libvirtd diff --git a/docker/common/nova/nova-libvirt/start.sh b/docker/common/nova/nova-libvirt/start.sh index 58ad58cb0..ae0de867b 100755 --- a/docker/common/nova/nova-libvirt/start.sh +++ b/docker/common/nova/nova-libvirt/start.sh @@ -7,11 +7,10 @@ ARGS="" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs -# TODO(SamYaple): Unify this with config-internal. Tweak libvirt.conf rather -# than change permissions. +# TODO(SamYaple): Tweak libvirt.conf rather than change permissions. # Fix permissions for libvirt if [[ -c /dev/kvm ]]; then chmod 660 /dev/kvm |