diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 10:34:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 10:34:58 +0000 |
| commit | aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30 (patch) | |
| tree | a131cd99311e41a6656773095e8bf02561a6b856 /docker/openvswitch | |
| parent | 762b24cc1a29f6ba803ee2045d41f98d6adbed05 (diff) | |
| parent | 160f1cc0116bf93cfceffeb0149e525ba08eed3f (diff) | |
| download | kolla-aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30.tar.gz kolla-aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30.zip | |
Merge "remove set_configs"
Diffstat (limited to 'docker/openvswitch')
| -rwxr-xr-x | docker/openvswitch/ovs-db-server/start.sh | 3 | ||||
| -rwxr-xr-x | docker/openvswitch/ovs-vswitchd/start.sh | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/docker/openvswitch/ovs-db-server/start.sh b/docker/openvswitch/ovs-db-server/start.sh index 4d3d772cc..60347b2dc 100755 --- a/docker/openvswitch/ovs-db-server/start.sh +++ b/docker/openvswitch/ovs-db-server/start.sh @@ -4,9 +4,6 @@ set -o errexit # Loading common functions. source /opt/kolla/kolla-common.sh -python /opt/kolla/set_configs.py -CMD=$(cat /run_command) - mkdir -p "/run/openvswitch" if [[ ! -e "/etc/openvswitch/conf.db" ]]; then ovsdb-tool create "/etc/openvswitch/conf.db" diff --git a/docker/openvswitch/ovs-vswitchd/start.sh b/docker/openvswitch/ovs-vswitchd/start.sh index 792954bb4..b72ba5a2e 100755 --- a/docker/openvswitch/ovs-vswitchd/start.sh +++ b/docker/openvswitch/ovs-vswitchd/start.sh @@ -4,9 +4,6 @@ set -o errexit # Loading common functions. source /opt/kolla/kolla-common.sh -python /opt/kolla/set_configs.py -CMD=$(cat /run_command) - modprobe openvswitch exec $CMD |