vm_shepherd 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a056d918fa69521babd0636b90a36bbc4e75a9bc
-  data.tar.gz: 23ec4f0d83d118542fc213139604efaaa5b52fd2
+  metadata.gz: 756d9a70d96ccda7ec70f94f6696609f891ca919
+  data.tar.gz: 8de386223858e604289442480c2afc2ec13b1a2b
 SHA512:
-  metadata.gz: ce2cf10d6f705dd3633ec9d3c537c97131568ca6d91f5692a3c887d2f42fb44ffbd28ed854814f0d953a842f4424fcad651410c0b0b436a7b8af26dba7ab3a0d
-  data.tar.gz: be9a971752b45af0359c8bd41825ef85f545ba97a1f69b29119a96816e4821de46ee7e43aeca36705127d99551860c932da318aa5b6c89df0a81fb33b9e586f3
+  metadata.gz: aeca796706b5cadc48fef207c01f27025dc53d7a042caa1d2e02d5734ac41f6b179c171be2ac107262989390ab58f0f786933fa0f6ad23795686fec4718bf787
+  data.tar.gz: ba4b1dc89e6bf841b0081722120e39a23672e17a2c687383e283d4069ae59c9335c4afbd92a2eb82d93048e97565f653b0b380b9f29d6dd0fa6c0c491f12c166

data/lib/vm_shepherd/shepherd.rb

@@ -38,7 +38,7 @@ module VmShepherd
               path,
               vcloud_deploy_options(vm_shepherd_config),
             )
-          when VmShepherd::VSPHERE_IAAS_TYPE then
+        when VmShepherd::VSPHERE_IAAS_TYPE then
             VmShepherd::VsphereManager.new(
               vm_shepherd_config.dig('vcenter_creds', 'ip'),
               vm_shepherd_config.dig('vcenter_creds', 'username'),
@@ -182,20 +182,31 @@ module VmShepherd
     end
 
     def vsphere_vm_options(input_config)
-      {
+      vsphere_vm_options = {
         ip: input_config.dig('vm', 'ip'),
         gateway: input_config.dig('vm', 'gateway'),
         netmask: input_config.dig('vm', 'netmask'),
         dns: input_config.dig('vm', 'dns'),
         ntp_servers: input_config.dig('vm', 'ntp_servers'),
         cpus: input_config.dig('vm', 'cpus'),
-        ram_mb: input_config.dig('vm', 'ram_mb'),
-        vm_password: (input_config.dig('vm', 'vm_password') || 'tempest'),
-        public_ssh_key: read_assets_home(input_config.dig('vm', 'public_ssh_key')),
+        ram_mb: input_config.dig('vm', 'ram_mb')
       }.tap do |result|
         hostname = input_config.dig('vm', 'custom_hostname')
         result[:custom_hostname] = hostname unless hostname.nil?
       end
+
+      vsphere_vm_options.merge!(vm_password: get_vsphere_vm_password(input_config))
+      vsphere_vm_options.merge!(public_ssh_key: get_vsphere_vm_public_ssh_key(input_config))
+
+      vsphere_vm_options
+    end
+
+    def get_vsphere_vm_password(input_config)
+      ENV['PROVISION_WITH_PASSWORD'] == 'false' ? nil : (input_config.dig('vm', 'vm_password') || 'tempest')
+    end
+
+    def get_vsphere_vm_public_ssh_key(input_config)
+      ENV['PROVISION_WITH_SSH_KEY'] == 'false' ? nil : (read_assets_home(input_config.dig('vm', 'public_ssh_key')))
     end
 
     def read_assets_home(path_or_value)

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '3.5.0'.freeze
+  VERSION = '3.6.0'.freeze
 end

data/spec/fixtures/shepherd/vsphere-one-vm-config.yml

@@ -0,0 +1,35 @@
+iaas_type: vsphere
+vm_shepherd:
+  vm_configs:
+  - vcenter_creds:
+      ip: OVA_URL
+      username: OVA_ORGANIZATION
+      password: OVA_PASSWORD
+    vsphere:
+      datacenter: VSPHERE_DATACENTER
+      cluster: VSPHERE_CLUSTER
+      network: VSPHERE_NETWORK
+      resource_pool: VSPHERE_RESOURCE_POOL
+      datastore: VSPHERE_DATASTORE
+      folder: VSPHERE_FOLDER
+    vm:
+      ip: OVA_IP
+      gateway: OVA_GATEWAY
+      netmask: OVA_NETMASK
+      dns: OVA_DNS
+      ntp_servers: OVA_NTP
+      public_ssh_key: OVA_SSH_KEY
+      cpus: OVA_CPUS
+      ram_mb: OVA_RAM_MB
+      vm_password: not-tempest
+      custom_hostname: not-default-hostname
+    cleanup:
+      datacenter: VSPHERE_OTHER_DATACENTER
+      datastores:
+        - VSPHERE_DATASTORE_ONE
+        - VSPHERE_DATASTORE_TWO
+      datacenter_folders_to_clean:
+        - DC_FOLDER_ONE
+        - DC_FOLDER_TWO
+      datastore_folders_to_clean:
+        - DS_DISK_FOLDER

data/spec/vm_shepherd/shepherd_spec.rb

@@ -281,6 +281,145 @@ module VmShepherd
             manager.deploy(paths: ['FIRST_FAKE_PATH', 'LAST_FAKE_PATH'])
           end
         end
+
+        context 'when provision environment variables are set' do
+          before do
+            allow(VsphereManager).to receive(:new).with(
+              first_config.dig('vcenter_creds', 'ip'),
+              first_config.dig('vcenter_creds', 'username'),
+              first_config.dig('vcenter_creds', 'password'),
+              first_config.dig('vsphere', 'datacenter'),
+              instance_of(Logger),
+            ).and_return(first_ova_manager)
+
+            allow_any_instance_of(Shepherd).to receive(:read_assets_home).and_return('A PUBLIC KEY')
+          end
+          let(:settings_fixture_name) { 'vsphere-one-vm-config.yml' }
+
+          context 'when the PROVISION_WITH_PASSWORD environment variable is set' do
+            context 'and it is true' do
+              before { stub_const('ENV', {'PROVISION_WITH_PASSWORD' => 'true'}) }
+
+              it 'deploys with the set vm password' do
+                expect(first_ova_manager).to receive(:deploy).with(
+                  'FIRST_FAKE_PATH',
+                  {
+                    ip:          first_config.dig('vm', 'ip'),
+                    gateway:     first_config.dig('vm', 'gateway'),
+                    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'),
+                    vm_password: first_config.dig('vm', 'vm_password'),
+                    public_ssh_key: 'A PUBLIC KEY',
+                    custom_hostname: first_config.dig('vm', 'custom_hostname')
+                  },
+                  {
+                    cluster:       first_config.dig('vsphere', 'cluster'),
+                    resource_pool: first_config.dig('vsphere', 'resource_pool'),
+                    datastore:     first_config.dig('vsphere', 'datastore'),
+                    network:       first_config.dig('vsphere', 'network'),
+                    folder:        first_config.dig('vsphere', 'folder'),
+                  },
+                )
+                manager.deploy(paths: ['FIRST_FAKE_PATH'])
+              end
+            end
+
+            context 'and it is false' do
+              before { stub_const('ENV', {'PROVISION_WITH_PASSWORD' => 'false'}) }
+
+              it 'deploys with a nil vm password' do
+                expect(first_ova_manager).to receive(:deploy).with(
+                  'FIRST_FAKE_PATH',
+                  {
+                    ip:          first_config.dig('vm', 'ip'),
+                    gateway:     first_config.dig('vm', 'gateway'),
+                    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'),
+                    vm_password: nil,
+                    public_ssh_key: 'A PUBLIC KEY',
+                    custom_hostname: first_config.dig('vm', 'custom_hostname')
+                  },
+                  {
+                    cluster:       first_config.dig('vsphere', 'cluster'),
+                    resource_pool: first_config.dig('vsphere', 'resource_pool'),
+                    datastore:     first_config.dig('vsphere', 'datastore'),
+                    network:       first_config.dig('vsphere', 'network'),
+                    folder:        first_config.dig('vsphere', 'folder'),
+                  },
+                )
+                manager.deploy(paths: ['FIRST_FAKE_PATH'])
+              end
+            end
+          end
+
+          context 'when the PROVISION_WITH_SSH_KEY environment variable is set' do
+            context 'and it is true' do
+              before { stub_const('ENV', {'PROVISION_WITH_SSH_KEY' => 'true'}) }
+
+              it 'deploys with the set public ssh key' do
+                expect(first_ova_manager).to receive(:deploy).with(
+                  'FIRST_FAKE_PATH',
+                  {
+                    ip:          first_config.dig('vm', 'ip'),
+                    gateway:     first_config.dig('vm', 'gateway'),
+                    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'),
+                    vm_password: first_config.dig('vm', 'vm_password'),
+                    public_ssh_key: 'A PUBLIC KEY',
+                    custom_hostname: first_config.dig('vm', 'custom_hostname')
+                  },
+                  {
+                    cluster:       first_config.dig('vsphere', 'cluster'),
+                    resource_pool: first_config.dig('vsphere', 'resource_pool'),
+                    datastore:     first_config.dig('vsphere', 'datastore'),
+                    network:       first_config.dig('vsphere', 'network'),
+                    folder:        first_config.dig('vsphere', 'folder'),
+                  },
+                )
+                manager.deploy(paths: ['FIRST_FAKE_PATH'])
+              end
+            end
+
+            context 'and it is false' do
+              before { stub_const('ENV', {'PROVISION_WITH_SSH_KEY' => 'false'}) }
+
+              it 'deploys with a nil public ssh key' do
+                expect(first_ova_manager).to receive(:deploy).with(
+                  'FIRST_FAKE_PATH',
+                  {
+                    ip:          first_config.dig('vm', 'ip'),
+                    gateway:     first_config.dig('vm', 'gateway'),
+                    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'),
+                    vm_password: first_config.dig('vm', 'vm_password'),
+                    public_ssh_key: nil,
+                    custom_hostname: first_config.dig('vm', 'custom_hostname')
+                  },
+                  {
+                    cluster:       first_config.dig('vsphere', 'cluster'),
+                    resource_pool: first_config.dig('vsphere', 'resource_pool'),
+                    datastore:     first_config.dig('vsphere', 'datastore'),
+                    network:       first_config.dig('vsphere', 'network'),
+                    folder:        first_config.dig('vsphere', 'folder'),
+                  },
+                )
+                manager.deploy(paths: ['FIRST_FAKE_PATH'])
+              end
+            end
+          end
+        end
       end
 
       context 'with AWS settings' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -173,6 +173,7 @@ files:
 - spec/fixtures/shepherd/openstack.yml
 - spec/fixtures/shepherd/unknown.yml
 - spec/fixtures/shepherd/vcloud.yml
+- spec/fixtures/shepherd/vsphere-one-vm-config.yml
 - spec/fixtures/shepherd/vsphere.yml
 - spec/spec_helper.rb
 - spec/support/patched_fog.rb
@@ -218,6 +219,7 @@ test_files:
 - spec/fixtures/shepherd/openstack.yml
 - spec/fixtures/shepherd/unknown.yml
 - spec/fixtures/shepherd/vcloud.yml
+- spec/fixtures/shepherd/vsphere-one-vm-config.yml
 - spec/fixtures/shepherd/vsphere.yml
 - spec/spec_helper.rb
 - spec/support/patched_fog.rb