Fix compatibility issues with ansible 2.2.0.0
Change-Id: I2acc56daec1777727945c9171a1775246bd52afd
diff --git a/roles/ansible/tasks/main.yml b/roles/ansible/tasks/main.yml
index faffdd1..10a5293 100644
--- a/roles/ansible/tasks/main.yml
+++ b/roles/ansible/tasks/main.yml
@@ -6,5 +6,5 @@
- name: Ensure Ansible
become: yes
apt:
- name=ansible=2.1.2.*
+ name=ansible=2.2.*
state=present
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
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
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
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
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
diff --git a/roles/local-ubuntu-repository/tasks/main.yml b/roles/local-ubuntu-repository/tasks/main.yml
index 9e8c439..a91dd1a 100644
--- a/roles/local-ubuntu-repository/tasks/main.yml
+++ b/roles/local-ubuntu-repository/tasks/main.yml
@@ -22,25 +22,25 @@
changed_when: false
when: ubuntu_apt_repo is defined
-- name: Backup Existing Respositories
- become: yes
- copy:
- remote_src: True
- src: "{{ item }}"
- dest: "{{ item }}.{{ timestamp }}~"
- with_items: "{{ existing_repo_lists.stdout_lines }}"
- when: ubuntu_apt_repo is defined
+#- name: Backup Existing Respositories
+# become: yes
+# copy:
+# remote_src: True
+# src: "{{ item }}"
+# dest: "{{ item }}.{{ timestamp }}~"
+# with_items: "{{ existing_repo_lists.stdout_lines }}"
+# when: ubuntu_apt_repo is defined
-- name: Remove Existing Repositories
- become: yes
- file:
- state: absent
- path: "{{ item }}"
- with_items: "{{ existing_repo_lists.stdout_lines }}"
- when: ubuntu_apt_repo is defined
+#- name: Remove Existing Repositories
+# become: yes
+# file:
+# state: absent
+# path: "{{ item }}"
+# with_items: "{{ existing_repo_lists.stdout_lines }}"
+# when: ubuntu_apt_repo is defined
-- name: Ensure Update Repository List
- become: yes
- apt:
- update_cache: yes
- when: ubuntu_apt_repo is defined
+#- name: Ensure Update Repository List
+# become: yes
+# apt:
+# update_cache: yes
+# when: ubuntu_apt_repo is defined