commit b2b7fd974635bf15a55777eb33d885edbd4e5a6c
author Scott Baker <smbaker@gmail.com> Tue Nov 01 16:01:38 2016 -0700
committer Scott Baker <smbaker@gmail.com> Wed Nov 02 12:15:18 2016 -0700
tree 4d2fee2055167e327b61b523c205b29b8a1c4d51
parent 11850cb7a16ea3d474a996d397b0a9e64adc9d08

Fix compatibility issues with ansible 2.2.0.0

Change-Id: I2acc56daec1777727945c9171a1775246bd52afd

roles/head-node/tasks/main.yml

diff --git a/roles/head-node/tasks/main.yml b/roles/head-node/tasks/main.yml
index a6409ef..68923ce 100644
--- a/roles/head-node/tasks/main.yml
+++ b/roles/head-node/tasks/main.yml
@@ -60,7 +60,7 @@
 - name: Ensure Compute and Switch Node Playbooks
   become: yes
   template:
-    src=files/{{ item }}
+    src=templates/{{ item }}
     dest=/etc/maas/ansible/{{ item }}
     owner=maas
     group=maas
@@ -81,7 +81,7 @@
 - name: Ensure Compute and Switch Node Variables
   become: yes
   template:
-    src=files/compute-node-vars.yml.j2
+    src=templates/compute-node-vars.yml.j2
     dest=/etc/maas/ansible/vars/compute-node-vars.yml
     owner=maas
     group=maas
@@ -101,7 +101,7 @@
 - name: Ensure Dynamic Inventory Script
   become: yes
   template:
-    src=files/pod-inventory
+    src=templates/pod-inventory
     dest=/etc/maas/ansible/pod-inventory
     owner=maas
     group=maas

roles/head-node/templates/compute-node-vars.yml.j2

diff --git a/roles/head-node/files/compute-node-vars.yml.j2 b/roles/head-node/templates/compute-node-vars.yml.j2
similarity index 100%
rename from roles/head-node/files/compute-node-vars.yml.j2
rename to roles/head-node/templates/compute-node-vars.yml.j2

roles/head-node/templates/compute-node.yml

diff --git a/roles/head-node/files/compute-node.yml b/roles/head-node/templates/compute-node.yml
similarity index 100%
rename from roles/head-node/files/compute-node.yml
rename to roles/head-node/templates/compute-node.yml

roles/head-node/templates/pod-inventory

diff --git a/roles/head-node/files/pod-inventory b/roles/head-node/templates/pod-inventory
similarity index 100%
rename from roles/head-node/files/pod-inventory
rename to roles/head-node/templates/pod-inventory

roles/head-node/templates/switch-node.yml

diff --git a/roles/head-node/files/switch-node.yml b/roles/head-node/templates/switch-node.yml
similarity index 100%
rename from roles/head-node/files/switch-node.yml
rename to roles/head-node/templates/switch-node.yml