From d71e1ae2c8549240db228ab9e296ca6f30c5d4f8 Mon Sep 17 00:00:00 2001
From: Cory Hawkless <cory@hawkless.id.au>
Date: Mon, 23 Nov 2020 14:31:52 +1030
Subject: [PATCH] {{OVN_NB_Connection}} in service file

---
 tasks/main.yml                         | 3 +++
 templates/ovsovn-service-manager.sh.j2 | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index ada695a..c0e2061 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -106,6 +106,9 @@
   when: force_new_ovn_download == True
 
 
+- name: Generate OVN NB Connection fact
+  set_fact: OVN_NB_Connection="{% for host in groups[ovn_nb_group_name_rendered] %}tcp:{{ hostvars[host].host_loopback_IP }}:6641{% if not loop.last %},{% endif %}{% endfor %}"
+  
 
 #Install the custom service to start OVS and OVN as required
 - name: "Copy /usr/sbin/ovsovn-service-manager.sh file"
diff --git a/templates/ovsovn-service-manager.sh.j2 b/templates/ovsovn-service-manager.sh.j2
index 474d22d..c7852f9 100644
--- a/templates/ovsovn-service-manager.sh.j2
+++ b/templates/ovsovn-service-manager.sh.j2
@@ -9,8 +9,8 @@ echo "ZZZ $1"
 START(){
     hostname=$(hostname)
     loopbackIP={{host_loopback_IP}}
-    controllerIP={{OVN_VIP}}
-    echo "Starting OpenVSwitch and OVN on $hostname with $loopbackIP and pointing to OVN controller $controllerIP"
+    
+    echo "Starting OpenVSwitch and OVN on $hostname with $loopbackIP and pointing to OVN controller {{OVN_NB_Connection}}"
 
     DIR="/var/run/openvswitch/db.sock"
     if [ -d "$DIR" ]; then
@@ -23,7 +23,7 @@ START(){
     ovs-appctl -t ovsdb-server ovsdb-server/add-remote ptcp:6640
 
     ovs-vsctl set open . external-ids:ovn-bridge=br-int
-    ovs-vsctl set open . external-ids:ovn-remote=tcp:$controllerIP:6642
+    ovs-vsctl set open . external-ids:ovn-remote={{OVN_NB_Connection}}
     ovs-vsctl set open . external-ids:ovn-encap-type=geneve
     ovs-vsctl set open . external-ids:ovn-encap-ip=$loopbackIP
     /usr/share/ovn/scripts/ovn-ctl start_controller