aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2017-06-14 10:13:08 +0000
committerPeter Mikus <pmikus@cisco.com>2017-06-19 06:14:13 +0000
commitf22e850f38ad5a1630271d020b2078c1580c99c0 (patch)
tree831b5009d111663421841d4905f35aed6d2322cc /resources
parentb47b29bdbd8c10c8e5fcac6cc9abe72bea75df49 (diff)
Update Ansible scripts for image server copy
Change-Id: I7fa1808218d59ae0094952a94447613b90ce4fd2 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/testbed-setup/playbooks/04-disk-image.yaml24
-rw-r--r--resources/tools/testbed-setup/playbooks/05-ckoester.yaml17
2 files changed, 20 insertions, 21 deletions
diff --git a/resources/tools/testbed-setup/playbooks/04-disk-image.yaml b/resources/tools/testbed-setup/playbooks/04-disk-image.yaml
index 884a8db65b..bc0016ed40 100644
--- a/resources/tools/testbed-setup/playbooks/04-disk-image.yaml
+++ b/resources/tools/testbed-setup/playbooks/04-disk-image.yaml
@@ -4,8 +4,24 @@
tasks:
- name: Create server image directory
file: path=/home/virl/virl-server-image state=directory mode=0755
- - name: Copy server image
- copy: src=files/virl-server-image/server.qcow2 dest=/home/virl/virl-server-image/server.qcow2 mode=644
+ - 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
+ - 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 server image into glance
- shell: virl_uwm_client image-create --subtype server --version java-nested --release 14.04.03 --image-on-server /home/virl/virl-server-image/server.qcow2
+ - 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
+ - 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
+- hosts: virl
+ remote_user: testuser
+ sudo: yes
+ tasks:
+ - name: Create common directory
+ file: path=/nfs/common state=directory mode=0755
+ - name: Create Nested VM directory
+ file: path=/nfs/common/nested-vm state=directory mode=0755
+ - 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
diff --git a/resources/tools/testbed-setup/playbooks/05-ckoester.yaml b/resources/tools/testbed-setup/playbooks/05-ckoester.yaml
deleted file mode 100644
index 02d632e78c..0000000000
--- a/resources/tools/testbed-setup/playbooks/05-ckoester.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-- hosts: virl
- remote_user: jenkins-in
- tasks:
- - name: Copy some VPP packages across for testing
- synchronize: src=/home/jenkins-in/vpp-pkgs dest=/home/jenkins-in/
- - name: Install Carsten's public key
- lineinfile: dest=/home/jenkins-in/.ssh/authorized_keys line='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiXwDJc8sFpMrn/pEtaT9Ug6BmkFDtJVOX1bCPZWyg650IUBgrIo9cEcpwJNI53p4roTsUmOcYA391jaC5Z9cH5JngUFH0OlyLGdbzlKREzD7PeKGGn7RQFDhZS+L7I+9ayaTn+RJi5EI6b/uWeP0tEvCrFDRJJPu3I9Ohgkbc7CfzeXuX57t9rMbYduvsDpOLQ6s14mSy6T7qGexyE5mQIkSZ4XfWxOuT1nDvMsIw7ej86pKXE/faqvKczoqMa9SUnxo27b4Oe62+KlGt0iXDCYvK9tiDOU8Mi/ZGOM1k2utZOVeD4r7b8rWFbX1aw35roPUPdFEH+ROUGPljrlJT cloud-user@test-ubuntu-1404'
-- hosts: virl
- remote_user: virl
- tasks:
- - name: Install Carsten's public key
- lineinfile: dest=/home/virl/.ssh/authorized_keys line='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiXwDJc8sFpMrn/pEtaT9Ug6BmkFDtJVOX1bCPZWyg650IUBgrIo9cEcpwJNI53p4roTsUmOcYA391jaC5Z9cH5JngUFH0OlyLGdbzlKREzD7PeKGGn7RQFDhZS+L7I+9ayaTn+RJi5EI6b/uWeP0tEvCrFDRJJPu3I9Ohgkbc7CfzeXuX57t9rMbYduvsDpOLQ6s14mSy6T7qGexyE5mQIkSZ4XfWxOuT1nDvMsIw7ej86pKXE/faqvKczoqMa9SUnxo27b4Oe62+KlGt0iXDCYvK9tiDOU8Mi/ZGOM1k2utZOVeD4r7b8rWFbX1aw35roPUPdFEH+ROUGPljrlJT cloud-user@test-ubuntu-1404'
-- hosts: virl
- remote_user: testuser
- tasks:
- - name: Install Carsten's public key
- lineinfile: dest=/home/testuser/.ssh/authorized_keys line='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiXwDJc8sFpMrn/pEtaT9Ug6BmkFDtJVOX1bCPZWyg650IUBgrIo9cEcpwJNI53p4roTsUmOcYA391jaC5Z9cH5JngUFH0OlyLGdbzlKREzD7PeKGGn7RQFDhZS+L7I+9ayaTn+RJi5EI6b/uWeP0tEvCrFDRJJPu3I9Ohgkbc7CfzeXuX57t9rMbYduvsDpOLQ6s14mSy6T7qGexyE5mQIkSZ4XfWxOuT1nDvMsIw7ej86pKXE/faqvKczoqMa9SUnxo27b4Oe62+KlGt0iXDCYvK9tiDOU8Mi/ZGOM1k2utZOVeD4r7b8rWFbX1aw35roPUPdFEH+ROUGPljrlJT cloud-user@test-ubuntu-1404'