CSIT-1070 Update Ansible structure

[csit.git] / resources / tools / testbed-setup / ansible / roles / virl / tasks / 04-disk-image.yaml

diff --git a/resources/tools/testbed-setup/playbooks/04-disk-image.yaml b/resources/tools/testbed-setup/ansible/roles/virl/tasks/04-disk-image.yaml
similarity index 92%
rename from resources/tools/testbed-setup/playbooks/04-disk-image.yaml
rename to resources/tools/testbed-setup/ansible/roles/virl/tasks/04-disk-image.yaml
index fe06937..254c05e 100644 (file)
--- a/resources/tools/testbed-setup/playbooks/04-disk-image.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/virl/tasks/04-disk-image.yaml
@@ -1,21 +1,19 @@
 ---
-- hosts: virl
-  remote_user: virl
-  tasks:
   - name: Create server image directory
     file: path=/home/virl/virl-server-image state=directory mode=0755
+    become: virl
   - name: Copy UBUNTU server image
     copy: src=/home/virl/virl-server-image/packer-csit-ubuntu-16.04.1_2017-10-21_2.0-qemu dest=/home/virl/virl-server-image/packer-csit-ubuntu-16.04.1_2017-10-21_2.0-qemu owner=virl group=virl mode=644
+    become: virl
   - name: Copy CENTOS server image
     copy: src=/home/virl/virl-server-image/packer-csit-centos-7.3-1611_2017-02-23_1.4-qemu dest=/home/virl/virl-server-image/packer-csit-centos-7.3-1611_2017-02-23_1.4-qemu owner=virl group=virl mode=644
+    become: virl
   - name: Import UBUNTU server image into glance
     shell: virl_uwm_client image-create --subtype server --version csit-ubuntu-16.04.1_2017-10-21_2.0 --image-on-server /home/virl/virl-server-image/packer-csit-ubuntu-16.04.1_2017-10-21_2.0-qemu
+    become: virl
   - name: Import CENTOS server image into glance
     shell: virl_uwm_client image-create --subtype server --version csit-centos-7.3-1611_2017-02-23_1.4 --image-on-server /home/virl/virl-server-image/packer-csit-centos-7.3-1611_2017-02-23_1.4-qemu
-- hosts: virl
-  remote_user: testuser
-  sudo: yes
-  tasks:
+    become: virl
   - name: Create common directory
     file: path=/nfs/common state=directory mode=0755
   - name: Create Nested VM directory
@@ -26,4 +24,4 @@
     file:
         src: /nfs/common/nested-vm-current.img.disabled
         dest: /nfs/common/nested-vm/csit-nested-1.6.img
-        state: link
\ No newline at end of file
+        state: link