avst-cloud 0.1.40 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46cf2e686b412006cb9a4cbd2ae7fb624f5dbadf800bc05db414e7b2718e98e0
-  data.tar.gz: b56b12c41540f2d787fb80db59cc9cc6d1017721b327fa9bfd48adb0bab75afa
+  metadata.gz: f348d56f13e9c7215864b65cdf16a6ad0a9aee04732237386a52670089c5bc14
+  data.tar.gz: 207236ddfc0a7a4af10aff90b04cfe720a3fbb7c500d8127dfbdafebb6541a10
 SHA512:
-  metadata.gz: 25461b2620b01cfd5e82909a00ad833787df06ef96729ce76e476cfddc9eb83189add2a324c2c7b51fb5c5e3d8428fd19e0d9520315ea76f868b23966c40b6cf
-  data.tar.gz: 388417ecbce19754583fb90c0b3e884e4d1d8ef1b585d8feef8b1e908dee98e8615914571584a7ce8c61ebfc4e5f58180ea1bd266649802d91d8132e5406072d
+  metadata.gz: 96947e2687972300b56c7a45eb12bee1587905da670ced182dd80500b2920eba4771eb0e64a74e25cc83a2fd98977ef0f16172022c4c3cc68003c005938fc78a
+  data.tar.gz: ff541469904187255f7ba20643f1292af2a9379c8046046d1aa0bb13b9088d80be0dcff41eb5d350ee3f0ae6b10aa8a9fc0219f2a318549b959082dafe5ed6f1

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 before_install:
   # https://github.com/travis-ci/travis-rubies/issues/57#issuecomment-458981237
   - "find /home/travis/.rvm/rubies -wholename '*default/bundler-*.gemspec' -delete"
-  - gem install bundler --version 1.17.3
+  - gem install bundler --version 2.2.10
 notifications:
   email: false
   hipchat:

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.40'
+    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", "~> 1.17.3"
+    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.8.5"
+    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)
+        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"
@@ -90,6 +90,31 @@ module AvstCloud
                 logger.debug "create_elastic_ip  - #{create_elastic_ip}"
                 logger.debug "custom_private_ip  - #{private_ip}"
 
+                elastic_ip_address = nil
+
+                # if a public IP has been specified, try to lookup the elastic IP and use it
+                if public_ip
+                    require "resolv"
+                    # we can find IP based on either its address or its Name tag, if the provided value is not an IP try by tag
+                    if public_ip  =~ Resolv::IPv4::Regex
+                        found_eip = connect.describe_addresses('public-ip' => [public_ip])
+                    else
+                        found_eip = connect.describe_addresses('tag:Name' => [public_ip])
+                    end
+                    if ! found_eip.data[:body]['addressesSet'][0].nil?
+                        # if we have found the IP and its not already associated use it
+                        if found_eip.data[:body]['addressesSet'][0]['publicIp'] and ! found_eip.data[:body]['addressesSet'][0]['associationId']
+                            elastic_ip =found_eip.data[:body]['addressesSet'][0]
+                            elastic_ip_address = elastic_ip['publicIp']
+                            logger.debug "Requested Elastic IP found and is unallocated, an attempt to attach this to the VM will be made"
+                        else
+                             logger.warn "Requested Elastic IP exist but is already allocated, the system will be created but will NOT use this IP"
+                        end
+                    else
+                        logger.warn "Requested Elastic IP does not exist, the system will be created but will NOT use this IP"
+                    end
+                end
+
                 create_ebs_volume = nil
                 if ebs_size
                     # in case of centos ami we need to use /dev/xvda this is ami dependent
@@ -110,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 ] 
@@ -137,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
@@ -181,26 +216,33 @@ module AvstCloud
                 logger.debug "[DONE]\n\n"
 
                 # create Elastic IP Address if required
-                if create_elastic_ip
-                    logger.debug("Attempting to create elastic IP address")
-                    elastic_ip = connect.allocate_address("vpc").body
-                    elastic_ip_address = elastic_ip['publicIp']
-                    # if we have a server id and an Elastic public IP attempt to join the two togehter
-                    if server.id and elastic_ip_address
-                        logger.debug ("Elastic IP #{elastic_ip_address} created, attempting to allocate to server")
-                        connect.associate_address(server.id, elastic_ip_address)
-                        # reacquire server object as IP has, probably, changed
-                        server = find_fog_server(server_name)
-
-                        # create tag on the Elastic IP 
-                        # TODO: add ability for other tags to be defined by the user
-                        logger.debug("Creating tags on Elastic IP Address #{elastic_ip}\n\n")
-                        connect.tags.create(:resource_id => elastic_ip['allocationId'], :key => "Name", :value => server_name)
+                if create_elastic_ip  
+                    if elastic_ip_address.nil?
+                        logger.debug("Attempting to create elastic IP address")
+                        elastic_ip = connect.allocate_address("vpc").body
+                        elastic_ip_address = elastic_ip['publicIp']
+                        logger.warn "Elastic IP creation failed, proceeding with non Elastic IP\n\n"  if ! elastic_ip_address
                     else
-                        logger.warn("Elastic IP creation failed, proceeding with non Elastic IP\n\n")
+                        logger.warn "You have asked to create an Elastic IP and ALSO use an existing one"
+                        logger.warn "The existing IP is avaliable and as such will be used INSTEAD of creating a new one!"
                     end
                 end
 
+                # if we have a server id and an Elastic public IP attempt to join the two togehter
+                if server.id and elastic_ip_address
+                    logger.debug ("Attempting to allocate Elastic IP #{elastic_ip_address} to server")
+                    connect.associate_address(server.id, elastic_ip_address)
+                    # reacquire server object as IP has, probably, changed
+                    server = find_fog_server(server_name)
+
+                    # create tag on the Elastic IP 
+                    # TODO: add ability for other tags to be defined by the user
+                    logger.debug("Creating tags on Elastic IP Address #{elastic_ip}\n\n")
+                    connect.tags.create(:resource_id => elastic_ip['allocationId'], :key => "Name", :value => server_name)
+                else
+                    logger.warn("EAllocation of Elastic IP failed, proceeding with non Elastic IP\n\n")
+                end
+
                 logger.debug "The server has been successfully created, to login onto the server:\n"
                 logger.debug "\t ssh -i #{ssh_key} #{root_user}@#{server.public_ip_address}\n"
                 if create_ebs_volume

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: avst-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.40
+  version: 0.1.42
 platform: ruby
 authors:
 - Martin Brehovsky
 - Jon Bevan
 - Matthew Hope
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        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.8.5
+        version: 1.13.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        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: []