avst-cloud 0.1.32 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78c2594a42f7a68a61eb24543dc369bfc27b02796f37e80ad29c66ca00bf18f7
-  data.tar.gz: bcb3e6ad15450db234086533de8115df9c6f70af29c254e0ff3eee249ddf7876
+  metadata.gz: a7ade3d1a34eb13a1f59c2c0d2b1e45052da700d1486863ab8ffe15d83556961
+  data.tar.gz: 7fc3fc9dbb2a5a81db491884481e9ee5a7e31fe93ed14d0c35efaf8260353767
 SHA512:
-  metadata.gz: 556be45093bfe379d965ee19c3986a3cefa3d671d76f58ece5f7362df0ecf722f098be4ef4b596539fb3dfb210f535180a6232182719f46c547a8be5ece07a44
-  data.tar.gz: 36ff0c72ac07c240fb793b9db4cf49cfd3d63adb2fd64c396c270e404a082b49c3623f8c057f4c2c76da18dadbacf36d06b7b5c4287bcd529319cefb7273a89d
+  metadata.gz: cc1993fb4976ec41a56d7d7f74552f09e74f5730a9627f5bf6caea81ef3950fb97ef157a052583b1042ac7efbf76db9087d5dd4d2d1ebf8270b3aeccf9140edc
+  data.tar.gz: 3dfc93f2648b8829b0edea4bd2d31d50ab85946e4260d6e6bf03fdc53a6dc951b633de84e39b214d31f0aba3d2fd8665a2c55ee396362f846f5e668f30bedfd6

data/README.md

@@ -161,7 +161,7 @@ If puppet_runner param is defined:
 * create avst_cloud_tmp_folder on the server
 * uploads the content of local folder config/custom_system_config to it and then moves it to destination_folder, in subfolder hiera-configs the only files uploaded may be server_name.yaml, server_name_facts.yaml and puppetfile_dictionary.yaml
 * if puppet_runner_prepare is defined, it will run it 
-* r10k puppetfile install
+* if download_dependencies_command is defined, it will run it, in the common case should be 'r10k puppetfile install'
 * clear /etc/puppet folder
 * link /var/opt/puppet/current to /etc/puppet
 * links /var/opt/puppet/current/hiera.yaml to /etc/hiera.yaml
@@ -178,9 +178,11 @@ If custom_provisioning_command is defined, it will run the command on the server
     branch = "master"
     puppet_runner = nil 
     puppet_runner_prepare = nil
+    avst_cloud_config_dir = nil
+    download_dependencies_command = nil
     custom_provisioning_command = "echo 'done' >> /tmp/done",
     destination_folder = nil
-    server.provision(git, branch, server_tmp_folder, reference, custom_provisioning_commands, puppet_runner, puppet_runner_prepare, destination_folder)
+    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)
 
 
 ```
@@ -218,12 +220,14 @@ branch = "master" # branch
 reference = nil # tag
 # In this example we are using puppet-runner to apply our puppet configs, check doco
 puppet_runner = "puppet-runner start"
+avst_cloud_config_dir = 'config'
+download_dependencies_command = 'gem install r10k -v 2.6.4; r10k puppetfile install'
 puppet_runner_prepare = "puppet-runner prepare -c ./hiera-configs -d ./hiera -f ./environments/production/modules/hosts/facts.d -t ./hiera-configs -r ./hiera-configs/puppetfile_dictionary.yaml -o ./Puppetfile -e /var/opt/puppet/secure/keys"
 
 custom_provisioning_commands = ["echo 'done' >> /tmp/done"]
 # defaults to /var/opt/puppet
 destination_folder = nil
 
-server.provision(git, branch, server_tmp_folder, reference, custom_provisioning_commands, puppet_runner, puppet_runner_prepare, destination_folder)
+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)
 
 ```

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.32'
+    spec.version       = '0.1.34'
     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 }
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency "sshkit", "~> 1.16.0"
     spec.add_dependency "derelict"
     spec.add_dependency "docopt", ">= 0.5.0"
-    spec.add_dependency "colorize", ">= 0.7.3"
+    spec.add_dependency "rainbow"
     spec.add_dependency "nokogiri", '1.8.2'
 end
 

data/bin/avst-cloud

@@ -81,11 +81,13 @@ 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)
+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

data/lib/avst-cloud.rb

@@ -15,7 +15,8 @@
 require 'net/ssh'
 require 'net/scp'
 require 'uri'
-require 'colorize'
+require 'rainbow/refinement'
+using Rainbow
 require 'fog'
 module AvstCloud
-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, avst_cloud_config_dir)
+        def provision(git, branch, server_tmp_folder, reference, custom_provisioning_commands, puppet_runner, puppet_runner_prepare, destination_folder, avst_cloud_config_dir, download_dependencies_command)
             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, avst_cloud_config_dir)
+            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, download_dependencies_command)
             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', avst_cloud_config_dir = 'config')
+        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', download_dependencies_command = nil)
             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}"
@@ -188,6 +188,7 @@ module AvstCloud
             @reference = reference
             @custom_provisioning_commands = custom_provisioning_commands || []
             @puppet_runner = puppet_runner
+            @download_dependencies_command = download_dependencies_command
             @puppet_runner_prepare = puppet_runner_prepare
             @destination_folder = destination_folder || '/var/opt/puppet'
             @avst_cloud_config_dir = avst_cloud_config_dir || 'config'
@@ -225,6 +226,7 @@ module AvstCloud
             ENV['cap_access_user'] = server.access_user
             ENV['server_name'] = server.server_name
             ENV['puppet_runner'] = @puppet_runner
+            ENV['download_dependencies_command'] = @download_dependencies_command
             ENV['puppet_runner_prepare'] = @puppet_runner_prepare
             ENV['avst_cloud_tmp_folder'] = @server_tmp_folder
             ENV['custom_provisioning_commands'] = @custom_provisioning_commands.to_json

data/lib/capistrano/tasks/prepare_puppet_and_execute.rake

@@ -21,7 +21,7 @@ task :prepare_puppet_and_execute do
             SSHKit.config.command_map[:link_hiera] = "sudo su -c 'cd /etc && sudo rm -f hiera.yaml && sudo ln -sf /var/opt/puppet/current/hiera.yaml .'"
             SSHKit.config.command_map[:clear_puppet] = "sudo su -c 'rm -fr /etc/puppet'"
             SSHKit.config.command_map[:create_puppet_files] = "sudo su -c 'if [ ! -d /var/opt/puppet/current/files ]; then mkdir /var/opt/puppet/current/files; fi'"
-            SSHKit.config.command_map[:r10k] = "sudo su -c 'source /usr/local/rvm/scripts/rvm; r10k puppetfile install'"
+            SSHKit.config.command_map[:download_dependencies_command] = "sudo su -c 'source /usr/local/rvm/scripts/rvm; #{ENV["download_dependencies_command"]}'"
             SSHKit.config.command_map[:execute_puppet_runner] = "sudo su -c 'source /usr/local/rvm/scripts/rvm; #{ENV["puppet_runner"]}'"
             SSHKit.config.command_map[:cleanup_configs_from_hiera_configs] = "sudo su -c 'find /var/opt/puppet/current/hiera-configs -maxdepth 1 -type f ! -name \'puppetfile_dictionary_v4.yaml\' ! -name \'puppetfile_dictionary.yaml\' ! -name \'#{ENV["server_name"]}.yaml\' ! -name \'#{ENV["server_name"]}_facts.yaml\' -exec rm -f {} + '"
 
@@ -44,10 +44,10 @@ task :prepare_puppet_and_execute do
             end
 
             within '/var/opt/puppet/current' do
-                execute :r10k
+                execute :download_dependencies_command
             end
             
-            puts "Done r10k puppetfile install"
+            puts "Done downloading dependencies"
 
             execute :clear_puppet
             execute :create_puppet_files

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avst-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.34
 platform: ruby
 authors:
 - Martin Brehovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -209,19 +209,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement