commit 8b39120981723db438900b0f768d38b9a436eb3b
author Andy Bavier <andy@onlab.us> Mon Feb 12 09:37:16 2018 -0700
committer Andy Bavier <andy@onlab.us> Tue Feb 20 14:35:52 2018 -0700
tree 6669e49882e47766bf0780866b217379c49d74b7
parent 039a3b671addb65493dbc089f03dc9fd2140346e

CORD-2272 Enable multiple CiaB compute nodes

Change-Id: Id82ac1c95ea841cd58000410c54a86ccc7aea248

ansible/roles/ciab-ovs/defaults/main.yml

diff --git a/ansible/roles/ciab-ovs/defaults/main.yml b/ansible/roles/ciab-ovs/defaults/main.yml
index 38c9652..26a04dc 100644
--- a/ansible/roles/ciab-ovs/defaults/main.yml
+++ b/ansible/roles/ciab-ovs/defaults/main.yml
@@ -14,18 +14,18 @@
 
 ovs_bridges:
   - leaf1
-#  - leaf2
+  - leaf2
   - spine1
 #  - spine2
 
 ovs_patch_ports:
   - { bridge: leaf1, port: leaf1-spine1, peer: spine1-leaf1 }
-#  - { bridge: leaf2, port: leaf2-spine1, peer: spine1-leaf2 }
+  - { bridge: leaf2, port: leaf2-spine1, peer: spine1-leaf2 }
 #  - { bridge: leaf1, port: leaf1-spine2, peer: spine2-leaf1 }
 #  - { bridge: leaf2, port: leaf2-spine2, peer: spine2-leaf2 }
   - { bridge: spine1, port: spine1-leaf1, peer: leaf1-spine1 }
 #  - { bridge: spine2, port: spine2-leaf1, peer: leaf1-spine2 }
-#  - { bridge: spine1, port: spine1-leaf2, peer: leaf2-spine1 }
+  - { bridge: spine1, port: spine1-leaf2, peer: leaf2-spine1 }
 #  - { bridge: spine2, port: spine2-leaf2, peer: leaf2-spine2 }
 
 enable_fabric: False

ansible/roles/ciab-ovs/tasks/main.yml

diff --git a/ansible/roles/ciab-ovs/tasks/main.yml b/ansible/roles/ciab-ovs/tasks/main.yml
index d5bb41a..d10a61c 100644
--- a/ansible/roles/ciab-ovs/tasks/main.yml
+++ b/ansible/roles/ciab-ovs/tasks/main.yml
@@ -56,12 +56,19 @@
     set: "Interface {{ item.port }} type=patch"
   with_items: "{{ ovs_patch_ports }}"
 
+# This returns OK but doesn't actually set up the peer
+#- name: Create peers
+#  openvswitch_port:
+#    bridge: "{{ item.bridge }}"
+#    port: "{{ item.port }}"
+#    set: "Interface {{ item.port }} options:peer={{ item.peer }}"
+#  with_items: "{{ ovs_patch_ports }}"
+
 - name: Create peers
-  openvswitch_port:
-    bridge: "{{ item.bridge }}"
-    port: "{{ item.port }}"
-    set: "Interface {{ item.port }} options:peer={{ item.peer }}"
+  command: ovs-vsctl set interface {{ item.port }} options:peer={{ item.peer }}
   with_items: "{{ ovs_patch_ports }}"
+  tags:
+    - skip_ansible_lint # running a sub job
 
 # "set" argument to openvswitch_bridge wasn't working...
 - name: Set bridges to OpenFlow 1.3