From 032cb21d636a17cc8a1cd720131a878a51a698d6 Mon Sep 17 00:00:00 2001 From: Cory Hawkless Date: Wed, 2 Dec 2020 16:03:17 +1030 Subject: [PATCH 1/5] d --- tasks/ubuntu18.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/ubuntu18.yml b/tasks/ubuntu18.yml index fe05b83..041531b 100644 --- a/tasks/ubuntu18.yml +++ b/tasks/ubuntu18.yml @@ -25,7 +25,7 @@ - name: "Copy OVN binaries" copy: - src: "{{item}}" + src: "ubuntu18/{{item}}" dest: "/tmp/{{item}}" with_items: - libopenvswitch_2.13.0-1_amd64.deb @@ -73,7 +73,7 @@ - name: "Copy OVN binaries" copy: - src: "{{item}}" + src: "ubuntu18/{{item}}" dest: "/tmp/{{item}}" with_items: - ovn_20.06.0-1_amd64.deb From df50c406a82c4b07f1f658773e010901225aee94 Mon Sep 17 00:00:00 2001 From: Cory Hawkless Date: Wed, 2 Dec 2020 16:05:50 +1030 Subject: [PATCH 2/5] s --- tasks/ubuntu18.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasks/ubuntu18.yml b/tasks/ubuntu18.yml index 041531b..6407b27 100644 --- a/tasks/ubuntu18.yml +++ b/tasks/ubuntu18.yml @@ -28,9 +28,9 @@ 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 From 02b04c01be277010c62316a3c050f70ac9d97e14 Mon Sep 17 00:00:00 2001 From: Cory Hawkless Date: Wed, 2 Dec 2020 16:08:58 +1030 Subject: [PATCH 3/5] f --- tasks/ubuntu18.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/ubuntu18.yml b/tasks/ubuntu18.yml index 6407b27..9ce49a2 100644 --- a/tasks/ubuntu18.yml +++ b/tasks/ubuntu18.yml @@ -83,5 +83,5 @@ 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 From 27c980f7bea5ef69e5cb4a493937e29d5dc71100 Mon Sep 17 00:00:00 2001 From: Cory Hawkless Date: Wed, 2 Dec 2020 16:12:01 +1030 Subject: [PATCH 4/5] s --- tasks/ubuntu18.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/ubuntu18.yml b/tasks/ubuntu18.yml index 9ce49a2..2dd9133 100644 --- a/tasks/ubuntu18.yml +++ b/tasks/ubuntu18.yml @@ -76,7 +76,7 @@ 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" From 94934ea187b88f0da03c96009aeaa4f541f22780 Mon Sep 17 00:00:00 2001 From: Cory Date: Fri, 4 Dec 2020 12:24:21 +1030 Subject: [PATCH 5/5] s --- templates/ovsovn-service-manager.sh.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ovsovn-service-manager.sh.j2 b/templates/ovsovn-service-manager.sh.j2 index 045aae5..f436612 100644 --- a/templates/ovsovn-service-manager.sh.j2 +++ b/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