From 56fb19d4c1ca1d9b59c6c8139ec534666bb6388b Mon Sep 17 00:00:00 2001
From: Will Miller <willm@stackhpc.com>
Date: Thu, 23 Aug 2018 12:36:07 +0000
Subject: [PATCH] Formatting fixes

Fix multi-line string variables. Also use subelements filter with loop.
---
 ansible/deploy.yml                     | 15 +++++++++------
 ansible/physical_network.yml           |  8 ++++----
 ansible/roles/veth-pair/tasks/main.yml |  4 ++--
 ansible/schedule.yml                   |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/ansible/deploy.yml b/ansible/deploy.yml
index 35c40b7..4bad2b1 100644
--- a/ansible/deploy.yml
+++ b/ansible/deploy.yml
@@ -14,13 +14,16 @@
 
 - hosts: hypervisors
   tasks:
-    - include_tasks: vm_networking.yml
+    - include_tasks: vm_physical_network.yml
       vars:
-        vm: "{{ item }}"
+        vm_name: "{{ item.0.name }}"
+        physnet: "{{ item.1 }}"
+      # Loop over each physical network for each VM allocated to this host.
       # Allocations are stored in the controller node's vars.
-      loop: >
+      loop: >-
         {{ hostvars[groups.controllers.0].allocations.result[
-           inventory_hostname] | default([]) }}
+             inventory_hostname] | default([])
+             | subelements('physical_networks') }}
 
 - hosts: libvirt
   tasks:
@@ -37,9 +40,9 @@
             group: "{{ libvirt_pool_group }}"
         libvirt_host_require_vt: "{{ libvirt_require_vt }}"
 
-    - include_tasks: create_libvirt_vms.yml
+    - include_tasks: libvirt_create_vms.yml
       vars:
         # Allocations are stored in the controller node's vars.
-        vms: >
+        vms: >-
           {{ hostvars[groups.controllers.0].allocations.result[
                inventory_hostname] | default([]) }}
diff --git a/ansible/physical_network.yml b/ansible/physical_network.yml
index cb19260..5b5e013 100644
--- a/ansible/physical_network.yml
+++ b/ansible/physical_network.yml
@@ -47,10 +47,10 @@
     name: veth-pair
   vars:
     veth_pair_ovs_bridge: "{{ tenks_bridge }}"
-    veth_pair_ovs_link_name: >
+    veth_pair_ovs_link_name: >-
       {{ veth_prefix + tenks_bridge + veth_bridge_ovs_suffix }}
     veth_pair_source_bridge: "{{ source_interface }}"
-    veth_pair_source_link_name: >
+    veth_pair_source_link_name: >-
       {{ veth_prefix + tenks_bridge + veth_bridge_source_suffix }}
     plug_into_source: true
 
@@ -63,7 +63,7 @@
         port: "{{ veth_prefix + tenks_bridge + veth_bridge_ovs_suffix }}"
         # Despite the module documentation, `set` will happily take multiple
         # properties.
-        set: >
+        set: >-
           Interface {{ veth_prefix + tenks_bridge + veth_bridge_ovs_suffix }}
             type=patch
             options:peer={{ veth_prefix + tenks_bridge +
@@ -73,7 +73,7 @@
       openvswitch_port:
         bridge: "{{ source_interface }}"
         port: "{{ veth_prefix + tenks_bridge + veth_bridge_source_suffix }}"
-        set: >
+        set: >-
           Interface {{ veth_prefix + tenks_bridge + veth_bridge_source_suffix }}
             type=patch
             options:peer={{ veth_prefix + tenks_bridge +
diff --git a/ansible/roles/veth-pair/tasks/main.yml b/ansible/roles/veth-pair/tasks/main.yml
index dd4ba1e..9944eef 100644
--- a/ansible/roles/veth-pair/tasks/main.yml
+++ b/ansible/roles/veth-pair/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create veth pair
-  command: >
+  command: >-
     ip link add dev {{ veth_pair_ovs_link_name }}
     type veth
     peer name {{ veth_pair_source_link_name }}
@@ -17,7 +17,7 @@
   become: true
 
 - name: Plug veth into source bridge
-  command: >
+  command: >-
     brctl addif {{ veth_pair_source_bridge }}
     {{ veth_pair_source_link_name }}
   register: res
diff --git a/ansible/schedule.yml b/ansible/schedule.yml
index 08225ed..34345d7 100644
--- a/ansible/schedule.yml
+++ b/ansible/schedule.yml
@@ -10,7 +10,7 @@
 # during scheduling.
 - name: Collect hypervisor hostvars
   set_fact:
-    hypervisor_vars: >
+    hypervisor_vars: >-
       {{ hypervisor_vars | default({}) | combine({item: hostvars[item]}) }}
   loop: "{{ groups['controllers'] }}"