simplify compute-init file copy

Author: sjpb

ansible/roles/compute_init/tasks/install.yml

@@ -13,49 +13,28 @@
     - library
     - filter_plugins
 
-- name: Inject templates
+- name: Inject files from roles
   copy:
-    src: '{{ item }}'
-    dest: '/etc/ansible-init/templates/{{ item | basename }}'
+    src: '{{ item.src }}'
+    dest: '/etc/ansible-init/{{ item.dest }}'
     owner: root
     group: root
     mode: 0644
   loop:
-    - ../../resolv_conf/templates/resolv.conf.j2
-    - ../../stackhpc.os-manila-mount/templates/ceph.conf.j2
-    - ../../stackhpc.os-manila-mount/templates/ceph.keyring.j2
-
-- name: Inject files
-  copy:
-    src: '{{ item }}'
-    dest: '/etc/ansible-init/files/{{ item | basename }}'
-    owner: root
-    group: root
-    mode: 0644
-  loop:
-    - ../../resolv_conf/files/NetworkManager-dns-none.conf
-
-- name: Inject libraries
-  copy:
-    src: '{{ item }}'
-    dest: '/etc/ansible-init/library/{{ item | basename }}'
-    owner: root
-    group: root
-    mode: 0644
-  loop:
-    - ../../stackhpc.os-manila-mount/library/os_manila_share.py
-    
-- name: Inject filter_plugins
-  copy:
-    src: '{{ item }}'
-    dest: '/etc/ansible-init/filter_plugins/{{ item | basename }}'
-    owner: root
-    group: root
-    mode: 0644
-  loop:
-    - ../../basic_users/filter_plugins/filter_keys.py
+    - src: ../../resolv_conf/templates/resolv.conf.j2
+      dest: templates/resolv.conf.j2
+    - src: ../../stackhpc.os-manila-mount/templates/ceph.conf.j2
+      dest: templates/ceph.conf.j2
+    - src: ../../stackhpc.os-manila-mount/templates/ceph.keyring.j2
+      dest: templates/ceph.keyring.j2
+    - src: ../../resolv_conf/files/NetworkManager-dns-none.conf
+      dest: files/NetworkManager-dns-none.conf
+    - src: ../../stackhpc.os-manila-mount/library/os_manila_share.py
+      dest: library/os_manila_share.py
+    - src: ../../basic_users/filter_plugins/filter_keys.py
+      dest: filter_plugins/filter_keys.py
 
-- name: Add filter_plugins ansible.cfg
+- name: Add filter_plugins to ansible.cfg
   lineinfile:
     path: /etc/ansible-init/ansible.cfg
     line: "filter_plugins = /etc/ansible-init/filter_plugins"
@@ -64,7 +43,7 @@
     group: root
     mode: 0644
 
-- name: Inject compute initialisation playbook
+- name: Add compute initialisation playbook
   copy:
     src: compute-init.yml
     dest: /etc/ansible-init/playbooks/1-compute-init.yml