diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-02 17:55:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-02 17:55:31 +0000 |
| commit | 3097d3e48dd3dcb0f318663d1d0628ff1c565098 (patch) | |
| tree | 528df5ad41f91ec4ba5af756f632733e17c2cb3f /docker/common | |
| parent | f4d6fc6193b0d0a981433ad849c614130a13041a (diff) | |
| parent | b401a90254bcee2f588ea0d0f245dbfc8ac6a816 (diff) | |
| download | kolla-3097d3e48dd3dcb0f318663d1d0628ff1c565098.tar.gz kolla-3097d3e48dd3dcb0f318663d1d0628ff1c565098.zip | |
Merge "Add linuxbridge as option to ansible"
Diffstat (limited to 'docker/common')
3 files changed, 11 insertions, 4 deletions
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 |