From 291f800c5a8f0a8750bfd1b96b6a043d8c7e1eb2 Mon Sep 17 00:00:00 2001
From: Will Miller <willm@stackhpc.com>
Date: Thu, 23 Aug 2018 08:57:06 +0000
Subject: [PATCH] Fix veth suffix naming scheme

---
 ansible/physical_network.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ansible/physical_network.yml b/ansible/physical_network.yml
index 4915cf6..cb19260 100644
--- a/ansible/physical_network.yml
+++ b/ansible/physical_network.yml
@@ -60,22 +60,24 @@
     - name: Create patch port on Tenks bridge
       openvswitch_port:
         bridge: "{{ tenks_bridge }}"
-        port: "{{ veth_prefix + tenks_bridge + veth_tenks_suffix }}"
+        port: "{{ veth_prefix + tenks_bridge + veth_bridge_ovs_suffix }}"
         # Despite the module documentation, `set` will happily take multiple
         # properties.
         set: >
-          Interface {{ veth_prefix + tenks_bridge + veth_tenks_suffix }}
+          Interface {{ veth_prefix + tenks_bridge + veth_bridge_ovs_suffix }}
             type=patch
-            options:peer={{ veth_prefix + tenks_bridge + veth_source_suffix }}
+            options:peer={{ veth_prefix + tenks_bridge +
+                            veth_bridge_source_suffix }}
 
     - name: Create patch port on source bridge
       openvswitch_port:
         bridge: "{{ source_interface }}"
-        port: "{{ veth_prefix + tenks_bridge + veth_source_suffix }}"
+        port: "{{ veth_prefix + tenks_bridge + veth_bridge_source_suffix }}"
         set: >
-          Interface {{ veth_prefix + tenks_bridge + veth_source_suffix }}
+          Interface {{ veth_prefix + tenks_bridge + veth_bridge_source_suffix }}
             type=patch
-            options:peer={{ veth_prefix + tenks_bridge + veth_tenks_suffix }}
+            options:peer={{ veth_prefix + tenks_bridge +
+                            veth_bridge_ovs_suffix }}
 
   when: if_details.stdout_lines[-1].split()[0] == 'openvswitch'