From 3b30760e2d0bbc7864e54b5756be2bf2431a221d Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Thu, 23 Jul 2015 17:19:44 +0000 Subject: Fix compute permissions and start params neutron-server was not properly using ml2_conf.ini nova did not have ovs utils, and it had incorrect libvirt permissions Change-Id: I43d2110d0b5fc1940d887dace95787e1ebbe142d Partitially-Implements: blueprint ansible-service --- docker/common/neutron/neutron-server/config-external.sh | 3 +-- docker/common/neutron/neutron-server/start.sh | 2 +- docker/common/nova/nova-libvirt/start.sh | 8 ++++++++ 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'docker/common') diff --git a/docker/common/neutron/neutron-server/config-external.sh b/docker/common/neutron/neutron-server/config-external.sh index c8558ecca..574923067 100755 --- a/docker/common/neutron/neutron-server/config-external.sh +++ b/docker/common/neutron/neutron-server/config-external.sh @@ -9,8 +9,7 @@ if [[ -f "$SOURCE" ]]; then chmod 0644 $TARGET fi -# TODO(SamYaple): Remove this from neutron-server once bootstrap is understood -SOURCE="/opt/kolla/neutron-openvswitch-agent/ml2_conf.ini" +SOURCE="/opt/kolla/neutron-server/ml2_conf.ini" TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini" OWNER="neutron" diff --git a/docker/common/neutron/neutron-server/start.sh b/docker/common/neutron/neutron-server/start.sh index 7df950e57..97317c05b 100755 --- a/docker/common/neutron/neutron-server/start.sh +++ b/docker/common/neutron/neutron-server/start.sh @@ -2,7 +2,7 @@ set -o errexit CMD="/usr/bin/neutron-server" -ARGS="--config-file /etc/neutron/neutron.conf" +ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini" # Loading common functions. source /opt/kolla/kolla-common.sh diff --git a/docker/common/nova/nova-libvirt/start.sh b/docker/common/nova/nova-libvirt/start.sh index 00d7046d1..58ad58cb0 100755 --- a/docker/common/nova/nova-libvirt/start.sh +++ b/docker/common/nova/nova-libvirt/start.sh @@ -10,4 +10,12 @@ source /opt/kolla/kolla-common.sh # Config-internal script exec out of this function, it does not return here. set_configs +# TODO(SamYaple): Unify this with config-internal. Tweak libvirt.conf rather +# than change permissions. +# Fix permissions for libvirt +if [[ -c /dev/kvm ]]; then + chmod 660 /dev/kvm + chown root:kvm /dev/kvm +fi + exec $CMD $ARGS -- cgit v1.2.3