CORD-3064 Modify openvswitch chart to listen on port 6641
Change-Id: Id01ac6e55c65aa8dbd3c07b8a751aab4085414b3
diff --git a/mcord/mcord-in-a-box.sh b/mcord/mcord-in-a-box.sh
index 4b11c19..bef96bf 100755
--- a/mcord/mcord-in-a-box.sh
+++ b/mcord/mcord-in-a-box.sh
@@ -31,11 +31,6 @@
"$CORDDIR"/automation-tools/openstack-helm/openstack-helm-dev-setup.sh
-# VTN requirements
-POD=$( kubectl get pod --namespace openstack|grep openvswitch-db|awk '{print $1}' )
-kubectl --namespace openstack exec "$POD" \
- -- ovs-appctl -t ovsdb-server ovsdb-server/add-remote ptcp:6641
-
# Add keys for VTN
[ ! -e ~/.ssh/id_rsa ] && ssh-keygen -f ~/.ssh/id_rsa -t rsa -N ""
cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
diff --git a/openstack-helm/openstack-helm-dev-setup.sh b/openstack-helm/openstack-helm-dev-setup.sh
index 83f355a..fa34fde 100755
--- a/openstack-helm/openstack-helm-dev-setup.sh
+++ b/openstack-helm/openstack-helm-dev-setup.sh
@@ -38,7 +38,7 @@
cd ~
[ ! -e openstack-helm-infra ] && git clone https://git.openstack.org/openstack/openstack-helm-infra.git -b "${OPENSTACK_HELM_BRANCH}"
-[ ! -e openstack-helm ] && git clone https://git.openstack.org/openstack/openstack-helm.git -b "${OPENSTACK_HELM_BRANCH}"
+[ ! -e openstack-helm ] && git clone https://git.openstack.org/openstack/openstack-helm.git -b "${OPENSTACK_HELM_BRANCH}" && sed -i 's/--remote=db:Open_vSwitch,Open_vSwitch,manager_options/--remote=db:Open_vSwitch,Open_vSwitch,manager_options --remote=ptcp:6641/' openstack-helm/openvswitch/templates/bin/_openvswitch-db-server.sh.tpl
# Customizations for CORD
cat <<EOF > /tmp/glance-cord.yaml