Merge branch 'master' of https://github.com/CoryHawkless/ansible-ovsovn

tasks/ubuntu18.yml

@@ -25,12 +25,12 @@
 
 - name: "Copy OVN binaries"
   copy:
-    src: "{{item}}"
+    src: "ubuntu18/{{item}}"
     dest: "/tmp/{{item}}"
   with_items:
-    - libopenvswitch_2.13.0-1_amd64.deb
-    - openvswitch-common_2.13.0-1_amd64.deb
-    - openvswitch-switch_2.13.0-1_amd64.deb
+    - libopenvswitch_2.14.0-1_amd64.deb
+    - openvswitch-common_2.14.0-1_amd64.deb
+    - openvswitch-switch_2.14.0-1_amd64.deb
   when: force_new_ovs_download == True
 
 
@@ -40,9 +40,9 @@
   apt:
     deb: "{{ item }}"
   with_items:
-    - "/tmp/libopenvswitch_2.13.0-1_amd64.deb"
-    - "/tmp/openvswitch-common_2.13.0-1_amd64.deb"
-    - "/tmp/openvswitch-switch_2.13.0-1_amd64.deb"
+    - "/tmp/libopenvswitch_2.14.0-1_amd64.deb"
+    - "/tmp/openvswitch-common_2.14.0-1_amd64.deb"
+    - "/tmp/openvswitch-switch_2.14.0-1_amd64.deb"
   when: force_new_ovs_download == True
 
 
@@ -73,15 +73,15 @@
 
 - name: "Copy OVN binaries"
   copy:
-    src: "{{item}}"
+    src: "ubuntu18/{{item}}"
     dest: "/tmp/{{item}}"
   with_items:
-    - ovn_20.06.0-1_amd64.deb
+    - ovn_20.09.0-1_amd64.deb
   when: force_new_ovn_download == True
 
 - name: "Install packages"
   apt:
     deb: "{{ item }}"
   with_items:
-    - "/tmp/ovn_20.06.0-1_amd64.deb"
+    - "/tmp/ovn_20.09.0-1_amd64.deb"
   when: force_new_ovn_download == True

templates/ovsovn-service-manager.sh.j2

@@ -36,7 +36,7 @@ START(){
 
 {% endif %}
 
-{% if ansible_fqdn in groups['compute_nodes'] %}
+{% if ansible_fqdn in groups['br_provider_nodes'] %}
     echo "Bringing online br-provider for WAN1"
     ovs-vsctl --may-exist add-br br-provider
     ovs-vsctl set open . external-ids:ovn-bridge-mappings=WAN1:br-provider