From d8d04ebf350a5efbf86910042ccffe46ff741033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Thu, 30 Apr 2015 12:31:36 +0000
Subject: [PATCH] upload rhel6,7 cloud images

---
 .../fed-cloud09.cloud.fedoraproject.org.yml   | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index 84be9b5103..a1c012ee7a 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -517,8 +517,7 @@
   - get_url: url=http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.qcow2 dest=/root/images/Fedora-Cloud-Base-20141203-21.x86_64.qcow2 mode=0440
   - get_url: url=http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1503.qcow2 dest=/root/images/CentOS-7-x86_64-GenericCloud-1503.qcow2 mode=0440
   - get_url: url=http://cloud.centos.org/centos/6/images/CentOS-6-x86_64-GenericCloud-20141129_01.qcow2 dest=/root/images/CentOS-6-x86_64-GenericCloud-20141129_01.qcow2 mode=0440
-  # RHEL6 can be downloaded from https://rhn.redhat.com/rhn/software/channel/downloads/Download.do?cid=16952
-  # RHEL7 can be download from https://access.redhat.com/downloads/content/69/ver=/rhel---7/7.0/x86_64/product-downloads
+  # restricted images (RHEL) are handled two steps below
   - name: Add the images
     glance_image:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
@@ -536,11 +535,32 @@
         file: /root/images/CentOS-7-x86_64-GenericCloud-1503.qcow2
       - name: CentOS-6-x86_64-GenericCloud-20141129_01
         file: /root/images/CentOS-6-x86_64-GenericCloud-20141129_01.qcow2
-      # FIXME uncomment when you manualy download
-      #- name: rhel-guest-image-6.5-20140630.0.x86_64
-      #  file: /root/images/rhel-guest-image-6.5-20140630.0.x86_64.qcow2
-      #- name: rhel-guest-image-7.0-20140618.1.x86_64
-      #  file: /root/images/rhel-guest-image-7.0-20140618.1.x86_64.qcow2
+
+  # RHEL6 can be downloaded from https://rhn.redhat.com/rhn/software/channel/downloads/Download.do?cid=16952
+  - stat: path=/root/images/rhel-guest-image-6.6-20141222.0.x86_64.qcow2
+    register: rhel6_image
+  - name: Add the RHEL6 image
+    glance_image:
+      login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
+      auth_url="https://{{controller_hostname}}:35357/v2.0"
+      name="rhel-guest-image-6.6-20141222.0.x86_64"
+      disk_format=qcow2
+      is_public=True
+      file="/root/images/rhel-guest-image-6.6-20141222.0.x86_64.qcow2"
+    when: rhel6_image.stat.exists == True
+
+  # RHEL7 can be download from https://access.redhat.com/downloads/content/69/ver=/rhel---7/7.0/x86_64/product-downloads
+  - stat: path=/root/images/rhel-guest-image-7.0-20140930.0.x86_64.qcow2
+    register: rhel7_image
+  - name: Add the RHEL7 image
+    glance_image:
+      login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
+      auth_url="https://{{controller_hostname}}:35357/v2.0"
+      name="rhel-guest-image-7.0-20140930.0.x86_64"
+      disk_format=qcow2
+      is_public=True
+      file="/root/images/rhel-guest-image-7.0-20140930.0.x86_64.qcow2"
+    when: rhel7_image.stat.exists == True
 
 
   ##### PROJECTS ######