diff options
Diffstat (limited to 'docker')
15 files changed, 70 insertions, 8 deletions
diff --git a/docker/centos/binary/openvswitch/ovs-base/Dockerfile b/docker/centos/binary/openvswitch/ovs-base/Dockerfile index 7d4ade54c..98506b477 100644 --- a/docker/centos/binary/openvswitch/ovs-base/Dockerfile +++ b/docker/centos/binary/openvswitch/ovs-base/Dockerfile @@ -3,3 +3,5 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y openvswitch \ && yum clean all + +COPY config-internal.sh config-external.sh /opt/kolla/ diff --git a/docker/centos/binary/openvswitch/ovs-base/config-external.sh b/docker/centos/binary/openvswitch/ovs-base/config-external.sh new file mode 100644 index 000000000..fc177a286 --- /dev/null +++ b/docker/centos/binary/openvswitch/ovs-base/config-external.sh @@ -0,0 +1 @@ +../../../../common/openvswitch/ovs-base/config-external.sh diff --git a/docker/centos/binary/openvswitch/ovs-base/config-internal.sh b/docker/centos/binary/openvswitch/ovs-base/config-internal.sh new file mode 100644 index 000000000..fc177a286 --- /dev/null +++ b/docker/centos/binary/openvswitch/ovs-base/config-internal.sh @@ -0,0 +1 @@ +../../../../common/openvswitch/ovs-base/config-external.sh diff --git a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile b/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile index 5728995b3..c34d72302 100644 --- a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile +++ b/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile @@ -3,5 +3,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh /start.sh -CMD ["/start.sh"] +COPY config-internal.sh config-external.sh /opt/kolla/ +CMD ["/start.sh"] diff --git a/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh b/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh new file mode 120000 index 000000000..36670d77d --- /dev/null +++ b/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh @@ -0,0 +1 @@ +../../../../common/openvswitch/ovs-db-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh b/docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh new file mode 120000 index 000000000..86927f3dd --- /dev/null +++ b/docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh @@ -0,0 +1 @@ +../../../../common/openvswitch/ovs-db-server/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile b/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile index 4acdb5d53..c34d72302 100644 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile +++ b/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile @@ -3,4 +3,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh /start.sh +COPY config-internal.sh config-external.sh /opt/kolla/ + CMD ["/start.sh"] diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh new file mode 120000 index 000000000..39b5c7dd6 --- /dev/null +++ b/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh @@ -0,0 +1 @@ +../../../../common/openvswitch/ovs-vswitchd/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh new file mode 120000 index 000000000..dec53e36d --- /dev/null +++ b/docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh @@ -0,0 +1 @@ +../../../../common/openvswitch/ovs-vswitchd/config-internal.sh
\ No newline at end of file diff --git a/docker/common/openvswitch/ovs-db-server/config-external.sh b/docker/common/openvswitch/ovs-db-server/config-external.sh new file mode 100644 index 000000000..9ada4efcb --- /dev/null +++ b/docker/common/openvswitch/ovs-db-server/config-external.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +#This file should be a noop. It just needs to exist, but it don't perform any function diff --git a/docker/common/openvswitch/ovs-db-server/config-internal.sh b/docker/common/openvswitch/ovs-db-server/config-internal.sh new file mode 100644 index 000000000..a2b4d6c8f --- /dev/null +++ b/docker/common/openvswitch/ovs-db-server/config-internal.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +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" + +mkdir -p "${UNIXSOCK_DIR}" + +if [[ ! -e "${DB_FILE}" ]]; then + ovsdb-tool create "${DB_FILE}" +fi + +exec ovsdb-server $DB_FILE -vconsole:emer -vsyslog:err -vfile:info --remote=punix:"${UNIXSOCK}" --log-file="${LOG_FILE}" diff --git a/docker/common/openvswitch/ovs-db-server/start.sh b/docker/common/openvswitch/ovs-db-server/start.sh index a2b4d6c8f..ae87da4e2 100755 --- a/docker/common/openvswitch/ovs-db-server/start.sh +++ b/docker/common/openvswitch/ovs-db-server/start.sh @@ -7,10 +7,19 @@ DB_FILE="/etc/openvswitch/conf.db" UNIXSOCK_DIR="/var/run/openvswitch" UNIXSOCK="${UNIXSOCK_DIR}/db.sock" +CMD="/usr/sbin/ovsdb-server" +ARGS="$DB_FILE -vconsole:emer -vsyslog:err -vfile:info --remote=punix:${UNIXSOCK} --log-file=${LOG_FILE}" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Config-internal script exec out of this function, it does not return here. +set_configs + mkdir -p "${UNIXSOCK_DIR}" if [[ ! -e "${DB_FILE}" ]]; then ovsdb-tool create "${DB_FILE}" fi -exec ovsdb-server $DB_FILE -vconsole:emer -vsyslog:err -vfile:info --remote=punix:"${UNIXSOCK}" --log-file="${LOG_FILE}" +exec $CMD $ARGS diff --git a/docker/common/openvswitch/ovs-vswitchd/config-external.sh b/docker/common/openvswitch/ovs-vswitchd/config-external.sh new file mode 100644 index 000000000..9ada4efcb --- /dev/null +++ b/docker/common/openvswitch/ovs-vswitchd/config-external.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +#This file should be a noop. It just needs to exist, but it don't perform any function diff --git a/docker/common/openvswitch/ovs-vswitchd/config-internal.sh b/docker/common/openvswitch/ovs-vswitchd/config-internal.sh new file mode 100644 index 000000000..1a18ab958 --- /dev/null +++ b/docker/common/openvswitch/ovs-vswitchd/config-internal.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -o errexit + +modprobe openvswitch + +LOG_FILE="/var/log/openvswitch/ovs-vswitchd.log" +DB_FILE="/etc/openvswitch/conf.db" +UNIXSOCK_DIR="/var/run/openvswitch" +UNIXSOCK="${UNIXSOCK_DIR}/db.sock" + +mkdir -p "${UNIXSOCK_DIR}" + +exec ovs-vswitchd unix:"${UNIXSOCK}" -vconsole:emer -vsyslog:err -vfile:info --mlockall --log-file="${LOG_FILE}" + diff --git a/docker/common/openvswitch/ovs-vswitchd/start.sh b/docker/common/openvswitch/ovs-vswitchd/start.sh index 5ed1fbe75..148ad5b56 100755 --- a/docker/common/openvswitch/ovs-vswitchd/start.sh +++ b/docker/common/openvswitch/ovs-vswitchd/start.sh @@ -1,14 +1,19 @@ #!/bin/bash - -set -o errexit - -modprobe openvswitch - LOG_FILE="/var/log/openvswitch/ovs-vswitchd.log" DB_FILE="/etc/openvswitch/conf.db" UNIXSOCK_DIR="/var/run/openvswitch" UNIXSOCK="${UNIXSOCK_DIR}/db.sock" +CMD="/usr/sbin/ovs-vswitchd" +ARGS="unix:${UNIXSOCK} -vconsole:emer -vsyslog:err -vfile:info --mlockall --log-file=${LOG_FILE}" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Config-internal script exec out of this function, it does not return here. +set_configs + +modprobe openvswitch mkdir -p "${UNIXSOCK_DIR}" -exec ovs-vswitchd unix:"${UNIXSOCK}" -vconsole:emer -vsyslog:err -vfile:info --mlockall --log-file="${LOG_FILE}" +exec $CMD $ARGS |