vm_shepherd 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bda04a445240a1429183e7c51822cc950c901cd
-  data.tar.gz: 38c5e5d7a8876bc3e2178cd65d1dfaaacb7c53e6
+  metadata.gz: 3c32036e3aca4e84839df2a57544f620b8c1d29a
+  data.tar.gz: 1247e3b6de98c44acf42bfb39f0f1c38bbe79d00
 SHA512:
-  metadata.gz: 08ace1e2afab360a8267253f487e3624f0bd7aed49a69d9040638e0181ebbf86138587918fe08f29ca08c813413a4d0676b4051541b59475fcca37a0571ddb53
-  data.tar.gz: d1be716a990bdfc2e76b3177d7b952e89f180fa3bd5bb025c074bb7e759ed9b4442e345b306d5630e7462cc5026e74bc12a5e92e6573f72812e27e3996ad0dcd
+  metadata.gz: 41484520464f955a1b95bd7766a34cc19789e817651ba6dcbd703c155692948db0351f397cfc6a63b417cd2468c4226e30eeef697d85cab8e62f5e92c9d5447c
+  data.tar.gz: ca9d0d8cd53359c809524de9d6528aeef537cc76431f8533a9ce4b4cd44a54f98da3ac8ce1a2e1e1ce2bc0dbc6fe88d76ca73212bcdeccdf2c044b2043f0282c

data/lib/vm_shepherd/shepherd.rb

@@ -52,6 +52,8 @@ module VmShepherd
                 netmask:     vm_shepherd_config.dig('vm', 'netmask'),
                 dns:         vm_shepherd_config.dig('vm', 'dns'),
                 ntp_servers: vm_shepherd_config.dig('vm', 'ntp_servers'),
+                cpus:        vm_shepherd_config.dig('vm', 'cpus'),
+                ram_mb:      vm_shepherd_config.dig('vm', 'ram_mb'),
               },
               {
                 cluster:       vm_shepherd_config.dig('vsphere', 'cluster'),

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '3.0.3'.freeze
+  VERSION = '3.0.4'.freeze
 end

data/lib/vm_shepherd/vsphere_manager.rb

@@ -114,7 +114,7 @@ module VmShepherd
     def boot_vm(ovf_file_path, vm_config, vsphere_config)
       datacenter.vmFolder.traverse(vsphere_config[:folder], RbVmomi::VIM::Folder, true)
       template = deploy_ovf_template(ovf_file_path, vsphere_config)
-      vm       = create_vm_from_template(template, vsphere_config)
+      vm       = create_vm_from_template(template, vm_config, vsphere_config)
 
       reconfigure_vm(vm, vm_config)
       power_on_vm(vm)
@@ -202,7 +202,7 @@ module VmShepherd
       end || fail('ERROR finding host to upload OVF to')
     end
 
-    def create_vm_from_template(template, vsphere_config)
+    def create_vm_from_template(template, vm_config, vsphere_config)
       logger.info("BEGIN clone_vm_task tempalte=#{template.name}")
       template.CloneVM_Task(
         folder: target_folder(vsphere_config),
@@ -215,7 +215,7 @@ module VmShepherd
           },
           powerOn:  false,
           template: false,
-          config:   {numCPUs: 2, memoryMB: 2048},
+          config:   {numCPUs: vm_config[:cpus] || 2, memoryMB: vm_config[:ram_mb] || 2048},
         }
       ).wait_for_completion.tap {
         logger.info("END   clone_vm_task tempalte=#{template.name}")

data/spec/fixtures/shepherd/vsphere.yml

@@ -18,6 +18,8 @@ vm_shepherd:
       netmask: OVA_NETMASK
       dns: OVA_DNS
       ntp_servers: OVA_NTP
+      cpus: OVA_CPUS
+      ram_mb: OVA_RAM_MB
     cleanup:
       datacenter: VSPHERE_OTHER_DATACENTER
       datastores:
@@ -45,6 +47,8 @@ vm_shepherd:
       netmask: OVA_NETMASK-2
       dns: OVA_DNS-2
       ntp_servers: OVA_NTP-2
+      cpus: OVA_CPUS
+      ram_mb: OVA_RAM_MB
     cleanup:
       datacenter: VSPHERE_OTHER_DATACENTER-2
       datastores:

data/spec/spec_helper.rb

@@ -2,10 +2,6 @@ SPEC_ROOT = File.expand_path(__dir__)
 
 $LOAD_PATH << SPEC_ROOT
 
-require 'codeclimate-test-reporter'
-
-CodeClimate::TestReporter.start
-
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true

data/spec/vm_shepherd/shepherd_spec.rb

@@ -148,6 +148,8 @@ module VmShepherd
               netmask:     first_config.dig('vm', 'netmask'),
               dns:         first_config.dig('vm', 'dns'),
               ntp_servers: first_config.dig('vm', 'ntp_servers'),
+              cpus:        first_config.dig('vm', 'cpus'),
+              ram_mb:      first_config.dig('vm', 'ram_mb'),
             },
             {
               cluster:       first_config.dig('vsphere', 'cluster'),
@@ -166,6 +168,8 @@ module VmShepherd
               netmask:     last_config.dig('vm', 'netmask'),
               dns:         last_config.dig('vm', 'dns'),
               ntp_servers: last_config.dig('vm', 'ntp_servers'),
+              cpus:        last_config.dig('vm', 'cpus'),
+              ram_mb:      last_config.dig('vm', 'ram_mb'),
             },
             {
               cluster:       last_config.dig('vsphere', 'cluster'),

data/vm_shepherd.gemspec

@@ -29,5 +29,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'codeclimate-test-reporter'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -136,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.
 email:
 - cf-tempest-eng@pivotal.io