diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-28 21:41:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-28 21:41:41 +0000 |
| commit | 062388fca9244f997e52abaeb04d739de7e13ae6 (patch) | |
| tree | 4851e4b402ea0ea38a8cf08edefc679e1120d8ac /docker | |
| parent | 5da87d4ced6a5e0a81c4bdc43d2a1d1cb25c03a0 (diff) | |
| parent | dd2e2ad8e22d09ce24eadf92d8c66cdde85407a5 (diff) | |
| download | kolla-062388fca9244f997e52abaeb04d739de7e13ae6.tar.gz kolla-062388fca9244f997e52abaeb04d739de7e13ae6.zip | |
Merge "Make variables in OVS container configurable"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/common/openvswitch/ovs-db-server/config-internal.sh | 15 | ||||
| -rwxr-xr-x | docker/common/openvswitch/ovs-vswitchd/config-internal.sh | 11 |
2 files changed, 11 insertions, 15 deletions
diff --git a/docker/common/openvswitch/ovs-db-server/config-internal.sh b/docker/common/openvswitch/ovs-db-server/config-internal.sh index a2b4d6c8f..f233418a7 100755 --- a/docker/common/openvswitch/ovs-db-server/config-internal.sh +++ b/docker/common/openvswitch/ovs-db-server/config-internal.sh @@ -2,15 +2,14 @@ set -o errexit -LOG_FILE="/var/log/openvswitch/ovsdb-server.log" -DB_FILE="/etc/openvswitch/conf.db" -UNIXSOCK_DIR="/var/run/openvswitch" -UNIXSOCK="${UNIXSOCK_DIR}/db.sock" +check_required_vars OVS_DB_FILE \ + OVS_UNIXSOCK -mkdir -p "${UNIXSOCK_DIR}" -if [[ ! -e "${DB_FILE}" ]]; then - ovsdb-tool create "${DB_FILE}" +mkdir -p "$(dirname $OVS_UNIXSOCK)" + +if [[ ! -e "${OVS_DB_FILE}" ]]; then + ovsdb-tool create "${OVS_DB_FILE}" fi -exec ovsdb-server $DB_FILE -vconsole:emer -vsyslog:err -vfile:info --remote=punix:"${UNIXSOCK}" --log-file="${LOG_FILE}" +exec ovsdb-server $OVS_DB_FILE -vconsole:emer -vsyslog:err -vfile:info --remote=punix:"${OVS_UNIXSOCK}" --log-file="${OVS_LOG_FILE}" diff --git a/docker/common/openvswitch/ovs-vswitchd/config-internal.sh b/docker/common/openvswitch/ovs-vswitchd/config-internal.sh index 1a18ab958..2e42f7029 100755 --- a/docker/common/openvswitch/ovs-vswitchd/config-internal.sh +++ b/docker/common/openvswitch/ovs-vswitchd/config-internal.sh @@ -2,14 +2,11 @@ set -o errexit -modprobe openvswitch +check_required_vars OVS_UNIXSOCK -LOG_FILE="/var/log/openvswitch/ovs-vswitchd.log" -DB_FILE="/etc/openvswitch/conf.db" -UNIXSOCK_DIR="/var/run/openvswitch" -UNIXSOCK="${UNIXSOCK_DIR}/db.sock" +modprobe openvswitch -mkdir -p "${UNIXSOCK_DIR}" +mkdir -p "$(dirname $OVS_UNIXSOCK)" -exec ovs-vswitchd unix:"${UNIXSOCK}" -vconsole:emer -vsyslog:err -vfile:info --mlockall --log-file="${LOG_FILE}" +exec ovs-vswitchd unix:"${OVS_UNIXSOCK}" -vconsole:emer -vsyslog:err -vfile:info --mlockall --log-file="${OVS_LOG_FILE}" |