bosh_vcloud_cpi 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c608586130394ee017d5d2eb63700ce63826aef
-  data.tar.gz: 5168386f10ca6b36060da0001a1f8363c37ecb2c
+  metadata.gz: 4a78d3ecf8e961821180d301cb22fcee8a6a3d2c
+  data.tar.gz: bc414b5280ac52c0addf1fe754830b3dd856369d
 SHA512:
-  metadata.gz: 05c93554f01ed00e7128a515da7ad005cc6a6faa3c1d4026b2e2f6fb2849ff4b2b9dc7d38be3a1119ba0593f84b462429554cc7cd083ba906ff0d94e467960d1
-  data.tar.gz: 3cb633a4b8a91a0ebc25850b43d493df15fd35c8597bf4af74e1e49ef0d9acc0f7e393deee8c65f0375d7e790d8f545e3b90f4fef34c090a313ed8f59a33cd8f
+  metadata.gz: 3485a56c5d4b7046bcd301f82f8f76d21a7a460ec863e7175b65d6694957b23915976c66a64d916db51238021dd77d95169c856e30ba7a8b504dd984e322a114
+  data.tar.gz: 088ebb06315d9fe0432f17cb55a94a6fafbdfa6f4ff7ba0fe4882507dd1d447a62fb7b90d5d145929e768ded0ac38fa29205fa1a2b3b5ae0593b193d18c3e53e

data/README.md

@@ -3,52 +3,90 @@ Copyright (c) VMware, Inc.
 
 ## Introduction
 
-A BOSH CPI implementation for a vCloud Director backed infrastructure cloud.
-
-Use the vSphere MicroBosh and BOSH stemcells when targetting vCloud Director.
-
+It's a BOSH CPI implementation for a vCloud Director backed infrastructure cloud. 
 In order to target a vCloud Director instance, MicroBosh must be set to use
 the vCloud plugin configuration as shown below:
 
     ---
 	plugin: vcloud
     vcds
-	  - url:  <VCD url> (e.g. http://1.2.3.4)
-	    user: <VCD user> (e.g. orgadmin)      
-        password: <>
+	  - url:   
+	    user:      
+        password: 
 	    entities:
-		    organization: <Organization name>
-		    virtual_datacenter: <VDC name>
-		    vapp_catalog: <Organization catalog name>
-		    media_catalog: <Organization catalog name>
-		    vm_metadata_key: cf-agent-env
-		    description: <Text associated with Cloud Foundry VMs>
-   
+		  organization: 
+		  virtual_datacenter: 
+		  vapp_catalog: 
+		  media_catalog:
+		  media_storage_profile:
+          vm_metadata_key:
+		  description:
+          control: #optional parameters
+            wait_max: #optional parameters     
 
 Note that vCloud Director version 5.1 or newer is required.
 
+## Parameters
+
+This section explains which parameters are supported in vCloud BOSH CPI.
+
+### vCloud related
+
+* `url` (required)
+  The endpoint of the target vCloud Director 
+* `user` (required)
+  The user name of the target vCloud Director 
+* `password` (required)
+  The password of the target vCloud Director
+* `organization` (required)
+  The organization name 
+* `virtual_datacenter` (required)
+  The virtual data center name
+* `vapp_catalog` (required)
+  The name of the calalog for vapp template
+* `media_catalog` (required)
+  The name of the calalog for media files
+* `media_storage_profile` (required)
+  The storage profile to use. You can put * here to match all the storage profiles.  
+* `vm_metadata_key` (required)
+  The key name of VM metadata
+* `description` (required)
+  Text associated with the VMs
+* `Control` (optional)
+  All the following control parameters are optional  
+* `wait_max` (optional)
+  Maximum wait seconds for a single CPI task
+* `wait_delay` (optional)
+  Delay in seconds for pooling next CPI task status
+* `cookie_timeout` (optional)
+  The cookie timeout in seconds
+* `retry_max` (optional)
+  Maximum retry times
+* `retry_delay` (optional)
+  The delay of first retry, the next is *2
+
+
+### Network related
+
+The network name should be specified under `cloud_properties` in the `networks` section of a BOSH deployment manifest. It should be the 'Org VDC Network' you plan to use for deployment. 
+
 
 ## Example
 
-This is a sample of how vCloud Director specific properties are used in a BOSH deployment manifest:
+This is a sample of how vCloud Director specific properties are used in a  BOSH deployment manifest:
 
     ---
-    name: sample
-    director_uuid: 38ce80c3-e9e9-4aac-ba61-97c676631b91
-
-    ...
-	
 	networks:
-	- name: default # An internal name for the network in your manifest file
+	- name: default 
 	  subnets:
-	  - reserved:
-	    - 10.146.21.129 - 10.146.21.150
+	    - reserved:
+	    - 192.168.21.129 - 192.168.21.150
 	    static:
-	    - 10.146.21.151 - 10.146.21.189
-	    range: 10.146.21.128/25
-	    gateway: 10.146.21.253
+	    - 192.168.21.151 - 192.168.21.189
+	    range: 192.168.21.128/25
+	    gateway: 192.168.21.253
 	    dns:
-	    - 10.132.71.1
+	    - 192.168.71.1
 	    cloud_properties:
 	      name: "tempest_vdc_network"
 
@@ -56,12 +94,12 @@ This is a sample of how vCloud Director specific properties are used in a BOSH d
 
     properties:
 	  vcd:
-	    url: https://10.146.21.135
-	    user: dev_mgr
-	    password: vmware
+	    url: https://192.168.10.1
+	    user: dev
+	    password: pwd
 	    entities:
 	      organization: dev
-	      virtual_datacenter: tempest
+	      virtual_datacenter: vdc
 	      vapp_catalog: cloudfoundry
 	      media_catalog: cloudfoundry 
 	      media_storage_profile: *

data/lib/cloud/vcloud/steps/instantiate.rb

@@ -16,21 +16,23 @@ module VCloudCloud
         params.linked_clone = false
         params.set_locality = locality_spec template, disk_locality
 
+        state[:instantiate_vapp_name] = vapp_name
+
         vapp = client.invoke :post, client.vdc.instantiate_vapp_template_link, :payload => params
 
         state[:vapp] = client.wait_entity vapp
       end
 
       def rollback
-        vapp = state[:vapp]
-        if vapp
-          @logger.debug "Requesting vApp: #{vapp.name}"
+        vapp_name = state[:instantiate_vapp_name]
+        if vapp_name
+          @logger.debug "Requesting vApp: #{vapp_name}"
 
           # Note that when renaming vApp, the remove_link stays the same and points to
           # the original vApp. To avoid potential inconsistency, fetch vApp from the server.
           begin
             client.flush_cache  # flush cached vdc which contains vapp list
-            vapp = client.vapp_by_name vapp.name
+            vapp = client.vapp_by_name vapp_name
             link = vapp.remove_link true
             client.invoke_and_wait :delete, link if link
           rescue => ex
@@ -39,6 +41,7 @@ module VCloudCloud
 
           # remove the item from state
           state.delete :vapp
+          state.delete :instantiate_vapp_name
         end
       end
 

data/lib/cloud/vcloud/steps/poweron.rb

@@ -9,9 +9,28 @@ module VCloudCloud
         end
         poweron_link = entity.power_on_link
         raise "#{entity.name} unable to power on" unless poweron_link
+        state[:poweron_target] = state[ref]
         client.invoke_and_wait :post, poweron_link
         state[ref] = client.reload entity
       end
+
+      def rollback
+        target = state[:poweron_target]
+        if target
+          begin
+            entity = client.reload target
+            if entity['status'] == VCloudSdk::Xml::RESOURCE_ENTITY_STATUS[:POWERED_OFF].to_s
+              @logger.debug "#{entity.name} already powered off"
+              return
+            end
+
+            poweroff_link = entity.power_off_link
+            client.invoke_and_wait :post, poweroff_link
+          rescue => ex
+            @logger.debug(ex) if @logger
+          end
+        end
+      end
     end
   end
 end

data/lib/cloud/vcloud/steps/recompose.rb

@@ -14,6 +14,26 @@ module VCloudCloud
         recompose_vapp_link = container_vapp.recompose_vapp_link true
         client.invoke_and_wait :post, recompose_vapp_link, :payload => params
       end
+
+      def rollback
+        # The recompose method is only used in create_vm step.
+        # The rollback logic here is to delete the new-created VM.
+        vm = state[:vm]
+        if vm
+          @logger.debug "Requesting VM: #{vm.name}"
+
+          begin
+            entity = client.reload vm
+            link = entity.remove_link true
+            client.invoke_and_wait :delete, link if link
+          rescue => ex
+            @logger.debug(ex) if @logger
+          end
+
+          # remove the item from state
+          state.delete :vm
+        end
+      end
     end
   end
 end

data/lib/cloud/vcloud/version.rb

@@ -2,7 +2,7 @@ module Bosh
   module Clouds
 
     class VCloud
-      VERSION = '1.5.0.pre.3'
+      VERSION = '0.5.3'
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vcloud_cpi
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -110,7 +110,7 @@ dependencies:
         version: 1.5.6
 description: |-
   BOSH vCloud CPI
-  5ea4fb
+  dff08c
 email: support@cloudfoundry.com
 executables: []
 extensions: []