wombat-cli 0.4.3 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (31) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +12 -0
  3. data/generator_files/cookbooks/wombat/attributes/default.rb +1 -1
  4. data/generator_files/cookbooks/wombat/metadata.rb +1 -1
  5. data/generator_files/cookbooks/workstation/.kitchen.ec2.yml +1 -1
  6. data/generator_files/cookbooks/workstation/libraries/home.rb +4 -0
  7. data/generator_files/cookbooks/workstation/metadata.rb +1 -1
  8. data/generator_files/cookbooks/workstation/recipes/browser.rb +0 -1
  9. data/generator_files/cookbooks/workstation/recipes/certs-keys.rb +1 -1
  10. data/generator_files/cookbooks/workstation/recipes/chef.rb +0 -1
  11. data/generator_files/cookbooks/workstation/recipes/default.rb +5 -5
  12. data/generator_files/cookbooks/workstation/recipes/editor.rb +2 -3
  13. data/generator_files/cookbooks/workstation/recipes/profile.rb +6 -7
  14. data/generator_files/cookbooks/workstation/recipes/terminal.rb +0 -2
  15. data/generator_files/cookbooks/workstation/test/integration/default/workstation_spec.rb +1 -1
  16. data/generator_files/packer/automate.json +8 -3
  17. data/generator_files/packer/build-node.json +8 -3
  18. data/generator_files/packer/chef-server.json +8 -3
  19. data/generator_files/packer/compliance.json +8 -3
  20. data/generator_files/packer/infranodes-windows.json +8 -3
  21. data/generator_files/packer/infranodes.json +8 -3
  22. data/generator_files/packer/workstation.json +8 -3
  23. data/generator_files/templates/arm.md.json.erb +755 -0
  24. data/generator_files/templates/{arm.json.erb → arm.vhd.json.erb} +62 -7
  25. data/generator_files/templates/bootstrap-aws.erb +3 -0
  26. data/generator_files/wombat.yml +3 -0
  27. data/lib/wombat/build.rb +101 -5
  28. data/lib/wombat/common.rb +26 -3
  29. data/lib/wombat/version.rb +1 -1
  30. data/wombat-cli.gemspec +1 -0
  31. metadata +19 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6545dfabe00be3f65594a04258d0a6065c497938
4
- data.tar.gz: 47a9335fc3ae579c4689768a04f4ce120cc25ed5
3
+ metadata.gz: ac5176b823a5e3d8e6802305371a5a455061b306
4
+ data.tar.gz: ee0bea3dedf2d1941ea9d96d99778c776adf1a1a
5
5
  SHA512:
6
- metadata.gz: 2d127444db4748f14a203026ad4253fc80dc40e5abdf054193800e442529a8520753d08db73aaf30900447ddb3f92e069b63a527106c09d0ce5ff86dff193238
7
- data.tar.gz: 52e0b865d6a0c0e37e8fd7d06f1cae9ca5c29bbb59850cc663d300886672bd8c296b162bb55f99f16aaa26f6f23f41015edc98751a42efec94387dac93d82a9b
6
+ metadata.gz: 002aae74027c19f0c4b270f58cf0de8cf0e56ed1a386ea9cf50a73ac9251604dd95b91fd4e264dd864c33cfa84ec5faf7d93a955a7295a7b095101bbbde8fc2e
7
+ data.tar.gz: 694efef6579ba56e997a5957dfca4f8fe0cb5c2dd5afc8b565102187f53494a289b0d70f6de2c9ee807d71f95a98346d90b5a9961bdcaf73c9a77b0bf20c68ba
data/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # Change Log
2
2
 
3
+ ## [v0.5.0](https://github.com/chef-cft/wombat/tree/v0.5.0) (2017-03-21)
4
+ [Full Changelog](https://github.com/chef-cft/wombat/compare/v0.4.3...v0.5.0)
5
+
6
+ **Merged pull requests:**
7
+
8
+ - no more Administrator [\#319](https://github.com/chef-cft/wombat/pull/319) ([binamov](https://github.com/binamov))
9
+ - Select whether to use Managed Disks or not [\#317](https://github.com/chef-cft/wombat/pull/317) ([russellseymour](https://github.com/russellseymour))
10
+ - azure enhancements [\#316](https://github.com/chef-cft/wombat/pull/316) ([binamov](https://github.com/binamov))
11
+ - Added Azure Provide Tag for Chef to resources [\#314](https://github.com/chef-cft/wombat/pull/314) ([russellseymour](https://github.com/russellseymour))
12
+ - Added support for Azure Managed Disks [\#312](https://github.com/chef-cft/wombat/pull/312) ([russellseymour](https://github.com/russellseymour))
13
+ - Remove checksum verification for Google Chrome Chocolatey package [\#307](https://github.com/chef-cft/wombat/pull/307) ([nweddle](https://github.com/nweddle))
14
+
3
15
  ## [v0.4.3](https://github.com/chef-cft/wombat/tree/v0.4.3) (2017-02-23)
4
16
  [Full Changelog](https://github.com/chef-cft/wombat/compare/v0.4.2...v0.4.3)
5
17
 
data/generator_files/cookbooks/wombat/attributes/default.rb CHANGED
@@ -28,12 +28,12 @@ default['demo']['chef_server_url'] = "https://#{node['demo']['chef_fqdn']}/organ
28
28
  default['demo']['compliance_fqdn'] = "#{node['demo']['domain_prefix']}compliance.#{node['demo']['domain']}"
29
29
 
30
30
  default['demo']['pkgs'] = %w(
31
- googlechrome
32
31
  atom
33
32
  git
34
33
  hub
35
34
  gitextensions
36
35
  git-credential-manager-for-windows
36
+ cmder
37
37
  )
38
38
 
39
39
  default['demo']['data_collector_token'] = '93a49a4f2482c64126f7b6015e6b0f30284287ee4054ff8807fb63d9cbd1c506'
data/generator_files/cookbooks/wombat/metadata.rb CHANGED
@@ -4,7 +4,7 @@ maintainer_email 'you@example.com'
4
4
  license 'all_rights'
5
5
  description 'Installs/Configures wombat'
6
6
  long_description 'Installs/Configures wombat'
7
- version '0.2.1'
7
+ version '0.2.2'
8
8
 
9
9
  depends 'hostsfile'
10
10
  depends 'apt'
data/generator_files/cookbooks/workstation/.kitchen.ec2.yml CHANGED
@@ -16,7 +16,7 @@ provisioner:
16
16
  platforms:
17
17
  - name: windows-2012r2
18
18
  driver:
19
- image_id: ami-1c7ad77c
19
+ image_id: ami-1562d075
20
20
  transport:
21
21
  ssh_key: <%= ENV["EC2_SSH_KEY_PATH"] %>
22
22
 
data/generator_files/cookbooks/workstation/libraries/home.rb ADDED
@@ -0,0 +1,4 @@
1
+
2
+ def home
3
+ 'C:\\Users\\Default'
4
+ end
data/generator_files/cookbooks/workstation/metadata.rb CHANGED
@@ -4,7 +4,7 @@ maintainer_email 'cheeseplus@chef.io'
4
4
  license 'Apache 2.0'
5
5
  description 'Configures a Windows workstation'
6
6
  long_description 'Configures a Windows workstation'
7
- version '0.2.6'
7
+ version '0.4.1'
8
8
  supports 'windows'
9
9
 
10
10
  depends 'chocolatey'
data/generator_files/cookbooks/workstation/recipes/browser.rb CHANGED
@@ -1,4 +1,3 @@
1
- home = Dir.home
2
1
  chef_server_url = "https://#{node['demo']['domain_prefix']}chef.#{node['demo']['domain']}/organizations/#{node['demo']['org']}"
3
2
  automate_url = "https://#{node['demo']['domain_prefix']}automate.#{node['demo']['domain']}/e/#{node['demo']['enterprise']}"
4
3
  compliance_url = "https://#{node['demo']['domain_prefix']}compliance.#{node['demo']['domain']}"
data/generator_files/cookbooks/workstation/recipes/certs-keys.rb CHANGED
@@ -1,4 +1,4 @@
1
- home = Dir.home
1
+
2
2
 
3
3
  %W(
4
4
  #{home}/.chef
data/generator_files/cookbooks/workstation/recipes/chef.rb CHANGED
@@ -1,4 +1,3 @@
1
- home = Dir.home
2
1
  chef_server_url = "https://#{node['demo']['domain_prefix']}chef.#{node['demo']['domain']}/organizations/#{node['demo']['org']}"
3
2
  conf_d_dir = File.join(home, '.chef', 'config.d')
4
3
 
data/generator_files/cookbooks/workstation/recipes/default.rb CHANGED
@@ -1,13 +1,13 @@
1
- include_recipe 'chocolatey'
1
+ include_recipe 'chocolatey::default'
2
2
 
3
3
  node['demo']['pkgs'].each do |pkg|
4
- chocolatey pkg do
5
- options ({ '-allow-empty-checksums' => '' })
4
+ chocolatey_package pkg do
5
+ options '--allow-empty-checksums'
6
6
  end
7
7
  end
8
8
 
9
- chocolatey 'cmder' do
10
- version '1.3.0'
9
+ chocolatey_package 'GoogleChrome' do
10
+ options '--ignorechecksum'
11
11
  end
12
12
 
13
13
  include_recipe 'workstation::certs-keys'
data/generator_files/cookbooks/workstation/recipes/editor.rb CHANGED
@@ -1,5 +1,4 @@
1
- home = Dir.home
2
-
1
+ run_home = Dir.home
3
2
  directory "#{home}/.atom"
4
3
 
5
4
  cookbook_file "#{home}/.atom/config.cson" do
@@ -13,7 +12,7 @@ cookbook_file "#{home}/.atom/apm-bootstrap.list" do
13
12
  end
14
13
 
15
14
  execute 'install Atom packages' do
16
- command "#{home}/AppData/Local/atom/bin/apm install --packages-file #{home}/.atom/apm-bootstrap.list"
15
+ command "#{run_home}/AppData/Local/atom/bin/apm install --packages-file #{home}/.atom/apm-bootstrap.list"
17
16
  action :run
18
17
  not_if { File.exist?("#{home}/.atom/packages/language-chef/README.md") }
19
18
  end
data/generator_files/cookbooks/workstation/recipes/profile.rb CHANGED
@@ -1,5 +1,6 @@
1
- home = Dir.home
2
- modules = "#{home}/Documents/WindowsPowerShell/modules"
1
+ modules = "C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\Modules"
2
+
3
+ posh_git_ps = "Install-Module posh-git -Destination #{modules}"
3
4
 
4
5
  powershell_script 'Install PSGet' do
5
6
  code <<-EOH
@@ -8,9 +9,7 @@ powershell_script 'Install PSGet' do
8
9
  end
9
10
 
10
11
  powershell_script 'Install posh-git' do
11
- code <<-EOH
12
- Install-Module posh-git
13
- EOH
12
+ code posh_git_ps
14
13
  end
15
14
 
16
15
  remote_file "#{home}/PSReadline.zip" do
@@ -28,11 +27,11 @@ powershell_script 'Extract PSReadline' do
28
27
  [System.Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem") | Out-Null
29
28
  [System.IO.Compression.ZipFile]::ExtractToDirectory('#{home}/PSReadLine.zip', '#{modules}/PSReadLine')
30
29
  EOH
31
- not_if { File.exist?("#{home}/Documents/WindowsPowerShell/Modules/PSReadLine/PSReadline.dll") }
30
+ not_if { File.exist?("#{modules}/PSReadLine/PSReadline.dll") }
32
31
  end
33
32
 
34
33
  # PowerShell AllUsersAllHosts profile
35
- profile = "#{home}/Documents/WindowsPowerShell/Microsoft.PowerShell_profile.ps1"
34
+ profile = "C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\profile.ps1"
36
35
 
37
36
  template profile do
38
37
  source 'ise_profile.ps1.erb'
data/generator_files/cookbooks/workstation/recipes/terminal.rb CHANGED
@@ -1,5 +1,3 @@
1
- home = Dir.home
2
-
3
1
  cookbook_file 'C:\tools\cmder\config\ConEmu.xml' do
4
2
  source 'cmder.xml'
5
3
  sensitive true
data/generator_files/cookbooks/workstation/test/integration/default/workstation_spec.rb CHANGED
@@ -29,7 +29,7 @@ describe command('choco list -l git-credential-manager-for-windows') do
29
29
  end
30
30
 
31
31
  describe command('Get-Module -ListAvailable -Name posh-git') do
32
- its(:stdout) { should match(/Script 0.7.0 posh-git/) }
32
+ its(:stdout) { should match(/Script 0.7.1.0 posh-git/) }
33
33
  end
34
34
 
35
35
  describe file('C:\Users\Administrator\Documents\WindowsPowerShell\Microsoft.PowerShell_profile.ps1') do
data/generator_files/packer/automate.json CHANGED
@@ -12,6 +12,10 @@
12
12
  "azure_resource_group": "{{env `AZURE_RESOURCE_GROUP`}}",
13
13
  "azure_object_id": "{{env `AZURE_OBJECT_ID`}}",
14
14
  "azure_location": "",
15
+ "azure_image_publisher": "Canonical",
16
+ "azure_image_offer": "UbuntuServer",
17
+ "azure_image_sku": "14.04.5-LTS",
18
+ "azure_image_version": "latest",
15
19
  "gce_account_file": "{{env `GCE_ACCOUNT_FILE`}}",
16
20
  "gce_project_id": "{{env `GCE_PROJECT_ID`}}",
17
21
  "gce_zone": "{{env `GCE_ZONE`}}",
@@ -56,9 +60,10 @@
56
60
  "capture_container_name": "images",
57
61
  "capture_name_prefix": "automate",
58
62
  "os_type": "Linux",
59
- "image_publisher": "Canonical",
60
- "image_offer": "UbuntuServer",
61
- "image_sku": "14.04.5-LTS",
63
+ "image_publisher": "{{ user `azure_image_publisher` }}",
64
+ "image_offer": "{{ user `azure_image_offer` }}",
65
+ "image_sku": "{{ user `azure_image_sku` }}",
66
+ "image_version": "{{ user `azure_image_version` }}",
62
67
  "location": "{{user `azure_location`}}",
63
68
  "vm_size": "Standard_DS3_v2",
64
69
  "ssh_username": "{{user `ssh_username`}}",
data/generator_files/packer/build-node.json CHANGED
@@ -12,6 +12,10 @@
12
12
  "azure_resource_group": "{{env `AZURE_RESOURCE_GROUP`}}",
13
13
  "azure_object_id": "{{env `AZURE_OBJECT_ID`}}",
14
14
  "azure_location": "",
15
+ "azure_image_publisher": "Canonical",
16
+ "azure_image_offer": "UbuntuServer",
17
+ "azure_image_sku": "14.04.5-LTS",
18
+ "azure_image_version": "latest",
15
19
  "gce_account_file": "{{env `GCE_ACCOUNT_FILE`}}",
16
20
  "gce_project_id": "{{env `GCE_PROJECT_ID`}}",
17
21
  "gce_zone": "{{env `GCE_ZONE`}}",
@@ -56,9 +60,10 @@
56
60
  "capture_container_name": "images",
57
61
  "capture_name_prefix": "build-node",
58
62
  "os_type": "Linux",
59
- "image_publisher": "Canonical",
60
- "image_offer": "UbuntuServer",
61
- "image_sku": "14.04.5-LTS",
63
+ "image_publisher": "{{ user `azure_image_publisher` }}",
64
+ "image_offer": "{{ user `azure_image_offer` }}",
65
+ "image_sku": "{{ user `azure_image_sku` }}",
66
+ "image_version": "{{ user `azure_image_version` }}",
62
67
  "location": "{{user `azure_location`}}",
63
68
  "vm_size": "Standard_DS3_v2",
64
69
  "ssh_username": "{{user `ssh_username`}}",
data/generator_files/packer/chef-server.json CHANGED
@@ -12,6 +12,10 @@
12
12
  "azure_resource_group": "{{env `AZURE_RESOURCE_GROUP`}}",
13
13
  "azure_object_id": "{{env `AZURE_OBJECT_ID`}}",
14
14
  "azure_location": "",
15
+ "azure_image_publisher": "Canonical",
16
+ "azure_image_offer": "UbuntuServer",
17
+ "azure_image_sku": "14.04.5-LTS",
18
+ "azure_image_version": "latest",
15
19
  "gce_account_file": "{{env `GCE_ACCOUNT_FILE`}}",
16
20
  "gce_project_id": "{{env `GCE_PROJECT_ID`}}",
17
21
  "gce_zone": "{{env `GCE_ZONE`}}",
@@ -56,9 +60,10 @@
56
60
  "capture_container_name": "images",
57
61
  "capture_name_prefix": "chef-server",
58
62
  "os_type": "Linux",
59
- "image_publisher": "Canonical",
60
- "image_offer": "UbuntuServer",
61
- "image_sku": "14.04.5-LTS",
63
+ "image_publisher": "{{ user `azure_image_publisher` }}",
64
+ "image_offer": "{{ user `azure_image_offer` }}",
65
+ "image_sku": "{{ user `azure_image_sku` }}",
66
+ "image_version": "{{ user `azure_image_version` }}",
62
67
  "location": "{{user `azure_location`}}",
63
68
  "vm_size": "Standard_DS3_v2",
64
69
  "ssh_username": "{{user `ssh_username`}}",
data/generator_files/packer/compliance.json CHANGED
@@ -12,6 +12,10 @@
12
12
  "azure_resource_group": "{{env `AZURE_RESOURCE_GROUP`}}",
13
13
  "azure_object_id": "{{env `AZURE_OBJECT_ID`}}",
14
14
  "azure_location": "",
15
+ "azure_image_publisher": "Canonical",
16
+ "azure_image_offer": "UbuntuServer",
17
+ "azure_image_sku": "14.04.5-LTS",
18
+ "azure_image_version": "latest",
15
19
  "gce_account_file": "{{env `GCE_ACCOUNT_FILE`}}",
16
20
  "gce_project_id": "{{env `GCE_PROJECT_ID`}}",
17
21
  "gce_zone": "{{env `GCE_ZONE`}}",
@@ -54,9 +58,10 @@
54
58
  "capture_container_name": "images",
55
59
  "capture_name_prefix": "compliance",
56
60
  "os_type": "Linux",
57
- "image_publisher": "Canonical",
58
- "image_offer": "UbuntuServer",
59
- "image_sku": "14.04.5-LTS",
61
+ "image_publisher": "{{ user `azure_image_publisher` }}",
62
+ "image_offer": "{{ user `azure_image_offer` }}",
63
+ "image_sku": "{{ user `azure_image_sku` }}",
64
+ "image_version": "{{ user `azure_image_version` }}",
60
65
  "location": "{{user `azure_location`}}",
61
66
  "vm_size": "Standard_DS3_v2",
62
67
  "ssh_username": "{{user `ssh_username`}}",
data/generator_files/packer/infranodes-windows.json CHANGED
@@ -12,6 +12,10 @@
12
12
  "azure_resource_group": "{{env `AZURE_RESOURCE_GROUP`}}",
13
13
  "azure_object_id": "{{env `AZURE_OBJECT_ID`}}",
14
14
  "azure_location": "",
15
+ "azure_image_publisher": "MicrosoftWindowsServer",
16
+ "azure_image_offer": "WindowsServer",
17
+ "azure_image_sku": "2012-R2-Datacenter",
18
+ "azure_image_version": "latest",
15
19
  "gce_account_file": "{{env `GCE_ACCOUNT_FILE`}}",
16
20
  "gce_project_id": "{{env `GCE_PROJECT_ID`}}",
17
21
  "gce_zone": "{{env `GCE_ZONE`}}",
@@ -58,9 +62,10 @@
58
62
  "capture_container_name": "images",
59
63
  "capture_name_prefix": "automate-infranode-{{user `node-name`}}-{{timestamp}}",
60
64
  "os_type": "Windows",
61
- "image_publisher": "MicrosoftWindowsServer",
62
- "image_offer": "WindowsServer",
63
- "image_sku": "2012-R2-Datacenter",
65
+ "image_publisher": "{{ user `azure_image_publisher` }}",
66
+ "image_offer": "{{ user `azure_image_offer` }}",
67
+ "image_sku": "{{ user `azure_image_sku` }}",
68
+ "image_version": "{{ user `azure_image_version` }}",
64
69
  "location": "{{user `azure_location`}}",
65
70
  "vm_size": "Standard_DS3_v2",
66
71
  "communicator": "winrm",
data/generator_files/packer/infranodes.json CHANGED
@@ -12,6 +12,10 @@
12
12
  "azure_resource_group": "{{env `AZURE_RESOURCE_GROUP`}}",
13
13
  "azure_object_id": "{{env `AZURE_OBJECT_ID`}}",
14
14
  "azure_location": "",
15
+ "azure_image_publisher": "Canonical",
16
+ "azure_image_offer": "UbuntuServer",
17
+ "azure_image_sku": "14.04.5-LTS",
18
+ "azure_image_version": "latest",
15
19
  "gce_account_file": "{{env `GCE_ACCOUNT_FILE`}}",
16
20
  "gce_project_id": "{{env `GCE_PROJECT_ID`}}",
17
21
  "gce_zone": "{{env `GCE_ZONE`}}",
@@ -54,9 +58,10 @@
54
58
  "capture_container_name": "images",
55
59
  "capture_name_prefix": "infranode-{{user `node-name`}}",
56
60
  "os_type": "Linux",
57
- "image_publisher": "Canonical",
58
- "image_offer": "UbuntuServer",
59
- "image_sku": "14.04.5-LTS",
61
+ "image_publisher": "{{ user `azure_image_publisher` }}",
62
+ "image_offer": "{{ user `azure_image_offer` }}",
63
+ "image_sku": "{{ user `azure_image_sku` }}",
64
+ "image_version": "{{ user `azure_image_version` }}",
60
65
  "location": "{{user `azure_location`}}",
61
66
  "vm_size": "Standard_DS3_v2",
62
67
  "ssh_username": "{{user `ssh_username`}}",
data/generator_files/packer/workstation.json CHANGED
@@ -12,6 +12,10 @@
12
12
  "azure_resource_group": "{{env `AZURE_RESOURCE_GROUP`}}",
13
13
  "azure_object_id": "{{env `AZURE_OBJECT_ID`}}",
14
14
  "azure_location": "",
15
+ "azure_image_publisher": "MicrosoftWindowsServer",
16
+ "azure_image_offer": "WindowsServer",
17
+ "azure_image_sku": "2012-R2-Datacenter",
18
+ "azure_image_version": "latest",
15
19
  "gce_account_file": "{{env `GCE_ACCOUNT_FILE`}}",
16
20
  "gce_project_id": "{{env `GCE_PROJECT_ID`}}",
17
21
  "gce_zone": "{{env `GCE_ZONE`}}",
@@ -56,9 +60,10 @@
56
60
  "capture_container_name": "images",
57
61
  "capture_name_prefix": "workstation-{{user `workstation-number`}}-{{timestamp}}",
58
62
  "os_type": "Windows",
59
- "image_publisher": "MicrosoftWindowsServer",
60
- "image_offer": "WindowsServer",
61
- "image_sku": "2012-R2-Datacenter",
63
+ "image_publisher": "{{ user `azure_image_publisher` }}",
64
+ "image_offer": "{{ user `azure_image_offer` }}",
65
+ "image_sku": "{{ user `azure_image_sku` }}",
66
+ "image_version": "{{ user `azure_image_version` }}",
62
67
  "location": "{{user `azure_location`}}",
63
68
  "vm_size": "Standard_DS3_v2",
64
69
  "communicator": "winrm",