wombat-cli 0.6.2 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ddc13e35754aab60e7913344910a930269ef07d
-  data.tar.gz: '04937038b8469411ce9fb940f1082c12a9777e5a'
+  metadata.gz: c7e9df8f4933709336560bf60e2ba07823ef2f8b
+  data.tar.gz: 30c19c933f5951cb9788b253b7cf838485bce0b4
 SHA512:
-  metadata.gz: 69910b1bfd31eaef17499017f17a22b0b206225e5cf11843f96e46aff9aebf9114c384fb2384ac8407b3001c739be04499bc714f2645f7737aeaf323d1268fde
-  data.tar.gz: 1a8a35304eb0c00f293239da268d63f2e2844fe563d2cd13a4a963f868441a4803166ecd6bc56905d3d4c31b22baf4f05467902cc143c23f7300d59678fdb14b
+  metadata.gz: 61fa7126bc22a273e87165e786929ef3379e5b72252a7e3374601a5e00ed42d2d6e5d9ff17274e59761eec4b0ede322a2283e6aa442322017e84af80b6946637
+  data.tar.gz: 9d2e9ca9461be8959d6f4862b6697239b55f25b9fb3c932233da152221dfb86a5ce401262ee9dace985f38b5599f4eefda7c1b54a351f4fb4e78b9df857be55f

data/generator_files/cookbooks/infranodes/metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'you@example.com'
 license 'all_rights'
 description 'Installs/Configures infranodes'
 long_description 'Installs/Configures infranodes'
-version '0.2.0'
+version '0.2.1'
 
 depends 'chef-ingredient'
 depends 'wombat'

data/generator_files/cookbooks/infranodes/recipes/default.rb

@@ -5,8 +5,9 @@
 # Copyright (c) 2016 The Authors, All Rights Reserved.
 
 if node['platform'] == 'windows'
-  node.default['push_jobs']['package_url'] = "https://packages.chef.io/stable/windows/2008r2/push-jobs-client-2.1.1-1-x86.msi"
-  node.default['push_jobs']['package_checksum'] = "b8e76d54bb931949bcc94a6c764ccebda0e6957820b0c3fe62c96e6c3a184d9f"
+  # Shouldn't need pushy on windows nodes for the time being, and timeouts are blocking builds.
+  # node.default['push_jobs']['package_url'] = "https://packages.chef.io/files/stable/push-jobs-client/2.1.4/windows/2012/push-jobs-client-2.1.4-1-x86.msi"
+  # node.default['push_jobs']['package_checksum'] = "3b979f8d362738c8ac126ace0e80122a4cbc53425d5f8cf9653cdd79eca16d62"
 
   conf_dir = "C:/chef"
   tmp_dir = "C:/Windows/Temp"
@@ -33,7 +34,8 @@ template File.join(conf_dir, 'client.rb') do
   variables({
       :chef_server_url => node['demo']['chef_server_url'],
       :name => node['demo']['node-name'],
-      :automate_fqdn => node['demo']['automate_fqdn']
+      :automate_fqdn => node['demo']['automate_fqdn'],
+      :conf_dir => conf_dir
   })
 end
 
@@ -50,8 +52,9 @@ directory File.join(conf_dir, 'trusted_certs')
   end
 end
 ###
-node.set['push_jobs']['chef']['chef_server_url'] = node['demo']['chef_server_url']
-node.set['push_jobs']['chef']['node_name'] = node['demo']['node-name']
-node.default['push_jobs']['allow_unencrypted'] = true
-
-include_recipe 'push-jobs'
+if node['platform'] == 'linux'
+  node.set['push_jobs']['chef']['chef_server_url'] = node['demo']['chef_server_url']
+  node.set['push_jobs']['chef']['node_name'] = node['demo']['node-name']
+  node.default['push_jobs']['allow_unencrypted'] = true
+  include_recipe 'push-jobs'
+end

data/generator_files/cookbooks/infranodes/templates/default/client.rb.erb

@@ -1,5 +1,5 @@
 chef_server_url '<%= @chef_server_url %>'
-client_key '/etc/chef/client.pem'
+client_key '<%= @conf_dir %>/client.pem'
 node_name '<%= @name %>'
 data_collector.server_url "https://<%= @automate_fqdn %>/data-collector/v0/"
 data_collector.token "93a49a4f2482c64126f7b6015e6b0f30284287ee4054ff8807fb63d9cbd1c506"

data/lib/wombat/build.rb

@@ -158,7 +158,7 @@ module Wombat
       # iterate around the log files and get the image location
       time = Benchmark.measure do
         logs.each do |log|
-          
+
           # get the image uri
           url = File.read(log).split("\n").grep(/OSDiskUri:/) {|x| x.split[1]}.last
 
@@ -176,10 +176,10 @@ module Wombat
           # Append the new location for the image to the log file
           append_text = format("\nManagedDiskOSDiskUri: https://%s.blob.core.windows.net/%s/%s", wombat['azure']['storage_account'], container_name, blob_name)
           File.open(log, 'a') { |f| f.write(append_text) }
-          
+
         end
       end
-      
+
       info (format("Images copied in %s", duration(time.real)))
 
     end
@@ -201,8 +201,13 @@ module Wombat
         if template_name =~ /infranodes/
           infranodes.each do |name, _rl|
             next if name.empty?
+            if wombat['infranodes'][name]['platform'] == "windows"
+              infra_template = template_name + '-windows'
+            else
+              infra_template = template_name
+            end
             proc_hash[name] = {
-              'template' => template_name,
+              'template' => infra_template,
               'options' => {
                 'node-name' => name,
                 'os' => wombat['infranodes'][name]['platform']
@@ -381,7 +386,7 @@ module Wombat
           cmd.insert(2, "--var azure_image_sku=#{base_image_parts[2]}")
           cmd.insert(2, "--var azure_image_version=#{base_image_parts[3]}") if base_image_parts.length == 4
         end
-      
+
         cmd.insert(2, "--var azure_resource_group=#{wombat['name']}")
         cmd.insert(2, "--var azure_storage_account=#{wombat['azure']['storage_account']}")
       end

data/lib/wombat/version.rb

@@ -1,3 +1,3 @@
 module Wombat
-  VERSION = "0.6.2"
+  VERSION = "0.7.2"
 end

data/wombat-cli.gemspec

@@ -21,16 +21,16 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.3.1"
+  gem.required_ruby_version = ">= 2.4.1"
 
   gem.add_dependency 'rake', '~> 11.2'
   gem.add_dependency 'berkshelf', '~> 5.0'
   gem.add_dependency 'net-ssh', '~> 3.2'
   gem.add_dependency 'parallel', '~> 1.9'
   gem.add_dependency 'aws-sdk', '~> 2.5'
-  gem.add_dependency 'azure_mgmt_resources', '~> 0.9'
-  gem.add_dependency 'azure_mgmt_storage', '~> 0.9'
-  gem.add_dependency 'azure_mgmt_network', '~> 0.9'
-  gem.add_dependency 'azure-storage', '~> 0.11.5.preview'
+  gem.add_dependency 'azure_mgmt_resources', '= 0.14.0'
+  gem.add_dependency 'azure_mgmt_storage', '= 0.14.0'
+  gem.add_dependency 'azure_mgmt_network', '= 0.14.0'
+  gem.add_dependency 'azure-storage', '~> 0.14.0.preview'
   gem.add_dependency 'github_changelog_generator'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wombat-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.2
 platform: ruby
 authors:
 - Andre Elizondo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -85,58 +85,58 @@ dependencies:
   name: azure_mgmt_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: azure-storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.5.preview
+        version: 0.14.0.preview
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.5.preview
+        version: 0.14.0.preview
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
@@ -377,7 +377,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.1
+      version: 2.4.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -385,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Make Chef demos delightful with Wombat