avst-cloud 0.1.35 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 08b2bde0582221a0d81aae6d0b3606206633d23ebffb3350273b6e94118ae05c
-  data.tar.gz: 95b4457c08517ea0ea4275cc866262eb8067de3bc9ff93fe0e12837ceb7fadfe
+  metadata.gz: 46cf2e686b412006cb9a4cbd2ae7fb624f5dbadf800bc05db414e7b2718e98e0
+  data.tar.gz: b56b12c41540f2d787fb80db59cc9cc6d1017721b327fa9bfd48adb0bab75afa
 SHA512:
-  metadata.gz: 7d1253877fe6464c5c7c9a8a8d6a3649c73cd8f5cf9a0c2948269742c7d5c9851c75b11e7c12dcc1535cdd3566ec5344888b47600c7a878417e52dbf8d40bd43
-  data.tar.gz: a57749823fcb9baffdca0f3ecd504b3329f8acc2dd92370ff1241b7c36767df345f12800140311f7bb4b07c71134dc994c539140aaf0206cbf81e13cdc4b3ed2
+  metadata.gz: 25461b2620b01cfd5e82909a00ad833787df06ef96729ce76e476cfddc9eb83189add2a324c2c7b51fb5c5e3d8428fd19e0d9520315ea76f868b23966c40b6cf
+  data.tar.gz: 388417ecbce19754583fb90c0b3e884e4d1d8ef1b585d8feef8b1e908dee98e8615914571584a7ce8c61ebfc4e5f58180ea1bd266649802d91d8132e5406072d

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.35'
+    spec.version       = '0.1.40'
     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,13 +15,14 @@ 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.16.1"
+    spec.add_development_dependency "bundler", "~> 1.17.3"
     spec.add_development_dependency "rake"
     spec.add_dependency "fog"
     spec.add_dependency "fog-core", "1.43.0"
-    spec.add_dependency "fog-azure"
-    spec.add_dependency "fog-azure-rm", "0.0.3"
-    spec.add_dependency "azure"
+    ###spec.add_dependency "fog-azure"
+    ###spec.add_dependency "fog-azure-rm", "0.0.3"
+    spec.add_dependency "fog-google", "1.8.2"
+    ###spec.add_dependency "azure"
     spec.add_dependency "rvm-capistrano"
     spec.add_dependency "capistrano", "3.4.1"
     spec.add_dependency "capistrano-rvm"
@@ -30,6 +31,8 @@ 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.2'
+    spec.add_dependency "nokogiri", "~> 1.8.5"
+    spec.add_dependency "signet", "0.14.1"
 end
 
+

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/bin/avst-cloud-gcp

@@ -0,0 +1,124 @@
+#!/usr/bin/env ruby 
+
+# Copyright 2015 Adaptavist.com Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'avst-cloud'
+require 'avst-cloud/gcp_connection'
+require 'avst-cloud/gcp_server'
+
+avst_cloud_base="#{File.expand_path("../../", __FILE__)}"
+
+# FILL IN YOUR GCP ACCOUNT DETAILS (Access Key ID and Secret Access Key), GIT REPO AND MAKE SURE 
+# FILES IN files FOLDER HAS CORRECT CONTENT
+provider_user=''
+provider_pass=''
+project=''
+region='europe-west1'
+
+# Initiate connector object
+conn = AvstCloud::GcpConnection.new(provider_user, provider_pass, region, project)
+
+server_name        = 'hostname1'
+
+flavour            = nil # defaults to t2.micro
+hdd_device_path    = nil # defaults to '/dev/sda1'
+machine_type_id    = nil
+os                 = "centos-7"
+
+key_name           = 'admin' # key name, e.g. admin
+ssh_public_key     = "path/to/your/admin.pem.pub" # Full path to ssh public key, e.g. /tmp/admin.pem.pub
+ssh_private_key    = "path/to/your/admin.pem" # Full path to ssh private key, e.g. /tmp/admin.pem
+subnet_id          = nil # Your subnet
+security_group_ids = [''] # List of security groups
+root_disk_size     = nil # In GB
+additional_hdds    = {}
+vpc                = nil
+created_by         = nil
+root_username      = nil
+custom_tags        = []
+availability_zone  = 'europe-west1-b'
+delete_root_disk   = true
+
+# display server status
+##server_detail = conn.server_status(server_name)
+##puts server_detail.inspect
+##conn.list_zones
+##conn.list_flavours(availability_zone)
+##conn.list_images
+##conn.list_networks
+##conn.list_disk_types(availability_zone)
+
+server = conn.create_server(server_name, flavour, os, key_name, ssh_public_key, ssh_private_key, subnet_id, security_group_ids, root_disk_size, machine_type_id, availability_zone, additional_hdds, vpc, created_by, custom_tags, root_username, delete_root_disk)
+
+# server = conn.server(server_name, root_username, ssh_private_key, os)
+# server.destroy
+
+# puts conn.server_status(server_name)
+# exit
+
+pre_upload_commands = [
+    "echo 'pre_upload_command was here' >> /tmp/pre_upload",
+]
+
+custom_file_uploads = {
+    "#{avst_cloud_base}/files/id_rsa" => "/tmp/.",
+    "#{avst_cloud_base}/files/known_hosts" => "/tmp/."
+}
+
+# Uploading ssh keys to access git repo in provisioning stage, make sure you provide correct keys
+post_upload_commands = [
+    "mkdir /home/ubuntu/.ssh",
+    "mv /tmp/id_rsa /home/ubuntu/.ssh/.",
+    "mv /tmp/known_hosts /home/ubuntu/.ssh/.",
+    "chmod 0600 /home/ubuntu/.ssh/known_hosts",
+    "chmod 0600 /home/ubuntu/.ssh/id_rsa",
+    "mkdir /var/opt/puppet",
+    "chown ubuntu /var/opt/puppet",
+    "apt-get update && apt-get install -o Dpkg::Options::='--force-confold' -f -y git puppet-common puppet"
+]
+
+remote_server_debug = true
+debug_structured_log = false
+
+##!##server.bootstrap(pre_upload_commands, custom_file_uploads, post_upload_commands, remote_server_debug, debug_structured_log, false)
+
+git = "ssh://git@you_repo.git"
+branch = "master" 
+reference = nil # Tag
+# In this example we do not use puppet-runner, check doco
+puppet_runner = nil
+puppet_runner_prepare = nil
+avst_cloud_config_dir = nil
+download_dependencies_command = nil 
+custom_provisioning_commands = ["echo 'done' >> /tmp/done", "echo 'done' >> /tmp/done1"]
+server_tmp_folder="/tmp/avst_cloud_tmp_#{Time.now.to_i}"
+
+destination_folder = nil # defaults to /var/opt/puppet
+##!##server.provision(git, branch, server_tmp_folder, reference, custom_provisioning_commands, puppet_runner, puppet_runner_prepare, destination_folder, avst_cloud_config_dir, download_dependencies_command)
+
+# puts conn.server_status(server_name)
+# server.stop
+
+# puts conn.server_status(server_name)
+# server.start
+
+# puts conn.server_status(server_name)
+
+# custom_commands=nil
+# server_tmp_folder="/tmp/done"
+# server.post_provisioning_cleanup(custom_commands, os, remote_server_debug, server_tmp_folder)
+
+# server.destroy
+# puts conn.server_status(server_name)

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, encrypt_root=false ,root_encryption_key=nil, delete_root_disk=true, root_disk_type='gp2', root_disk_iops=0, private_ip=nil)
             # Permit named instances from DEFAULT_FLAVOURS
             flavour = flavour || "t2.micro"
             os = os || "ubuntu-14"
@@ -87,26 +87,62 @@ module AvstCloud
                 logger.debug "hdd_device_path    - #{device_name}"
                 logger.debug "additional_hdds    - #{additional_hdds}"
                 logger.debug "vpc                - #{vpc}"
+                logger.debug "create_elastic_ip  - #{create_elastic_ip}"
+                logger.debug "custom_private_ip  - #{private_ip}"
 
                 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 
@@ -122,6 +158,7 @@ module AvstCloud
                     tags['created_by'] = created_by
                 end
                 tags.merge!(custom_tags)
+
                 # create server
                 server = connect.servers.create :tags => tags,
                                                 :flavor_id => flavour,
@@ -132,8 +169,8 @@ module AvstCloud
                                                 :security_group_ids => security_group_ids,
                                                 :availability_zone => availability_zone,
                                                 :block_device_mapping => create_ebs_volume,
-                                                :vpc => vpc
-
+                                                :vpc => vpc,
+                                                :private_ip_address => private_ip
                 
                 result_server = AvstCloud::AwsServer.new(server, server_name, nil, root_user, ssh_key)
                 # result_server.logger = logger
@@ -143,6 +180,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 +259,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 +303,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

data/lib/avst-cloud/gcp_connection.rb

@@ -0,0 +1,310 @@
+# Copyright 2015 Adaptavist.com Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative './cloud_connection.rb'
+require 'fog/google'
+using Rainbow
+module AvstCloud
+    
+    class GcpConnection < AvstCloud::CloudConnection
+        
+        attr_accessor :region
+
+        def initialize(provider_user, provider_pass, region, project)
+            super('Google', provider_user, provider_pass)
+            @region = region
+            @project = project
+        end
+        
+        def server(server_name, root_user, root_password, os=nil)
+            server = find_fog_server(server_name)
+            if !root_user and os
+                root_user = user_from_key(os)
+            end
+            AvstCloud::GcpServer.new(server, server_name, server.public_ip_address, root_user, root_password)
+        end
+
+        def create_server(server_name, flavour, os, key_name, ssh_public_key, ssh_private_key, subnet_id, security_group_ids, root_disk_size, root_disk_type, machine_type_id, availability_zone, additional_hdds={}, vpc=nil, created_by=nil, custom_tags=[], root_username=nil, delete_root_disk=true)
+            flavour = flavour || "g1-small"
+            os = os || "centos-7"
+            vpc_name = vpc || "default"
+            subnet_name = subnet_id || "default"
+            machine_type_id = machine_type_id || get_image_name(os) 
+            if machine_type_id.nil? or machine_type_id.empty?
+                machine_type_id = "centos-7-v20190312"
+            end
+
+            unless File.file?(ssh_public_key)
+                logger.error "Could not find local public SSH key '#{ssh_public_key}'".red
+                raise "Could not find local SSH public key '#{ssh_public_key}'"
+            end
+
+            unless File.file?(ssh_private_key)
+                logger.error "Could not find local private SSH key '#{ssh_public_key}'".red
+                raise "Could not find local SSH private key '#{ssh_public_key}'"
+            end
+            root_user = root_username || user_from_key(os)
+
+            existing_servers    = all_named_servers(server_name)
+            restartable_servers = existing_servers.select{ |serv| serv.status == 'TERMINATED' }
+            #TODO, status is a guess, need to work out if "DELETED" is valid for GCP
+            running_servers     = existing_servers.select{ |serv| serv.status != 'TERMINATED' && serv.status != 'DELETED' }
+
+            if running_servers.length > 0
+                running_servers.each do |server|
+                    logger.error "Server #{server_name} with id #{server.id} found in state: #{server.status}".yellow
+                end
+                raise "Server with the same name found!"
+
+            elsif restartable_servers.length > 0
+                if restartable_servers.length > 1
+                    running_servers.each do |server|
+                        logger.error "Server #{server_name} with id #{server.id} found in state: #{server.status}. Can not restart".yellow
+                    end
+                    raise "Too many servers can be restarted."
+                end
+                server = restartable_servers.first
+                server.start
+                result_server = AvstCloud::GcpServer.new(server, server_name, server.public_ip_address, root_user, ssh_private_key)
+                result_server.wait_for_state() {|serv| serv.ready?}
+                logger.debug "[DONE]\n\n"
+                logger.debug "The server was successfully re-started.\n\n"
+                result_server
+            else
+                logger.debug "Creating GCP server:"
+                logger.debug "Server name        - #{server_name}"
+                logger.debug "Operating system   - #{os}"
+                logger.debug "image_template_id  - #{machine_type_id}"
+                logger.debug "flavour            - #{flavour}"
+                logger.debug "key_name           - #{key_name}"
+                logger.debug "Public ssh_key     - #{ssh_public_key}"
+                logger.debug "Private ssh_key    - #{ssh_private_key}"
+                logger.debug "root user          - #{root_user}"
+                logger.debug "subnet_id          - #{subnet_name}"
+                logger.debug "security_group_ids - #{security_group_ids}"
+                logger.debug "region             - #{@region}"
+                logger.debug "availability_zone  - #{availability_zone}"
+                logger.debug "root_disk_size     - #{root_disk_size}"
+                logger.debug "additional_hdds    - #{additional_hdds}"
+                logger.debug "vpc                - #{vpc_name}"
+
+                # Create root disk
+                # TODO check if this exists and exit politely, or catch the exception and exit politely
+                root_disk_type = root_disk_type || 'pd-standard'
+                logger.debug "Creating root disk with type #{root_disk_type}"
+                root_disk_url="https://www.googleapis.com/compute/v1/projects/#{@project}/zones/#{availability_zone}/diskTypes/#{root_disk_type}"
+                disk = connect.disks.create :name => "#{server_name}-root",
+                                            :size_gb => root_disk_size,
+                                            :zone => availability_zone,
+                                            :source_image => machine_type_id,
+                                            :type => root_disk_url
+                
+                # wait for the disk to be ready
+                logger.debug "Waiting for root disk to be ready"
+                disk.wait_for { ready? }
+
+                disk_to_attach=[disk.attached_disk_obj(boot: true, auto_delete: delete_root_disk)]
+
+                # create additional HDD's if required
+                if additional_hdds and additional_hdds.is_a?(Hash)
+                    disk_count=1
+                    additional_hdds.each_value do |disk|
+                        #TODO wortk out how to set disk type!
+                        if disk['disk_size'] || disk['ebs_size']
+                            disk_type = disk['disk_type'] || 'pd-standard'
+                            logger.debug "Creating additional disk #{disk_count} with type #{disk_type}"
+                            disk_url="https://www.googleapis.com/compute/v1/projects/#{@project}/zones/#{availability_zone}/diskTypes/#{disk_type}"
+                            delete_disk_with_vm = disk['delete_disk_with_vm'] || false
+                            additional_disk = connect.disks.create :name => "#{server_name}-disk#{disk_count}",
+                                                                   :size_gb => disk['disk_size'] || disk['ebs_size'],
+                                                                   :zone => availability_zone,
+                                                                   :type => disk_url
+                            # wait for additional disk
+                            logger.debug "Waiting for additional disk #{disk_count}"
+                            additional_disk.wait_for { ready? }
+
+                            # add disk to array of those to be mounted
+                            disk_to_attach.push additional_disk.attached_disk_obj(boot: false, auto_delete: delete_disk_with_vm)
+
+                            #blank the additional disk object for the next time around
+                            attached_disk = nil
+
+                            # increment disk counter
+                            disk_count = disk_count +1
+                        else
+                            logger.warn "Failed to create additional hdd, required param disk_size missing: #{disk}"
+                        end 
+                    end 
+                end
+
+                ## GCP tags are not key value pairs
+                tags = [server_name, os] + custom_tags
+
+                # work out the URK for the subnetwork
+                subnet_url = "https://www.googleapis.com/compute/v1/projects/#{@project}/regions/#{region}/subnetworks/#{subnet_name}"
+
+                # create server
+                logger.debug "Creating Server"
+                server = connect.servers.create :name => server_name,
+                                                :disks => disk_to_attach,
+                                                :machine_type => flavour,
+                                                :private_key_path => ssh_private_key,
+                                                :public_key_path => ssh_public_key,
+                                                :zone => availability_zone,
+                                                :network_interfaces => [{ :network => "global/networks/#{vpc_name}",
+                                                                          :subnetwork => subnet_url,
+                                                                          :access_configs => [{
+                                                                              :name => "External NAT",
+                                                                              :type => "ONE_TO_ONE_NAT" }] 
+                                                                        }],
+                                                :username => root_user,
+                                                :tags => tags
+
+                result_server = AvstCloud::GcpServer.new(server, server_name, nil, root_user, ssh_private_key)
+                # result_server.logger = logger
+                # Check every 5 seconds to see if server is in the active state (ready?).
+                # If the server has not been built in 5 minutes (600 seconds) an exception will be raised.
+                result_server.wait_for_state() {|serv| serv.ready?}
+
+                logger.debug "[DONE]\n\n"
+                logger.debug "The server has been successfully created, to login onto the server:\n"
+                logger.debug "\t ssh -i #{ssh_private_key} #{root_user}@#{server.public_ip_address}\n"
+                result_server.ip_address = server.public_ip_address
+                result_server
+            end
+        end
+
+        def server_status(server_name)
+            #TODO, status is a guess, need to work out if this is valid for GCP
+            servers = all_named_servers(server_name).select{|serv| serv.status != 'DELETED'}
+            if servers.length > 0
+                servers.each do |server|
+                    logger.debug "Server #{server.id} with name '#{server_name}' exists and has state: #{server.status}"
+                end
+            else
+                logger.debug "Server not found for name: #{server_name}"
+            end
+        end
+
+        def list_zones
+            logger.debug connect.list_zones
+        end
+
+        def list_flavours(zone)
+            logger.debug connect.list_machine_types(zone)
+        end
+
+        def list_images
+            # Only list current images, not deprecated ones
+            get_images.each do |im|
+                logger.debug im.inspect
+            end
+        end
+        
+        def list_networks
+            logger.debug connect.list_networks
+        end
+
+        def list_disk_types(availability_zone)
+            logger.debug connect.list_disk_types(availability_zone)
+        end
+
+        # Returns list of servers from fog
+        def list_known_servers
+            connect.servers.all
+        end
+
+        def find_fog_server(server_name, should_fail=true)
+            #TODO, status is a guess, need to work out if this is valid for GCP
+            servers = all_named_servers(server_name).select{|serv| serv.status != 'DELETED'}
+            unless servers.length == 1    
+                logger.debug "Found #{servers.length} servers for name: #{server_name}".yellow
+                if should_fail
+                    raise "Found #{servers.length} servers for name: #{server_name}"
+                end
+            end
+            servers.first
+        end
+
+    private
+        # attempt to workout the user from the key comments! - TODO
+        def user_from_key(os)
+            raise "Function to extract username from key comment not yet implemented"
+        end
+        def connect
+            unless @connection
+                logger.debug "Creating new connection to GCP"
+                @connection = Fog::Compute.new({
+                    :provider                 => 'Google',
+                    :google_project           => @project,
+                    :google_client_email      => @provider_access_user,
+                    :google_json_key_location => @provider_access_pass
+                })
+            end
+            @connection
+        end
+        # get a list of images,
+        def get_images(family=nil, deprecated=false)
+            # if we are looking to include depreacted images get them all
+            if deprecated 
+                images = connect.images.all
+            # if not just get the current ones
+            else
+                images = connect.images.current
+            end
+
+            # if we are to filter on a list of families do so
+            if family
+                final_images = Array.new
+                images.each do |image|
+                    if image.family == family
+                        final_images.push image
+                    end
+                end
+                # return the filtered list
+                final_images
+            # if not just return all results
+            else
+                # return the results
+                images
+            end
+        end
+        # get a single machine image by family
+        def get_image_name(family)
+            image = get_images(family, false)
+            if image.length != 1
+                raise "Too many images returned for family #{family}, #{image.length} were returned"
+            end
+            # return the image name
+            image.first.name
+
+        end
+        
+        def all_named_servers(server_name)
+            # ***connect.servers.all does not accept any arguments in GCP***
+            
+            # create empty array
+            named_servers=Array.new
+            # get all servers
+            connect.servers.all.each do | returned_server | 
+                # if the server name matches what we are looking for add to the result array
+                if returned_server.name == server_name
+                    named_servers.push(returned_server)
+                end
+            end
+            # return the list of servers
+            named_servers
+        end
+    end
+end

data/lib/avst-cloud/gcp_server.rb

@@ -0,0 +1,55 @@
+# Copyright 2015 Adaptavist.com Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative './cloud_server.rb'
+using Rainbow
+module AvstCloud
+    class GcpServer < AvstCloud::CloudServer
+
+        def stop
+            if @server
+                logger.debug "Stopping #{@server_name}"
+                @server.stop
+                wait_for_state() {|serv| serv.status == 'TERMINATED'}
+                logger.debug "[DONE]\n\n"
+                logger.debug "Server #{@server_name} stopped...".green
+            else
+                raise "Server #{@server_name} does not exist!".red
+            end
+        end
+
+        def start
+            if @server
+                logger.debug "Starting #{@server_name}"
+                @server.start
+                wait_for_state() {|serv| serv.ready?}
+                logger.debug "[DONE]\n\n"
+                logger.debug "Server #{@server_name} started...".green
+            else
+                raise "Server #{@server_name} does not exist!".red
+            end
+        end
+
+        def destroy
+            if @server
+                logger.debug "Killing #{@server_name}"
+                @server.destroy
+                logger.debug "Server #{@server_name} destroying...".green
+            else
+                raise "Server #{@server_name} does not exist!".red
+            end
+        end
+
+    end
+end

data/lib/avst-cloud/rackspace_connection.rb

@@ -176,9 +176,8 @@ module AvstCloud
                 if hdd.state == expected_state
                     break
                 end
-                logger.debug(.)
                 sleep 60
             end
         end
     end
-end
+end

data/lib/capistrano/tasks/prepare_puppet_and_execute.rake

@@ -54,10 +54,6 @@ task :prepare_puppet_and_execute do
             execute :link_puppet
             execute :link_hiera
 
-            if File.exist?("#{ENV["avst_cloud_config_dir"]}/keys")
-                upload! "#{ENV["avst_cloud_config_dir"]}/keys", "/etc/puppet/config", recursive: true
-            end
-
             within '/etc/puppet' do
                 begin
                         execute :execute_puppet_runner

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avst-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.40
 platform: ruby
 authors:
 - Martin Brehovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.1
+        version: 1.17.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.1
+        version: 1.17.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -69,47 +69,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.43.0
 - !ruby/object:Gem::Dependency
-  name: fog-azure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fog-azure-rm
+  name: fog-google
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
-- !ruby/object:Gem::Dependency
-  name: azure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: rvm-capistrano
   requirement: !ruby/object:Gem::Requirement
@@ -224,18 +196,32 @@ dependencies:
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.5
+- !ruby/object:Gem::Dependency
+  name: signet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 0.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 0.14.1
 description: Automated creation, bootstrapping and provisioning of servers
 email:
 - mbrehovsky@adaptavist.com
@@ -260,6 +246,7 @@ files:
 - bin/avst-cloud
 - bin/avst-cloud-azure
 - bin/avst-cloud-azure-rm
+- bin/avst-cloud-gcp
 - bin/avst-cloud-puppet
 - bin/avst-cloud-rackspace
 - config/custom_system_config/hiera-configs/defaults/example.yaml
@@ -277,6 +264,8 @@ files:
 - lib/avst-cloud/azure_server.rb
 - lib/avst-cloud/cloud_connection.rb
 - lib/avst-cloud/cloud_server.rb
+- lib/avst-cloud/gcp_connection.rb
+- lib/avst-cloud/gcp_server.rb
 - lib/avst-cloud/logging.rb
 - lib/avst-cloud/rackspace_connection.rb
 - lib/avst-cloud/rackspace_server.rb
@@ -300,8 +289,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