bosh-bootstrap 0.11.15 → 0.12.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzAwYzg5ZTFiMmY1Yjg0NDc0NWJmYWUxNDllNzhmYjBmODAxZjJmNg==
+    NDZkNmI0MDEyODI1NGNiMjRjYmJjZmExOGY4ZmFmZDNkNWY3YzIwOA==
   data.tar.gz: !binary |-
-    YTg0NGNmMzU4NmJhM2QxZTlmMGZjYWE2YzNlMzkzNGNiZjIxMjk4Ng==
+    MGQzNWNkMWZkZTE2ODZmMzU2Y2EwY2EwNTQxMDM5YTk0YzJjZDcwOQ==
 SHA512:
   metadata.gz: !binary |-
-    MmExYTBhY2MzZWI0MzU3NWNlOWUxZmJlZGNhMTViMjg0NGYwMTJiY2U2ZDhk
-    NTY5ZDkzZTQ2M2FjN2EzYTIxZTcyZDZhOTQ5YWVhYjY3NWEwZjc1YmQ2NTY0
-    MGMxMmJjNTJmOWZhYTIxNWY4YmY4MzA1YjQ3ZTZjNWFmOTI3NzY=
+    NmVkNTdiMTM1ZmFkMWMzYjUyMGIwNDU1NWZjZGZkYmUyYWRjMGJkZmZmNDg4
+    ZThhZjI5NjMyODBjOTZlNDUzMWQ1MGZhMzJlNGVjMmE3MjA3NDVmNGQ2NjBm
+    MzY3YzExMGMwODIwOWE3N2Q2YjFkMjI4YWVlOTY2OWNhNzMwODI=
   data.tar.gz: !binary |-
-    M2FmMWFkZTA5N2M0MzQ4MTJlYzZiMzMzNjBkNTY0OTg2NWMyNmQ3YjhjOThh
-    NzE1NWM0ZjNiODI5OWUzOTdmMDQ0NmFjZDg4MTAzYmFjMmE1NmQ5ZGNlOTky
-    NGY2ZmFjYmY5MjMzZTZmZGQ2ZDk0ZWNkM2JkOGMzZjE5NmI4ZGU=
+    YzU3ZDQ0ODE4NmJiYjQzYTU1NDlmYWIwZmRkMGY4Njk1NDljZTY3YjZiYzE2
+    ZWQ3NTQyZDg1ZjQyYzBiMTRkYWQ4MDQ5YWNjMjdhNjVhZjA3YWI1YjE1ZWZj
+    YTgwNDU0MDNkYmU0MDM0YzcyN2ExZjNiODhjZjAzZGFiYjgwMjU=

data/ChangeLog.md

@@ -7,6 +7,9 @@
 
 ## Next
 
+## v0.12
+
+* vSphere support [thanks Matt Stine!!]
 
 ## v0.11
 

data/bosh-bootstrap.gemspec

@@ -22,11 +22,12 @@ EOS
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "cyoi", "~> 0.5"
+  gem.add_dependency "cyoi", "~> 0.7"
   gem.add_dependency "fog", "~> 1.11"
   gem.add_dependency "readwritesettings", "~> 3.0"
   gem.add_dependency "thor", "~> 0.18"
   gem.add_dependency "redcard"
+  gem.add_dependency "rbvmomi"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "fakeweb"

data/lib/bosh-bootstrap/microbosh_providers/vsphere.rb

@@ -2,9 +2,16 @@ require "bosh-bootstrap/microbosh_providers/base"
 
 module Bosh::Bootstrap::MicroboshProviders
   class VSphere < Base
+    def stemcell
+      unless settings.exists?("bosh.stemcell")
+        download_stemcell
+      end
+    end
+
     def to_hash
       super.merge({
         "network" => network_configuration,
+        "resources" => resource_configuration,
         "cloud"=>
          {"plugin"=>"vsphere",
           "properties"=>{
@@ -36,8 +43,27 @@ module Bosh::Bootstrap::MicroboshProviders
       }
     end
 
+    # resources:
+    #  persistent_disk: 16384
+    #  cloud_properties:
+    #    ram: 4096
+    #    disk: 10240
+    #    cpu: 2
+    def resource_configuration
+      {
+        "persistent_disk"=>settings.provider.resources.persistent_disk,
+        "cloud_properties"=>{
+          "ram"=>settings.provider.resources.ram,
+          "disk"=>settings.provider.resources.disk,
+          "cpu"=>settings.provider.resources.cpu
+        }
+      }
+    end
+
     def ntps
-      settings.provider.npt
+      ntp_servers = settings.provider.ntps
+      ntp_servers = ntp_servers.split(",") if ntp_servers.is_a?(String)
+      ntp_servers
     end
 
     # vcenters:
@@ -58,9 +84,9 @@ module Bosh::Bootstrap::MicroboshProviders
       clusters = settings.provider.datacenter.clusters
       clusters = clusters.split(",") if clusters.is_a?(String)
       {
-        "host"=>settings.provider.credentials.host,
-        "user"=>settings.provider.credentials.user,
-        "password"=>settings.provider.credentials.password,
+        "host"=>settings.provider.credentials.vsphere_server,
+        "user"=>settings.provider.credentials.vsphere_username,
+        "password"=>settings.provider.credentials.vsphere_password,
         "datacenters"=>[{
           "name"=>settings.provider.datacenter.name,
           "vm_folder"=>settings.provider.datacenter.vm_folder,
@@ -73,6 +99,10 @@ module Bosh::Bootstrap::MicroboshProviders
         }]
       }
     end
+
+    def stemcell_uri
+      "http://#{jenkins_bucket}.s3.amazonaws.com/bosh-stemcell/vsphere/bosh-stemcell-latest-vsphere-esxi-ubuntu.tgz"
+    end
   end
 end
 Bosh::Bootstrap::MicroboshProviders.register_provider("vsphere", Bosh::Bootstrap::MicroboshProviders::VSphere)

data/lib/bosh-bootstrap/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Bootstrap
-    VERSION = "0.11.15"
+    VERSION = "0.12.0"
   end
 end

data/spec/assets/microbosh_yml/micro_bosh.vsphere.yml

@@ -11,6 +11,12 @@ network:
   - 172.22.22.154
   cloud_properties: 
     name: VLAN2194
+resources:
+  persistent_disk: "16384"
+  cloud_properties:
+    ram: "2048"
+    disk: "16384"
+    cpu: "2"
 cloud: 
   plugin: vsphere
   properties: 

data/spec/unit/microbosh_providers/vsphere_spec.rb

@@ -8,9 +8,14 @@ describe Bosh::Bootstrap::MicroboshProviders::VSphere do
 
   it "creates micro_bosh.yml manifest" do
     setting "provider.name", "vsphere"
-    setting "provider.credentials.host", "HOST"
-    setting "provider.credentials.user", "user"
-    setting "provider.credentials.password", "TempP@ss"
+    setting "provider.credentials.vsphere_server", "HOST"
+    setting "provider.credentials.vsphere_username", "user"
+    setting "provider.credentials.vsphere_password", "TempP@ss"
+
+    setting "provider.resources.persistent_disk", "16384"
+    setting "provider.resources.ram", "2048"
+    setting "provider.resources.disk", "16384"
+    setting "provider.resources.cpu", "2"
 
     # TODO - perhaps network.ip_address is better?
     setting "address.ip", "172.23.194.100"
@@ -19,7 +24,7 @@ describe Bosh::Bootstrap::MicroboshProviders::VSphere do
     setting "provider.network.gateway", "172.23.194.1"
     setting "provider.network.dns", %w[172.22.22.153 172.22.22.154]
 
-    setting "provider.npt", %w[ntp01.las01.emcatmos.com ntp02.las01.emcatmos.com]
+    setting "provider.ntps", %w[ntp01.las01.emcatmos.com ntp02.las01.emcatmos.com]
     setting "provider.datacenter.name", "LAS01"
     setting "provider.datacenter.vm_folder", "BOSH_VMs"
     setting "provider.datacenter.template_folder", "BOSH_Templates"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.11.15
+  version: 0.12.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cyoi
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rbvmomi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement