avst-cloud 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3370ac4ccdbfd9ceeb83ac96811777096a6e1b57
-  data.tar.gz: 3c223c920252d5b07f828c828f06af2e438060e3
+  metadata.gz: d8a9e1f41de85cc3bfc407ab8e8c68c5222847d5
+  data.tar.gz: a5ac5c6bfb03878455a4ffceefc90756f80eb979
 SHA512:
-  metadata.gz: 009ee424963d6c69d534ae34337d70b791b63784597838a706e6ded71447ca8297c6f7a2972acc0aa5b8718b211b910b0b8ee1373ccbec686b86ac62fcfd941f
-  data.tar.gz: 884718437f8225ea53c5b3be975addb07e0d1d16bed4a9f737f2ab4b2013477883e9b57c97a9a893cd9ee2f280cb960d1813a04b5b6da041b1bbd03975c61fa5
+  metadata.gz: c602bb7233e3e133629f013565a57c974e82f5e30e0c5e429034dfb63d364dc58a0135ec0e47a2016fe08a777b66b3b1fabdac479b0e353bfc29ab55417816df
+  data.tar.gz: fe4379c33d901995fd5a0def1804e371937cf2c0d9462b41a3f1c1eacf46f0b31dca9f27c450d3667f79a534cc490fda3681b0809db33e5c5e10515b6704570a

data/README.md

@@ -140,7 +140,7 @@ Uses Capistrano to download source from git repo (branch or tag) to destination_
 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
+* 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
 * clear /etc/puppet folder

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.24'
+    spec.version       = '0.1.25'
     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 }
@@ -30,5 +30,6 @@ Gem::Specification.new do |spec|
     spec.add_dependency "derelict"
     spec.add_dependency "docopt", ">= 0.5.0"
     spec.add_dependency "colorize", ">= 0.7.3"
+    spec.add_dependency "nokogiri", '1.6.8'
 end
 

data/lib/capistrano/tasks/prepare_puppet_and_execute.rake

@@ -23,6 +23,7 @@ task :prepare_puppet_and_execute do
             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] = "source /usr/local/rvm/scripts/rvm; r10k puppetfile install"
             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.yaml\' ! -name \'#{ENV["server_name"]}.yaml\' ! -name \'#{ENV["server_name"]}_facts.yaml\' -exec rm -f {} + '"
 
             # create folder in /tmp to store custom configs, this will be deleted by clean command
             avst_cloud_tmp_folder = ENV["avst_cloud_tmp_folder"]
@@ -33,6 +34,8 @@ task :prepare_puppet_and_execute do
                 execute "cp -rf #{avst_cloud_tmp_folder}/custom_system_config/* /var/opt/puppet/current/."
             end
 
+            execute :cleanup_configs_from_hiera_configs
+
             if ENV['puppet_runner_prepare']
                 SSHKit.config.command_map[:puppet_runner_prepare] = "sudo su -c 'source /usr/local/rvm/scripts/rvm; #{ENV["puppet_runner_prepare"]}'"
                 within '/var/opt/puppet/current' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avst-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Martin Brehovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,6 +208,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.3
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.8
 description: Automated creation, bootstrapping and provisioning of servers
 email:
 - mbrehovsky@adaptavist.com