From f62b16f8a447b7c90da3844720a200fb4d3ef5d5 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Wed, 14 Dec 2016 20:44:51 +0800 Subject: Move openvswitch db file into docker volume openvswitch db file is created in /etc/openvswitch/conf.db. It will be lost during upgrade openvswitch_db container. This patch moves the db file into /var/lib/openvswitch folder, which located in docker volume. Change-Id: I73604fddacd21655590b9e66ee2805014795b9f1 Closes-Bug: #1649290 --- docker/openvswitch/openvswitch-db-server/extend_start.sh | 4 ++-- docker/openvswitch/openvswitch-db-server/start_ovsdb_server.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'docker/openvswitch/openvswitch-db-server') diff --git a/docker/openvswitch/openvswitch-db-server/extend_start.sh b/docker/openvswitch/openvswitch-db-server/extend_start.sh index 606cd5fc1..3883b50ed 100644 --- a/docker/openvswitch/openvswitch-db-server/extend_start.sh +++ b/docker/openvswitch/openvswitch-db-server/extend_start.sh @@ -1,6 +1,6 @@ #!/bin/bash mkdir -p "/run/openvswitch" -if [[ ! -e "/etc/openvswitch/conf.db" ]]; then - ovsdb-tool create "/etc/openvswitch/conf.db" +if [[ ! -e "/var/lib/openvswitch/conf.db" ]]; then + ovsdb-tool create "/var/lib/openvswitch/conf.db" fi diff --git a/docker/openvswitch/openvswitch-db-server/start_ovsdb_server.sh b/docker/openvswitch/openvswitch-db-server/start_ovsdb_server.sh index 4bc38bfc8..5c92fba78 100755 --- a/docker/openvswitch/openvswitch-db-server/start_ovsdb_server.sh +++ b/docker/openvswitch/openvswitch-db-server/start_ovsdb_server.sh @@ -19,12 +19,12 @@ ovs_ext_intf=$3 if [ ! -e $ovs_bridge ] && [ ! -e $ovs_ext_intf ]; then # NOTE: (sbezverk) This part is executed only by kubernetes deployment. # Creating external bridge - /usr/sbin/ovsdb-server /etc/openvswitch/conf.db --remote=punix:/var/run/openvswitch/db.sock --run="ovs-vsctl --no-wait --db=unix:/var/run/openvswitch/db.sock add-br $ovs_bridge" + /usr/sbin/ovsdb-server /var/lib/openvswitch/conf.db --remote=punix:/var/run/openvswitch/db.sock --run="ovs-vsctl --no-wait --db=unix:/var/run/openvswitch/db.sock add-br $ovs_bridge" # Plug the external interface into the external bridge. - /usr/sbin/ovsdb-server /etc/openvswitch/conf.db --remote=punix:/var/run/openvswitch/db.sock --run="ovs-vsctl --no-wait --db=unix:/var/run/openvswitch/db.sock add-port $ovs_bridge $ovs_ext_intf" + /usr/sbin/ovsdb-server /var/lib/openvswitch/conf.db --remote=punix:/var/run/openvswitch/db.sock --run="ovs-vsctl --no-wait --db=unix:/var/run/openvswitch/db.sock add-port $ovs_bridge $ovs_ext_intf" # Run ovsdb server process - /usr/sbin/ovsdb-server /etc/openvswitch/conf.db -vconsole:emer -vsyslog:err -vfile:info --remote=punix:/var/run/openvswitch/db.sock --remote=ptcp:6640 --log-file=/var/log/kolla/openvswitch/ovsdb-server.log + /usr/sbin/ovsdb-server /var/lib/openvswitch/conf.db -vconsole:emer -vsyslog:err -vfile:info --remote=punix:/var/run/openvswitch/db.sock --remote=ptcp:6640 --log-file=/var/log/kolla/openvswitch/ovsdb-server.log else # NOTE: (sbezverk) This part is executed only by kolla-ansible deployment. - /usr/sbin/ovsdb-server /etc/openvswitch/conf.db -vconsole:emer -vsyslog:err -vfile:info --remote=punix:/run/openvswitch/db.sock --remote=ptcp:6640:$ovsdb_ip --log-file=/var/log/kolla/openvswitch/ovsdb-server.log + /usr/sbin/ovsdb-server /var/lib/openvswitch/conf.db -vconsole:emer -vsyslog:err -vfile:info --remote=punix:/run/openvswitch/db.sock --remote=ptcp:6640:$ovsdb_ip --log-file=/var/log/kolla/openvswitch/ovsdb-server.log fi -- cgit v1.2.3