X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fplaybooks%2F04-disk-image.yaml;h=fe069375c6b8cb2bf984216617dac84f32751420;hp=bc0016ed4090312271459ad006fafe4a9d7e4c5a;hb=890c00d6b809d0d908903fbf1a0ec5ceca8b54ad;hpb=04f2c49d50e242ac13aca9938c5a90a2ec012b7f

diff --git a/resources/tools/testbed-setup/playbooks/04-disk-image.yaml b/resources/tools/testbed-setup/playbooks/04-disk-image.yaml
index bc0016ed40..fe069375c6 100644
--- a/resources/tools/testbed-setup/playbooks/04-disk-image.yaml
+++ b/resources/tools/testbed-setup/playbooks/04-disk-image.yaml
@@ -5,14 +5,13 @@
   - name: Create server image directory
     file: path=/home/virl/virl-server-image state=directory mode=0755
   - name: Copy UBUNTU server image
-    copy: src=/home/virl/virl-server-image/packer-csit-ubuntu-16.04.1_2017-02-23_1.8-qemu dest=/home/virl/virl-server-image/packer-csit-ubuntu-16.04.1_2017-02-23_1.8-qemu owner=virl group=virl mode=644
+    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
   - 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
-# TODO: Need to make this conditional, and find a good source for the image.
   - name: Import UBUNTU server image into glance
-    shell: virl_uwm_client image-create --subtype server --release csit-ubuntu-16.04.1_2017-02-23_1.8 --image-on-server /home/virl/virl-server-image/packer-csit-ubuntu-16.04.1_2017-02-23_1.8-qemu
+    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
   - name: Import CENTOS server image into glance
-    shell: virl_uwm_client image-create --subtype server --release 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
+    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
@@ -24,4 +23,7 @@
   - name: Copy Nested VM image
     copy: src=/home/virl/virl-server-image/csit-nested-1.6.img dest=/nfs/common/nested-vm/csit-nested-1.6.img owner=virl group=virl mode=644
   - name: NFS symlink
-    shell: ln -s /nfs/common/nested-vm-current.img.disabled /nfs/common/nested-vm/csit-nested-1.6.img
\ No newline at end of file
+    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