From b401a90254bcee2f588ea0d0f245dbfc8ac6a816 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Thu, 30 Jul 2015 16:09:53 +0000 Subject: Add linuxbridge as option to ansible Allows the user to configure neutron_plugin_agent value for Ansible. Current allowed values are openvswitch and linuxbridge. Implements: blueprint ansible-neutron-linuxbridge Change-Id: I0572464a5459d2f9da09b6da22db16e240511f99 --- .../neutron/neutron-linuxbridge-agent/config-external.sh | 10 ++++++++++ docker/common/neutron/neutron-linuxbridge-agent/start.sh | 2 +- docker/common/neutron/neutron-openvswitch-agent/start.sh | 3 --- 3 files changed, 11 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/common/neutron/neutron-linuxbridge-agent/config-external.sh b/docker/common/neutron/neutron-linuxbridge-agent/config-external.sh index 4e0411a9f..c44d71d84 100755 --- a/docker/common/neutron/neutron-linuxbridge-agent/config-external.sh +++ b/docker/common/neutron/neutron-linuxbridge-agent/config-external.sh @@ -8,3 +8,13 @@ if [[ -f "$SOURCE" ]]; then chown ${OWNER}: $TARGET chmod 0644 $TARGET fi + +SOURCE="/opt/kolla/neutron-linuxbridge-agent/ml2_conf.ini" +TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini" +OWNER="neutron" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker/common/neutron/neutron-linuxbridge-agent/start.sh b/docker/common/neutron/neutron-linuxbridge-agent/start.sh index c16b97974..aea4aea89 100755 --- a/docker/common/neutron/neutron-linuxbridge-agent/start.sh +++ b/docker/common/neutron/neutron-linuxbridge-agent/start.sh @@ -2,7 +2,7 @@ set -o errexit CMD="/usr/bin/neutron-linuxbridge-agent" -ARGS="--config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-dir /etc/neutron" +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/neutron/neutron-openvswitch-agent/start.sh b/docker/common/neutron/neutron-openvswitch-agent/start.sh index 0c404eafc..601fcaf87 100755 --- a/docker/common/neutron/neutron-openvswitch-agent/start.sh +++ b/docker/common/neutron/neutron-openvswitch-agent/start.sh @@ -11,7 +11,4 @@ source /opt/kolla/config-sudoers.sh # Config-internal script exec out of this function, it does not return here. set_configs -# Set !requiretty -source /opt/kolla/config-sudoers.sh - exec $CMD $ARGS -- cgit v1.2.3