Split direct and indirect glance image url's

Split out direct and indirect url's so that direct url's can show the cli and
indirect url's take the user to the webiste where they can be downloaded.

Change-Id: Iaf0b91f33ee7eaab0e93a8cd526e63b1d2a698a7

openstack_catalog/web/index.html

@@ -347,8 +347,13 @@
 
       <h2>${name} (${disk_format})</h2>
       <div>
+      {{if attributes['url']}}
       <span class="label">glance image-create:</span>
       <input type="text" value="glance image-create --copy-from ${attributes['url']} --disk-format ${disk_format} --container-format ${container_format} --name '${name}'" onfocus="this.select();" onmouseup="return false;">
+      {{else}}
+      <span class="label">Website where the image can be downloaded:</span>
+      <a href="${attributes['indirect_url']}">Link...</a>
+      {{/if}}
       </div>
       {{if supported_by}}
       <div><span class="label">Supported by</span> <span class="value">${supported_by}</span></div>

openstack_catalog/web/static/glance_images.yaml

@@ -209,7 +209,7 @@
         company: Cloudbase
       description: Windows Server 2012 R2 image with cloud_init
       attributes:
-        url: http://www.cloudbase.it/ws2012r2/
+        indirect_url: http://www.cloudbase.it/ws2012r2/
         hash: unknown
       license: Other
       license_url: http://www.cloudbase.it/windows-cloud-images/