avst-cloud 0.1.38 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce616eddab00f500b04085c616b6cc4415b319dac8cf1a29973460fae64fe905
-  data.tar.gz: 685fa1a66ec43f53726f9208ceb480633f94980d6b3039514407f232715628a1
+  metadata.gz: e554dc8cd38016db8c872e1f914121d5c3ea77656baf8728dfd4adeac4f1d46f
+  data.tar.gz: 56246f4e2eac57dba6b5e840cb037d64425e7d69b3cb44f7bf6e78da80b3c4ce
 SHA512:
-  metadata.gz: 53d7bd60378e3e1114ff1ed000efa78b53acd75e73390496b05d41d8ae7f7a24a4158640c39c60bbb573a25e911725d40764c213d9c35b7749db46a3c2bef1da
-  data.tar.gz: 0a274f0af0b36dd8f2a9a4e65913849366d3a6f33b671baae484cb0de99f4c2c9ac9cd44382673f40f6403e26ac7a28d02cfc03cf4e1f981c4a642896a9c999d
+  metadata.gz: 0b8cdba149899e18f325e7452e006c0b20d9fca52b334984682b092bba5784cfb6d028849d67a9b87c57e7e5a8e48c849b6940a181e7f9df74e12d598db1ba98
+  data.tar.gz: 2a02c5de191f28a462db748ae7f803758f5b13272731600df90ec34e4d1cfdbb5948aacfc49fd8f3a099ce54b1deabf7db56c90ec4e64e30312070996ee265bd

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.38'
+    spec.version       = '0.1.39'
     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 }

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)
+        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)
             # Permit named instances from DEFAULT_FLAVOURS
             flavour = flavour || "t2.micro"
             os = os || "ubuntu-14"
@@ -91,22 +91,56 @@ module AvstCloud
                 create_ebs_volume = nil
                 if ebs_size
                     # in case of centos ami we need to use /dev/xvda this is ami dependent
-                    create_ebs_volume = [ 
-                                            { 
-                                                :DeviceName => device_name,
-                                                'Ebs.VolumeType' => 'gp2',
-                                                'Ebs.VolumeSize' => ebs_size,
-                                            } 
-                                        ]
+                    root_disk = { 
+                        :DeviceName => device_name,
+                        'Ebs.VolumeType' => root_disk_type,
+                        'Ebs.VolumeSize' => ebs_size,
+                    } 
+                    # if the root disk is to be encrypted set te "Encrypted" flag to true, if there is an optional KMS Key ID send that,
+                    # if not set to nil and thereby defalt to the default key for EBS
+                    if encrypt_root
+                        root_disk.merge!('Ebs.Encrypted' => true, 'Ebs.KmsKeyId' => root_encryption_key||nil )
+                    end
+
+                    # if we do not want to delete the root disk with the VM set the flag
+                    if delete_root_disk == false || delete_root_disk == 'false'
+                        root_disk.merge!('Ebs.DeleteOnTermination' => false)
+                    end
+
+                    # if this is a provisioned IOPS disk set the iops value
+                    if root_disk_type == 'io1'
+                        root_disk.merge!('Ebs.Iops' => root_disk_iops)
+                    end
+                    # add the root disk as the first entry in the array of disks to create/attach
+                    create_ebs_volume = [ root_disk ] 
+
                     if additional_hdds and additional_hdds.is_a?(Hash)
                         additional_hdds.each_value do |disk|
                             volume_type = disk['volume_type'] || 'gp2'
                             if disk['device_name'] && disk['ebs_size']
-                                create_ebs_volume << { 
+                                disk_hash = {
                                     :DeviceName => disk['device_name'],
                                     'Ebs.VolumeType' => volume_type,
                                     'Ebs.VolumeSize' => disk['ebs_size']
                                 }
+                                # if the additional disk is to be encrypted set te "Encrypted" flag to true, if there is an optional KMS Key ID send that,
+                                # if not set to nil and thereby defalt to the default key for EBS
+                                if disk['encrypted']
+                                    disk_hash.merge!('Ebs.Encrypted' => true, 'Ebs.KmsKeyId' => disk['encryption_key_id'] || nil)
+                                end
+
+                                # if we do not want to delete the additional disk with the VM set the flag
+                                if disk['delete_disk_with_vm'] == false || disk['delete_disk_with_vm'] == 'false'
+                                    disk_hash.merge!('Ebs.DeleteOnTermination' => false)
+                                end
+
+                                # if the additional disk is an provisioned IOPS disk set the iops value
+                                if volume_type == 'io1'
+                                    disk_hash.merge!('Ebs.Iops' => disk['volume_iops'] || 0)
+                                end
+
+                                # add this disk to the array of all disks to create/attach
+                                create_ebs_volume << disk_hash
                             else
                                 logger.warn "Failed to create additional hdd, required params device_name (e.g. /dev/sda1) or ebs_size missing: #{disk}"
                             end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avst-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.39
 platform: ruby
 authors:
 - Martin Brehovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -275,8 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Automated creation, bootstrapping and provisioning of servers