avst-cloud 0.1.37 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a73c8538a7abe6b36b8c7a2e98501cf4981a5e190d14156686e540f6799e55b0
-  data.tar.gz: 6d3a1a20b949bc3e242a4132ff4aac6bb324bb765f81f435d17c7181eefae096
+  metadata.gz: ce616eddab00f500b04085c616b6cc4415b319dac8cf1a29973460fae64fe905
+  data.tar.gz: 685fa1a66ec43f53726f9208ceb480633f94980d6b3039514407f232715628a1
 SHA512:
-  metadata.gz: 6d775694903b35230782d9565126ac767bf7c64117b1262b3d45604fcea91dbf39f9e013a818339d0c809d37c92deb6cff88ed17dd1d09a81e7db2046a757ba0
-  data.tar.gz: 49009280fd81266dc2fce02d0813cb8c9b942e3c8e59047714ecb1909dfddf5ec5b5ee1c2bce3af70edcb8d78b2a925bc2ff83eb06f8ce58acc83dca2a70edbe
+  metadata.gz: 53d7bd60378e3e1114ff1ed000efa78b53acd75e73390496b05d41d8ae7f7a24a4158640c39c60bbb573a25e911725d40764c213d9c35b7749db46a3c2bef1da
+  data.tar.gz: 0a274f0af0b36dd8f2a9a4e65913849366d3a6f33b671baae484cb0de99f4c2c9ac9cd44382673f40f6403e26ac7a28d02cfc03cf4e1f981c4a642896a9c999d

data/.travis.yml

@@ -1,4 +1,8 @@
 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
 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.37'
+    spec.version       = '0.1.38'
     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/bin/avst-cloud-azure-rm

@@ -39,7 +39,7 @@ platform = nil # defaults to Linux
 server_name = "hostname1"
 user = "ubuntu"
 # Must comply to Azure pass guidelines
-password = "superSecretUbuntuPass111_@" 
+password = "" 
 location = nil # Will default to West Europe
 resource_group = "new_resource_group" # if RG does not exists it will create it
 vm_size = nil # Defaults to Basic_A0

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)
+        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)
             # Permit named instances from DEFAULT_FLAVOURS
             flavour = flavour || "t2.micro"
             os = os || "ubuntu-14"
@@ -122,6 +122,7 @@ module AvstCloud
                     tags['created_by'] = created_by
                 end
                 tags.merge!(custom_tags)
+
                 # create server
                 server = connect.servers.create :tags => tags,
                                                 :flavor_id => flavour,
@@ -133,7 +134,6 @@ module AvstCloud
                                                 :availability_zone => availability_zone,
                                                 :block_device_mapping => create_ebs_volume,
                                                 :vpc => vpc
-
                 
                 result_server = AvstCloud::AwsServer.new(server, server_name, nil, root_user, ssh_key)
                 # result_server.logger = logger
@@ -143,6 +143,27 @@ 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)
+                    else
+                        logger.warn("Elastic IP creation failed, proceeding with non Elastic IP\n\n")
+                    end
+                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
@@ -201,6 +222,18 @@ module AvstCloud
             servers.first
         end
 
+        def delete_elastic_ip(ip_address)
+            address = is_elastic_ip(ip_address)
+            if address
+                logger.debug "Found Elastic IP #{address.public_ip}, attempting to delete"
+                logger.debug "Elastic IP #{ip_address} deleted" if address.destroy 
+                return true
+            else
+                logger.debug "IP #{ip_address} does NOT appear to be an Elastic IP"
+            end
+            return false
+        end
+
     private
         def user_from_os(os)
             case os.to_s
@@ -233,5 +266,14 @@ module AvstCloud
         def all_named_servers(server_name)
             connect.servers.all({'tag:Name' => server_name})
         end
+
+        def is_elastic_ip(ip_address)
+            connect.addresses.each do |address|
+                if address.public_ip == ip_address
+                    return address
+                end
+            end
+            return false
+        end
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avst-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.38
 platform: ruby
 authors:
 - Martin Brehovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler