avst-cloud 0.1.23 → 0.1.24

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTJmZWUxZWJkOTBmYmNmZjA2MTI4MzMzOWQ2NDRiZTAwNjZiYjY3Yw==
-  data.tar.gz: !binary |-
-    YThjYjYwNzY4MmQxM2NlNDc5YjBjZDBjZDMzNTQ1NzM2YjUxYTc1NQ==
+SHA1:
+  metadata.gz: 3370ac4ccdbfd9ceeb83ac96811777096a6e1b57
+  data.tar.gz: 3c223c920252d5b07f828c828f06af2e438060e3
 SHA512:
-  metadata.gz: !binary |-
-    NWQ2ZjQyMTYzZWI5NzdjYzliMjBiZjNkNjJhZmVjN2YwNGVkZGY4MmI3MmI4
-    NWI5ZTcxNGM2ODkzMjAxYzRiMzcyMTcyMmU4N2NmOWNiOWMwN2FmMDYwNjFj
-    ZDJmYTIyNjdlZDI1YTVkOGNkZWZiZjlhODdmYTgzODY5MDQ0ZWE=
-  data.tar.gz: !binary |-
-    MzgzMDNmMDY2YTkxNDU0NjcxNTNiYTk4NmZjZjVmMWQ1MmFkZWJhYjY1ZWQ5
-    NjI5MTY3NjkzZTdlYjZiMzFmYjI4YTI4MjA5OGE5YzE2NDg0NGUxYjBkMjI4
-    ZTJmZmIzNzBmOWIzZDliY2M5N2RiMmE3N2FiMWFlZjJhMWY0YzQ=
+  metadata.gz: 009ee424963d6c69d534ae34337d70b791b63784597838a706e6ded71447ca8297c6f7a2972acc0aa5b8718b211b910b0b8ee1373ccbec686b86ac62fcfd941f
+  data.tar.gz: 884718437f8225ea53c5b3be975addb07e0d1d16bed4a9f737f2ab4b2013477883e9b57c97a9a893cd9ee2f280cb960d1813a04b5b6da041b1bbd03975c61fa5

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.23'
+    spec.version       = '0.1.24'
     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/azure_rm_connection.rb

@@ -143,10 +143,10 @@ module AvstCloud
 
                 # Check if network_interface_card_id exists if not create one
                 # If not, create one for virtual network provided with subnet, security group and also public ip name
-                ip_address = check_create_network_interface(network_interface_name, network_interface_resource_group, location, virtual_network_name, subnet_name, ip_configuration_name, private_ip_allocation_method, public_ip_allocation_method, subnet_address_list, dns_list, network_address_list, address_prefix, use_public_ip, create_public_ip_configuration, virtual_network_resource_group, public_ip_resource_group, subnet_resource_group)
+                check_create_network_interface(network_interface_name, network_interface_resource_group, location, virtual_network_name, subnet_name, ip_configuration_name, private_ip_allocation_method, public_ip_allocation_method, subnet_address_list, dns_list, network_address_list, address_prefix, use_public_ip, create_public_ip_configuration, virtual_network_resource_group, public_ip_resource_group, subnet_resource_group)
                 
                 # create server
-                server = connect.servers.create(
+                connect.servers.create(
                     name: server_name,
                     location: location,
                     resource_group: resource_group,
@@ -168,10 +168,11 @@ module AvstCloud
                         attach_data_disk(server, data_disk_name, data_disks[data_disk_name], storage_account_name)
                     end
                 end
-                result_server = AvstCloud::AzureRmServer.new(server, server_name, ip_address, user, password)
+                result_server = server(server_name, resource_group, user, password, use_public_ip, network_interface_resource_group, public_ip_resource_group)
+
                 logger.debug "[DONE]\n\n"
                 logger.debug "The server has been successfully created, to login onto the server:\n"
-                logger.debug "\t ssh #{user}@#{ip_address} with pass #{Logging.mask_message(password)} \n"
+                logger.debug "\t ssh #{user}@#{result_server.ip_address} with pass #{Logging.mask_message(password)} \n"
                 result_server
             end
         end

data/lib/avst-cloud/cloud_server.rb

@@ -39,9 +39,9 @@ module AvstCloud
             logger.debug "Bootstrap done. You can connect to server as #{@access_user} on #{@ip_address}"
         end
 
-        def provision(git, branch, server_tmp_folder, reference, custom_provisioning_commands, puppet_runner, puppet_runner_prepare, destination_folder)
+        def provision(git, branch, server_tmp_folder, reference, custom_provisioning_commands, puppet_runner, puppet_runner_prepare, destination_folder, avst_cloud_config_dir)
             logger.debug "Provisioning #{@server_name}..."
-            provision_task = AvstCloud::CapistranoDeploymentTask.new(git, branch, server_tmp_folder, reference, custom_provisioning_commands, puppet_runner, puppet_runner_prepare, destination_folder)
+            provision_task = AvstCloud::CapistranoDeploymentTask.new(git, branch, server_tmp_folder, reference, custom_provisioning_commands, puppet_runner, puppet_runner_prepare, destination_folder, avst_cloud_config_dir)
             run_tasks([AvstCloud::WaitUntilReady.new, provision_task])
             logger.debug "Provisioning done. You can connect to server on #{@ip_address}"
         end

data/lib/avst-cloud/task.rb

@@ -176,7 +176,7 @@ module AvstCloud
 
     class CapistranoDeploymentTask < AvstCloud::Task
 
-        def initialize(git, branch, server_tmp_folder = "/tmp/avst_cloud_tmp_#{Time.now.to_i}", reference = nil, custom_provisioning_commands = [], puppet_runner = nil, puppet_runner_prepare = nil, destination_folder = '/var/opt/puppet')
+        def initialize(git, branch, server_tmp_folder = "/tmp/avst_cloud_tmp_#{Time.now.to_i}", reference = nil, custom_provisioning_commands = [], puppet_runner = nil, puppet_runner_prepare = nil, destination_folder = '/var/opt/puppet', avst_cloud_config_dir = 'config')
             unless git and (branch or reference)
                 logger.debug "You have to provide git repo url #{git} and git branch #{branch} or git tag reference #{reference}".red
                 raise "You have to provide git repo url #{git} and git branch #{branch} or git tag reference #{reference}"
@@ -190,6 +190,7 @@ module AvstCloud
             @puppet_runner = puppet_runner
             @puppet_runner_prepare = puppet_runner_prepare
             @destination_folder = destination_folder || '/var/opt/puppet'
+            @avst_cloud_config_dir = avst_cloud_config_dir || 'config'
         end
 
         def execute(server)
@@ -228,6 +229,7 @@ module AvstCloud
             ENV['avst_cloud_tmp_folder'] = @server_tmp_folder
             ENV['custom_provisioning_commands'] = @custom_provisioning_commands.to_json
             ENV['destination_folder'] = @destination_folder
+            ENV['avst_cloud_config_dir'] = @avst_cloud_config_dir
             logger.debug "Using git #{@git} branch #{@branch} to provision #{server.ip_address}"
 
             Capistrano::Application.invoke('production')

data/lib/capistrano/tasks/prepare_puppet_and_execute.rake

@@ -28,8 +28,8 @@ task :prepare_puppet_and_execute do
             avst_cloud_tmp_folder = ENV["avst_cloud_tmp_folder"]
             execute "mkdir #{avst_cloud_tmp_folder}"
 
-            if File.exist?("config/custom_system_config")
-                upload! "config/custom_system_config", avst_cloud_tmp_folder, recursive: true
+            if File.exist?("#{ENV["avst_cloud_config_dir"]}/custom_system_config")
+                upload! "#{ENV["avst_cloud_config_dir"]}/custom_system_config", avst_cloud_tmp_folder, recursive: true
                 execute "cp -rf #{avst_cloud_tmp_folder}/custom_system_config/* /var/opt/puppet/current/."
             end
 
@@ -51,8 +51,8 @@ task :prepare_puppet_and_execute do
             execute :link_puppet
             execute :link_hiera
 
-            if File.exist?("config/keys")
-                upload! "config/keys", "/etc/puppet/config", recursive: true
+            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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avst-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Martin Brehovsky
@@ -10,62 +10,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
   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
   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
@@ -86,28 +86,28 @@ dependencies:
   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'
 - !ruby/object:Gem::Dependency
   name: rvm-capistrano
   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
@@ -128,14 +128,14 @@ dependencies:
   name: capistrano-rvm
   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
@@ -170,42 +170,42 @@ dependencies:
   name: derelict
   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: docopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.3
 description: Automated creation, bootstrapping and provisioning of servers
@@ -222,8 +222,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -263,12 +263,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []