vcloud-box-spinner 0.2.2 → 0.2.3

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
+bundle/*
 pkg/*
 vendor/*
 *.swp

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.2.3 2013-09-04
+
+ - Increase spin up wait to 3 minutes.
+ - Cycle power to identify VMware Tools for Guest Customization.
+
 0.2.2 2013-08-13
 
  - Making --setup-script option while create action optional

data/docs/uuids.md

@@ -1,41 +1,55 @@
 # Finding various UUIDs needed by the JSON files
 
-## Catalog Item UUID
+Using: [VCloud Tools](https://github.com/alphagov/vcloudtools)
 
-* Authorization:
 
-        curl -v -X POST -d '' -H "Accept: application/*+xml;version=5.1" -u "username@org-name:password" "https://vendor-api-endpoint/api/sessions"
+## Logging into VCloud
 
-  - The above returns x-vcloud-authorization token
-  - The abpve request returns xml, which contains the reference to the organisation details url, similar to below
+```
+#$> export VCLOUD_API_ROOT=https://api.vcd.example.com/api eval `vcloud-login`
+Please log into vCloud
+Username: username@organisation
+Password:
+```
 
-            <Link rel="down" type="application/vnd.vmware.vcloud.org+xml" name="org-name" href="https://vendor-api-endpoint/api/org/{org-uuid}"/>
+## Finding Catalog and VM Template UUIDs
 
-* Get org details:
 
-        curl -v --insecure -H "x-vcloud-authorization: <token>" -H "Accept: application/*+xml;version=5.1" https://vendor-api-endpoint/api/org/{org-uuid}
+### Finding the organisation uuid
+ 
+```
+#$> vcloud-browse /org | grep MyOrg
+    <Org type="application/vnd.vmware.vcloud.org+xml" name="MyOrg" href="https://api.vcd.example.com/api/org/77595ec2-2391-4817-9257-66b12533d684"/>
+```
 
-  - The above returns catalog details. (In vcloud you have a catalog which is a group pf catalogItems i.e templates)
+In this example, the Org UUID is `77595ec2-2391-4817-9257-66b12533d684`
 
-            <Link rel="down" type="application/vnd.vmware.vcloud.catalog+xml" name="Default" href="https://vendor-api-endpoint/api/catalog/{catalog-uuid}"/>
+### Finding the catalog
 
-* Get catalog items
+```
+#$> vcloud-browse /org/77595ec2-2391-4817-9257-66b12533d684 | grep vcloud.catalog+xml
+    <Link rel="down" type="application/vnd.vmware.vcloud.catalog+xml" name="Private" href="https://api.vcd.example.com/api/catalog/9250924f-20af-4bcc-9f50-1125a2c15d2c"/>
+    <Link rel="down" type="application/vnd.vmware.vcloud.catalog+xml" name="Public Catalogue" href="https://api.vcd.example.com/api/catalog/b695b0f0-1abf-4562-bd4a-d64cf133888b"/>
+    <Link rel="down" type="application/vnd.vmware.vcloud.catalog+xml" name="Default" href="https://api.vcd.example.com/api/catalog/3af329ef-3371-49d4-aaa0-0b98a03a9255"/>
+```
 
-        curl -v --insecure -H "x-vcloud-authorization: {token}" -H "Accept: application/*+xml;version=5.1" https://vendor-api-endpoint/api/catalog/{catalog-uuid}
+This lists three possible catalogs, Private, Default and Public Catalogue (yours may be named differently, or you may have a different number of them.)
 
-  - The above returns all the catalogItems in the catalog, you can choose the desired one
+In the next example, we will use the UUID of the "Public Catalogue" which is `b695b0f0-1abf-4562-bd4a-d64cf133888b`
 
-            <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="{catalog-item-name}" href="https://vendor-api-endpoint/api/catalogItem/{catalog-item-uuid}"/>
+### Finding Templates within a Catalog
 
+```
+[/Users/ssharpe]$ vcloud-browse /catalog/b695b0f0-1abf-4562-bd4a-d64cf133888b | grep catalogItem+xml
+        <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="Ubuntu 12.04 Desktop" href="https://api.vcd.example.com/api/catalogItem/4e376bed-5d4c-4748-9d0d-1469b24f31c0"/>
+        <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="Ubuntu 12.04 Server" href="https://api.vcd.example.com/api/catalogItem/4887d502-5873-4d0c-bb63-075792277ec6"/>
+```
 
-## Network UUID
+## Finding Network UUIDs
 
-* Authorization: (same as describe in above steps)
-
-* Get org details:
-
-        curl -v --insecure -H "x-vcloud-authorization: <token>" -H "Accept: application/*+xml;version=5.1" https://vendor-api-endpoint/api/org/{org-uuid}
-
-  - The above returns network details, choose the one you need on basis of name
-
-            <Link rel="down" type="application/vnd.vmware.vcloud.orgNetwork+xml" name="{network-name}" href="https://vendor-api-endpoint/api/network/{network-uuid}"/>
+```
+#$> vcloud-browse /org/0e665418-a3d5-4363-aec0-f2da5ab399d9 | grep orgNetwork
+<Link rel="down" type="application/vnd.vmware.vcloud.orgNetwork+xml" name="Net1" href="https://api.vcd.example.com/api/network/e22af121-cdaf-455b-b840-1d7283aaeca7"/>
+<Link rel="down" type="application/vnd.vmware.vcloud.orgNetwork+xml" name="Net2" href="https://api.vcd.example.com/api/network/59defffb-f6b7-47b8-a82c-80a8bc3fc76b"/>
+<Link rel="down" type="application/vnd.vmware.vcloud.orgNetwork+xml" name="Net3" href="https://api.vcd.example.com/api/network/91ae3fdb-e354-426c-be79-4911f7c5dbdb"/>
+```

data/lib/provisioner/compute_action/create.rb

@@ -51,6 +51,7 @@ module Provisioner
         guest_customization_section = customization_options[:GuestCustomizationSection]
 
         response = modify_xml(guest_customization_section[:href], guest_customization_section[:type]) do |xml|
+          xml.at_css('Enabled').content = 'true'
           xml.at_css('ComputerName').content = options[:vm_name]
           if xml.at_css('CustomizationScript').nil?
             xml.at_css('ComputerName').before("<CustomizationScript>#{CGI.escapeHTML(user_data)}</CustomizationScript>\n")
@@ -127,15 +128,8 @@ module Provisioner
       end
       private :update_network_connection_options
 
-      def power_on(server)
-        connection = compute.servers.service
-        power_on_uri = server.links.find {|link| link[:rel] == 'power:powerOn' }[:href]
-        connection.request(:uri => power_on_uri, :method => "POST", :expects => 202)
-      end
-      private :power_on
-
       def wait_for_vms_to_appear(server, options)
-        100.times.each do |x|
+        180.times.each do |x|
           logger.debug("waiting for vm to spin up...")
           if server.attributes[:children] && server.attributes[:children][:href]
             return
@@ -149,17 +143,30 @@ module Provisioner
       end
       private :wait_for_vms_to_appear
 
+      def wait_for_vmware_tools(server)
+        logger.debug("cycling power to identify VMware Tools...")
+
+        server.power_on
+        server.wait_for { server.ready? }
+        server.wait_for(90) { attributes[:children][:RuntimeInfoSection][:VMWareTools] }
+
+        server.undeploy
+        server.wait_for { server.ready? }
+      end
+
       def launch_server name
         super
         server = provision(name, options)
 
         wait_for_vms_to_appear(server, options)
+        wait_for_vmware_tools(server)
 
         update_guest_customization_options(server, options)
         update_network_connection_options(server, options)
         update_machine_resources(server, options)
 
-        power_on(server)
+        server.power_on
+        server.wait_for { server.ready? }
 
         server
       end

data/lib/provisioner/version.rb

@@ -1,3 +1,3 @@
 module Provisioner
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -2,7 +2,7 @@
 name: vcloud-box-spinner
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Garima Singh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-13 00:00:00 Z
+date: 2013-09-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -189,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -764948646320920490
+      hash: 2958339827570531793
       segments: 
       - 0
       version: "0"
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -764948646320920490
+      hash: 2958339827570531793
       segments: 
       - 0
       version: "0"