avst-cloud 0.1.41 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 733f10630f58e2081f47fd017b462c8a150b37e1009cd2c0557bbcce5dc061a9
-  data.tar.gz: 6fd8942f5dbd0e83482966ed4f96ed76dbe959ac5391c656e577f1cf1f3503b6
+  metadata.gz: f348d56f13e9c7215864b65cdf16a6ad0a9aee04732237386a52670089c5bc14
+  data.tar.gz: 207236ddfc0a7a4af10aff90b04cfe720a3fbb7c500d8127dfbdafebb6541a10
 SHA512:
-  metadata.gz: 4fe6c7b1260da9a622621e871936d79bc468e256e61ec29d760028eb47624ccf2d5a859c93a3998c2bae6957af9e13e8547c57e8dac5915b1a91ccec4ad40fca
-  data.tar.gz: def1c8d32b83f8f693fa5b82583eb165190801c6f48b1867dd3212e6ae4ed05feb043d267675d882e227e66421c04a7223040f3c5af0efc462a8f417d9b35e9c
+  metadata.gz: 96947e2687972300b56c7a45eb12bee1587905da670ced182dd80500b2920eba4771eb0e64a74e25cc83a2fd98977ef0f16172022c4c3cc68003c005938fc78a
+  data.tar.gz: ff541469904187255f7ba20643f1292af2a9379c8046046d1aa0bb13b9088d80be0dcff41eb5d350ee3f0ae6b10aa8a9fc0219f2a318549b959082dafe5ed6f1

data/avst-cloud.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
     spec.name          = "avst-cloud"
-    spec.version       = '0.1.41'
+    spec.version       = '0.1.42'
     spec.authors       = ["Martin Brehovsky", "Jon Bevan", "Matthew Hope"]
     spec.email         = ["mbrehovsky@adaptavist.com", "jbevan@adaptavist.com", "mhope@adaptavist.com"]
     spec.summary       = %q{Automated creation, bootstrapping and provisioning of servers }
@@ -15,7 +15,8 @@ Gem::Specification.new do |spec|
     spec.executables   = ["avst-cloud", "avst-cloud-puppet", "avst-cloud-rackspace", "avst-cloud-azure", "avst-cloud-azure-rm"]
     spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
     spec.require_paths = ["lib"]
-    spec.add_development_dependency "bundler", "2.2.10"
+    spec.required_ruby_version = '~> 2.6.0'
+    spec.add_development_dependency "bundler", "2.2.33"
     spec.add_development_dependency "rake"
     spec.add_dependency "fog"
     spec.add_dependency "fog-core", "1.43.0"
@@ -31,7 +32,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency "derelict"
     spec.add_dependency "docopt", ">= 0.5.0"
     spec.add_dependency "rainbow", '3.0.0'
-    spec.add_dependency "nokogiri", "~> 1.10.8"
+    spec.add_dependency "nokogiri", "~> 1.13.9"
     spec.add_dependency "signet", "0.14.1"
 end
 

data/lib/avst-cloud/aws_connection.rb

@@ -33,7 +33,7 @@ module AvstCloud
             AvstCloud::AwsServer.new(server, server_name, server.public_ip_address, root_user, root_password)
         end
 
-        def create_server(server_name, flavour, os, key_name, ssh_key, subnet_id, security_group_ids, ebs_size, hdd_device_path, ami_image_id, availability_zone, additional_hdds={}, vpc=nil, created_by=nil, custom_tags={}, root_username=nil, create_elastic_ip=false, encrypt_root=false ,root_encryption_key=nil, delete_root_disk=true, root_disk_type='gp2', root_disk_iops=0, private_ip=nil, public_ip=nil)
+        def create_server(server_name, flavour, os, key_name, ssh_key, subnet_id, security_group_ids, ebs_size, hdd_device_path, ami_image_id, availability_zone, additional_hdds={}, vpc=nil, created_by=nil, custom_tags={}, root_username=nil, create_elastic_ip=false, encrypt_root=false ,root_encryption_key=nil, delete_root_disk=true, root_disk_type='gp2', root_disk_iops=0, root_disk_throughput=0, private_ip=nil, public_ip=nil)
             # Permit named instances from DEFAULT_FLAVOURS
             flavour = flavour || "t2.micro"
             os = os || "ubuntu-14"
@@ -135,8 +135,15 @@ module AvstCloud
                     end
 
                     # if this is a provisioned IOPS disk set the iops value
-                    if root_disk_type == 'io1'
+                    if root_disk_type == 'io1' or root_disk_type == 'io2'
                         root_disk.merge!('Ebs.Iops' => root_disk_iops)
+                    elsif root_disk_type == 'gp3'
+                        # set default GP3 values if no valued provided
+                        root_disk_iops = 3000 if root_disk_iops == 0
+                        root_disk_throughput = 125 if root_disk_throughput == 0
+
+                        root_disk.merge!('Ebs.Iops' => root_disk_iops)
+                        root_disk.merge!('Ebs.Throughput' => root_disk_throughput)
                     end
                     # add the root disk as the first entry in the array of disks to create/attach
                     create_ebs_volume = [ root_disk ] 
@@ -162,8 +169,11 @@ module AvstCloud
                                 end
 
                                 # if the additional disk is an provisioned IOPS disk set the iops value
-                                if volume_type == 'io1'
+                                if volume_type == 'io1' or volume_type == 'io2'
                                     disk_hash.merge!('Ebs.Iops' => disk['volume_iops'] || 0)
+                                elsif volume_type == 'gp3'
+                                    disk_hash.merge!('Ebs.Iops' => disk['volume_iops'] || 3000)
+                                    disk_hash.merge!('Ebs.Throughput' => disk['volume_throughput'] || 125)
                                 end
 
                                 # add this disk to the array of all disks to create/attach

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: avst-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.42
 platform: ruby
 authors:
 - Martin Brehovsky
 - Jon Bevan
 - Matthew Hope
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -200,14 +200,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: 1.13.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: 1.13.9
 - !ruby/object:Gem::Dependency
   name: signet
   requirement: !ruby/object:Gem::Requirement
@@ -274,23 +274,23 @@ files:
 homepage: http://www.adaptavist.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Automated creation, bootstrapping and provisioning of servers
 test_files: []