avst-cloud 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb95fb24811d87a5a8b62ca4c024ae19eae5b59304b062c273b52eb790391951
-  data.tar.gz: 7397a52380316c3ef9554bd082abf032b4bc31e1e3240ab7633f382a6e753bf2
+  metadata.gz: 7cad9e4dc98b83ba6e613a270ca130fa900e7bae7d1505c81a9a8af2f77271e1
+  data.tar.gz: 477338b913d229c8a92c7d310aef13aa893974aeb78d1a70b9682f7aac5a4f0f
 SHA512:
-  metadata.gz: c0c6c40f0cdc8483b27f04f885aa56ff4878106195820d2db3096aea1528e70cb86f902e337b5bfc9ffccc9dc83bcdbd4e070ffd86943dbfbc190cd077a1cac9
-  data.tar.gz: fd4cb73e77146a8d160e9b7153ba0a83207730b79564cdaffc4b80a451d22355aec0ebe239d33c2f07de1dd6c25eca678d2ae833f5cbaeaab32931c00aeeb6e3
+  metadata.gz: 23da11cf970a260583b226e24051a2d519f9fe76101aa466963129bc9effb72dacc167221208cc0f6b6a089fc20806e53ed34ee462f8c579875051dfee7f79ae
+  data.tar.gz: 3be32f47fca6e6689a9c614579db49c60a1f18d4d2a9905d32b21f4c2737a9d95cabcb15408e77124309a72b77d38a60867f8fcb3b8fd2597f86fc6c398e0781

data/README.md

@@ -35,6 +35,15 @@ The application depends on several gems listed in avst-cloud.gemspec file. Bundl
     # ebs_size - disk size
     # hdd_device_path - hdd device path, may differ per ami/os
     # availability_zone - aws availability zone
+    # additional_hdds - hash of additional disks to attach to server, must contain device_name (e.g. /dev/sda1) and ebs_size per each hdd
+    additional_hdds:
+        'AppDisk':
+            device_name: '/dev/sdf'
+            ebs_size: '100'
+        'DatabaseDisk':
+            device_name: '/dev/sdg'
+            ebs_size: '50'
+            volume_type: 'gp2' #default value
     # vpc - virtual private cloud, defaults to nil, make sure you adjust subned_id and security_group_ids accordingly when setting this option
 
     server = conn.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)
@@ -53,6 +62,16 @@ The application depends on several gems listed in avst-cloud.gemspec file. Bundl
 
 ### Rackspace
 
+# additional_hdds - hash of additional disks to attach to server, must contain device_name (e.g. /dev/sda1) and ebs_size per each hdd
+    additional_hdds:
+        'AppDisk':
+            device_name: '/dev/sdf'
+            ebs_size: '100'
+            volume_type: 'SSD' #default value
+        'DatabaseDisk':
+            device_name: '/dev/sdg'
+            ebs_size: '50'
+
 ```
 
     conn = AvstCloud::RackspaceConnection.new(provider_user, provider_pass, region)

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.30'
+    spec.version       = '0.1.31'
     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 }
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency "rvm-capistrano"
     spec.add_dependency "capistrano", "3.4.1"
     spec.add_dependency "capistrano-rvm"
-    spec.add_dependency "net-ssh", "3.0.2"
+    spec.add_dependency "net-ssh", "4.2.0"
     spec.add_dependency "sshkit", "~> 1.16.0"
     spec.add_dependency "derelict"
     spec.add_dependency "docopt", ">= 0.5.0"

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, vpc=nil, created_by=nil, custom_tags={})
+        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={})
 
             # Permit named instances from DEFAULT_FLAVOURS
             flavour = flavour || "t2.micro"
@@ -85,6 +85,7 @@ module AvstCloud
                 logger.debug "availability_zone  - #{availability_zone}"
                 logger.debug "ebs_size           - #{ebs_size}"
                 logger.debug "hdd_device_path    - #{device_name}"
+                logger.debug "additional_hdds    - #{additional_hdds}"
                 logger.debug "vpc                - #{vpc}"
 
                 create_ebs_volume = nil
@@ -97,7 +98,22 @@ module AvstCloud
                                                 'Ebs.VolumeSize' => ebs_size,
                                             } 
                                         ]
+                    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 << { 
+                                    :DeviceName => disk['device_name'],
+                                    'Ebs.VolumeType' => volume_type,
+                                    'Ebs.VolumeSize' => disk['ebs_size']
+                                }
+                            else
+                                logger.warn "Failed to create additional hdd, required params device_name (e.g. /dev/sda1) or ebs_size missing: #{disk}"
+                            end 
+                        end 
+                    end
                 end
+
                 tags = {
                     'Name' => server_name,
                     'os' => os
@@ -218,4 +234,4 @@ module AvstCloud
             connect.servers.all({'tag:Name' => server_name})
         end
     end
-end
+end

data/lib/avst-cloud/rackspace_connection.rb

@@ -33,7 +33,7 @@ module AvstCloud
             AvstCloud::RackspaceServer.new(server, server_name, server.public_ip_address, root_user, root_password)
         end
 
-        def create_server(server_name, image_id, flavor_id='4')
+        def create_server(server_name, image_id, flavor_id='4', additional_hdds={})
             server_number, os="ubuntu14"
             
             logger.debug "Creating Rackspace server:"
@@ -71,7 +71,22 @@ module AvstCloud
 
                     logger.debug "The server has been successfully created, to login onto the server:\n\n"
                     logger.debug "\t ssh #{server.username}@#{server.public_ip_address}\n\n"
-
+                    if additional_hdds and additional_hdds.is_a?(Hash)
+                        additional_hdds.each do |disk_name, disk|
+                            if disk['device_name'] && disk['ebs_size']
+                                volume_type = disk['volume_type'] || 'SSD'
+                                volume = storageService.volumes.create(:size => disk['ebs_size'], :display_name => disk_name, :volume_type => volume_type)
+                                if volume && volume.id
+                                    wait_for_hdd(volume.id, 'available')
+                                    server.attach_volume volume.id, disk['device_name'] 
+                                else
+                                    logger.error "Failed to create volume, #{disk_name}"
+                                end
+                            else
+                                logger.warn "Failed to create additional hdd, required params device_name (e.g. /dev/sda1) or ebs_size missing: #{disk}"
+                            end 
+                        end 
+                    end
                 rescue Fog::Errors::TimeoutError
                     logger.debug "[TIMEOUT]\n\n"
                     logger.debug "This server is currently #{server.progress}% into the build process and is taking longer to complete than expected."
@@ -130,14 +145,40 @@ module AvstCloud
             unless @connection
                 logger.debug "Creating new connection to rackspace: #{@provider_user} #{Logging.mask_message(@provider_pass)} #{@region}"
                 @connection = Fog::Compute.new({
-                    :provider             => 'rackspace',
+                    :provider             => 'Rackspace',
                     :rackspace_username   => @provider_access_user,
                     :rackspace_api_key    => @provider_access_pass,
+                    :rackspace_auth_url  => Fog::Rackspace::UK_AUTH_ENDPOINT,
                     :version => :v2,  # Use Next Gen Cloud Servers
                     :rackspace_region => @region
                 })
             end
             @connection
         end
+
+        def storageService
+            unless @storageService
+                logger.debug "Creating new connection to rackspace storage service: #{@provider_user} #{Logging.mask_message(@provider_pass)} #{@region}"
+                @storageService = Fog::Rackspace::BlockStorage.new({
+                    :rackspace_username  => @provider_access_user,        # Your Rackspace Username
+                    :rackspace_api_key   => @provider_access_pass,              # Your Rackspace API key
+                    :rackspace_auth_url  => Fog::Rackspace::UK_AUTH_ENDPOINT,
+                    :rackspace_region    => @region
+                })
+            end
+            @storageService
+        end
+
+        def wait_for_hdd(id, expected_state)
+            logger.debug "Waiting for hdd state change...".yellow
+            (1..60).each do |c|
+                hdd = storageService.volumes.get(id)
+                if hdd.state == expected_state
+                    break
+                end
+                logger.debug(.)
+                sleep 60
+            end
+        end
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avst-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Martin Brehovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,14 +158,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
@@ -301,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Automated creation, bootstrapping and provisioning of servers