Merge "Add config-internal/config-external to OpenvSwitch containers"

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/

docker/centos/binary/openvswitch/ovs-base/config-external.sh

+../../../../common/openvswitch/ovs-base/config-external.sh

docker/centos/binary/openvswitch/ovs-base/config-internal.sh

+../../../../common/openvswitch/ovs-base/config-external.sh

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"]

docker/centos/binary/openvswitch/ovs-db-server/config-external.sh

+../../../../common/openvswitch/ovs-db-server/config-external.sh
\ No newline at end of file

docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh

+../../../../common/openvswitch/ovs-db-server/config-internal.sh
\ No newline at end of file

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"]

docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh

+../../../../common/openvswitch/ovs-vswitchd/config-external.sh
\ No newline at end of file

docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh

+../../../../common/openvswitch/ovs-vswitchd/config-internal.sh
\ No newline at end of file

docker/common/openvswitch/ovs-db-server/config-external.sh

+#!/bin/bash
+
+#This file should be a noop. It just needs to exist, but it don't perform any function

docker/common/openvswitch/ovs-db-server/config-internal.sh

+#!/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}"

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

docker/common/openvswitch/ovs-vswitchd/config-external.sh

+#!/bin/bash
+
+#This file should be a noop. It just needs to exist, but it don't perform any function

docker/common/openvswitch/ovs-vswitchd/config-internal.sh

+#!/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}"
+

docker/common/openvswitch/ovs-vswitchd/start.sh

 #!/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