bosh_deployer 1.1.0 → 1.2.0

data/config/vcloud_defaults.yml

@@ -0,0 +1,38 @@
+---
+name:
+
+logging:
+  level: INFO
+
+dir:
+
+network:
+  dns: []
+  cloud_properties:
+    name:
+
+env:
+  bosh:
+    password:
+
+resources:
+  persistent_disk: 4096
+  cloud_properties:
+    ram: 1024
+    disk: 4096
+    cpu: 1
+
+cloud:
+  plugin: vcloud
+  properties:
+    agent:
+      ntp: []
+      blobstore:
+        plugin: local
+        properties:
+          blobstore_path: /var/vcap/micro_bosh/data/cache
+      mbus:
+    vcds: []
+
+apply_spec:
+  properties: {}

data/lib/deployer/instance_manager/vcloud.rb

@@ -0,0 +1,38 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+module Bosh::Deployer
+  class InstanceManager
+
+    class Vcloud < InstanceManager
+
+      def update_spec(spec)
+        spec = super(spec)
+        properties = spec["properties"]
+
+        properties["vcd"] =
+          Config.spec_properties["vcd"] ||
+          Config.cloud_options["properties"]["vcds"].first.dup
+
+        properties["vcd"]["address"] ||= properties["vcd"]["url"]
+
+        spec
+      end
+
+      # @return [Integer] size in MiB
+      def disk_size(cid)
+        cloud.get_disk_size_mb(cid)
+      end
+
+      def persistent_disk_changed?
+        Config.resources['persistent_disk'] != disk_size(state.disk_cid)
+      end
+
+      def check_dependencies
+        if Bosh::Common.which(%w[genisoimage mkisofs]).nil?
+          err("either of 'genisoimage' or 'mkisofs' commands must be present")
+        end
+      end
+    end
+
+  end
+end

data/lib/deployer/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Deployer
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_deployer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: bosh_vcloud_cpi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.8
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +179,7 @@ extra_rdoc_files: []
 files:
 - config/aws_defaults.yml
 - config/openstack_defaults.yml
+- config/vcloud_defaults.yml
 - config/vsphere_defaults.yml
 - lib/bosh/cli/commands/micro.rb
 - lib/deployer.rb
@@ -171,6 +188,7 @@ files:
 - lib/deployer/instance_manager.rb
 - lib/deployer/instance_manager/aws.rb
 - lib/deployer/instance_manager/openstack.rb
+- lib/deployer/instance_manager/vcloud.rb
 - lib/deployer/instance_manager/vsphere.rb
 - lib/deployer/instance_manager_helpers.rb
 - lib/deployer/models/instance.rb
@@ -192,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -60507777349022413
+      hash: 2681661945241081021
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -60507777349022413
+      hash: 2681661945241081021
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24