knife-google 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b39bef9d566a21cb4bcf0a0decb202b5b8905ad548335fd4f8eceea6408208a0
-  data.tar.gz: 4f75ba0bb858215fa19aa8566a18e93fbb6b3a01dfc89b774d1e0d9b03d20ab6
+  metadata.gz: c820682e78767b815e84461ae0b564b16724f27f01276333c084e28cf9bf0667
+  data.tar.gz: f2c23f4b66cd3300f6c2f0d59b1872eafbab64ba7c7262890539c042279d10d2
 SHA512:
-  metadata.gz: 5454224647a87ffda86710c3fa6c494b8e8ff1bb05c773aa888190293ff84c08cf5f2c2ec746763efc9f3853d1e0f691e748d46d23e8cad6154d5ef960858d34
-  data.tar.gz: dedb9b64dde86e7678bd87ece3852a40c6832a83833e779a39339ac89efc51e568d3316264cbdc964679813744f11ebbef1b96b1969910accb378f73c003f862
+  metadata.gz: 8ed855d4c2501f9f19435f2ada289e5b8a00b0024f2428b247c3ce3d70b433f294f391572dbd4b9b9f498d5ac1eed43c835765903885df74e785cc0d4f1fa4d9
+  data.tar.gz: 81e86ece3515be3586caebc47bb8620af9e94904c5a4a3e9f9cfe05d8c6b97339aea5d3ab4453a8c2c9f784ae6a5296c5ced1ecc62022b1b8a7b820a299b1fe8

data/lib/chef/knife/cloud/google_service.rb

@@ -235,6 +235,7 @@ class Chef::Knife::Cloud
       raise "Invalid subnet: #{options[:subnet]}" if options[:subnet] && !valid_subnet?(options[:subnet])
       raise "Invalid Public IP setting: #{options[:public_ip]}" unless valid_public_ip_setting?(options[:public_ip])
       raise "Invalid image: #{options[:image]} - check your image name, or set an image project if needed" if boot_disk_source_image(options[:image], options[:image_project]).nil?
+      raise "Maximum number of local SSDs for an instance should be 8, while #{options[:number_of_local_ssd]} is requested." if options[:number_of_local_ssd].to_i > 8
     end
 
     def check_api_call
@@ -308,6 +309,7 @@ class Chef::Knife::Cloud
     def instance_disks_for(options)
       disks = []
       disks << instance_boot_disk_for(options)
+      options[:number_of_local_ssd].to_i.times { disks << adding_local_ssd(options) } if options[:local_ssd]
       options[:additional_disks].each do |disk_name|
         begin
           disk = connection.get_disk(project, zone, disk_name)
@@ -323,20 +325,34 @@ class Chef::Knife::Cloud
     end
 
     def instance_boot_disk_for(options)
-      disk = Google::Apis::ComputeV1::AttachedDisk.new
-      params = Google::Apis::ComputeV1::AttachedDiskInitializeParams.new
-
+      disk, params = common_operation(options, boot_disk_type_for(options))
       disk.boot           = true
-      disk.auto_delete    = options[:boot_disk_autodelete]
       params.disk_name    = boot_disk_name_for(options)
       params.disk_size_gb = options[:boot_disk_size]
-      params.disk_type    = disk_type_url_for(boot_disk_type_for(options))
       params.source_image = boot_disk_source_image(options[:image], options[:image_project])
 
       disk.initialize_params = params
       disk
     end
 
+    # To create a instance with an attached local SSD
+    def adding_local_ssd(options)
+      disk, params = common_operation(options, "local-ssd")
+      disk.type = "SCRATCH"
+      disk.interface = options[:interface]
+
+      disk.initialize_params = params
+      disk
+    end
+
+    def common_operation(options, disk_type)
+      disk = Google::Apis::ComputeV1::AttachedDisk.new
+      params = Google::Apis::ComputeV1::AttachedDiskInitializeParams.new
+      disk.auto_delete = options[:boot_disk_autodelete]
+      params.disk_type = disk_type_url_for(disk_type)
+      [disk, params]
+    end
+
     def boot_disk_type_for(options)
       options[:boot_disk_ssd] ? "pd-ssd" : "pd-standard"
     end

data/lib/chef/knife/google_server_create.rb

@@ -146,6 +146,23 @@ class Chef::Knife::Cloud
       long:        "--gce-email EMAIL_ADDRESS",
       description: "email address of the logged-in Google Cloud user; required for bootstrapping windows hosts"
 
+    option :local_ssd,
+      long:        "--gce-local-ssd",
+      description: "Local SSDs are physically attached to the server that hosts your VM instance. Local SSDs have higher throughput and lower latency than standard persistent disks or SSD persistent disks.",
+      boolean:     true,
+      default:     false
+
+    option :interface,
+      long: "--gce-interface INTERFACE",
+      description: "The kind of disk interface exposed to the VM for this SSD. Valid values are SCSI and NVME. SCSI is the default and is supported by more guest operating systems. NVME may provide higher performance.",
+      default: "scsi",
+      in: %w{scsi nvme}
+
+    option :number_of_local_ssd,
+      long: "--gce-number-of-local-ssd NUMBER_OF_DISKS",
+      description: "Specifies the number of local SSDs to be created per node. Each local SSD is 375 GB in size, but you can attach up to eight local SSD devices for 3 TB of total local SSD storage space per instance.",
+      default: "1"
+
     deps do
       require "gcewinpass"
     end
@@ -168,6 +185,9 @@ class Chef::Knife::Cloud
         boot_disk_size: boot_disk_size,
         boot_disk_ssd: locate_config_value(:boot_disk_ssd),
         additional_disks: locate_config_value(:additional_disks),
+        local_ssd: locate_config_value(:local_ssd),
+        interface: locate_config_value(:interface),
+        number_of_local_ssd: number_of_local_ssd,
         can_ip_forward: locate_config_value(:can_ip_forward),
         machine_type: locate_config_value(:machine_type),
         service_account_scopes: locate_config_value(:service_account_scopes),
@@ -271,6 +291,10 @@ class Chef::Knife::Cloud
       locate_config_value(:boot_disk_size).to_i
     end
 
+    def number_of_local_ssd
+      locate_config_value(:number_of_local_ssd).to_i
+    end
+
     def reset_windows_password
       GoogleComputeWindowsPassword.new(
         project:       project,

data/lib/knife-google/version.rb

@@ -15,7 +15,7 @@
 #
 module Knife
   module Google
-    VERSION = "4.1.0"
+    VERSION = "4.2.0"
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-google
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Chiraq Jog
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-cloud