wombat-cli 0.2.0 → 0.2.1

data/packer/build-node.json

@@ -24,6 +24,7 @@
     "enterprise": "mammals",
     "node-number": "1",
     "org": "marsupials",
+    "ssh_username": "ubuntu",
     "workstations": "1"
   },
 
@@ -33,11 +34,11 @@
       "secret_key": "{{user `aws_secret_key`}}",
       "region": "{{user `aws_region`}}",
       "source_ami": "{{user `aws_source_ami`}}",
-      "instance_type": "c3.xlarge",
+      "instance_type": "t2.micro",
       "communicator": "ssh",
       "associate_public_ip_address": true,
       "ssh_private_ip": false,
-      "ssh_username": "ubuntu",
+      "ssh_username": "{{user `ssh_username`}}",
       "ssh_pty" : true,
       "ami_name": "build-node-{{user `node-number`}}-{{timestamp}}"
     },
@@ -68,7 +69,7 @@
       "disk_size": "80",
       "image_name": "build-node-{{user `node-number`}}-{{timestamp}}",
       "machine_type": "n1-standard-2",
-      "ssh_username": "ubuntu",
+      "ssh_username": "{{user `ssh_username`}}",
       "ssh_pty" : true
     }
   ],
@@ -88,9 +89,10 @@
       "type": "chef-solo",
       "install_command": "{{user `chef_install_url`}} | sudo bash -s -- -c {{user `chef_channel`}} -v {{user `chef_ver`}}",
       "cookbook_paths": [ "{{pwd}}/vendored-cookbooks/build_node" ],
-      "run_list": [ "apt", "build_node" ],
+      "run_list": [ "build_node", "wombat::authorized-keys", "wombat::etc-hosts" ],
       "json": {
         "demo": {
+          "admin-user": "{{user `ssh_username`}}",
           "domain_prefix": "{{user `domain_prefix`}}",
           "domain": "{{user `domain`}}",
           "enterprise": "{{user `enterprise`}}",

data/packer/chef-server.json

@@ -22,7 +22,10 @@
     "domain": "animals.biz",
     "domain_prefix": "",
     "enterprise": "mammals",
+    "manage": "stable-latest",
     "org": "marsupials",
+    "push-jobs-server": "stable-latest",
+    "ssh_username": "ubuntu",
     "workstations": "1"
   },
 
@@ -32,11 +35,10 @@
       "secret_key": "{{user `aws_secret_key`}}",
       "region": "{{user `aws_region`}}",
       "source_ami": "{{user `aws_source_ami`}}",
-      "instance_type": "c3.xlarge",
+      "instance_type": "m4.large",
       "communicator": "ssh",
       "associate_public_ip_address": true,
-      "ssh_private_ip": false,
-      "ssh_username": "ubuntu",
+      "ssh_username": "{{user `ssh_username`}}",
       "ssh_pty" : true,
       "ami_name": "chef-{{timestamp}}"
     },
@@ -67,7 +69,7 @@
       "disk_size": "80",
       "image_name": "chef-{{timestamp}}",
       "machine_type": "n1-standard-2",
-      "ssh_username": "ubuntu",
+      "ssh_username": "{{user `ssh_username`}}",
       "ssh_pty" : true
     }
   ],
@@ -87,9 +89,10 @@
       "type": "chef-solo",
       "install_command": "{{user `chef_install_url`}} | sudo bash -s -- -c {{user `chef_channel`}} -v {{user `chef_ver`}}",
       "cookbook_paths": [ "{{pwd}}/vendored-cookbooks/chef_server" ],
-      "run_list": [ "apt", "chef_server" ],
+      "run_list": [ "chef_server", "wombat::authorized-keys", "wombat::etc-hosts" ],
       "json": {
         "demo": {
+          "admin-user": "{{user `ssh_username`}}",
           "domain_prefix": "{{user `domain_prefix`}}",
           "domain": "{{user `domain`}}",
           "enterprise": "{{user `enterprise`}}",
@@ -97,7 +100,9 @@
           "build-nodes": "{{user `build-nodes`}}",
           "workstations":  "{{user `workstations`}}",
           "versions": {
-            "chef-server": "{{user `chef-server`}}"
+            "chef-server": "{{user `chef-server`}}",
+            "push-jobs-server": "{{user `push-jobs-server`}}",
+            "manage": "{{user `manage`}}"
           }
         }
       }

data/packer/compliance.json

@@ -23,6 +23,7 @@
     "domain_prefix": "",
     "enterprise": "mammals",
     "org": "marsupials",
+    "ssh_username": "ubuntu",
     "workstations": "1"
   },
 
@@ -32,11 +33,10 @@
       "secret_key": "{{user `aws_secret_key`}}",
       "region": "{{user `aws_region`}}",
       "source_ami": "{{user `aws_source_ami`}}",
-      "instance_type": "c3.xlarge",
+      "instance_type": "t2.medium",
       "communicator": "ssh",
       "associate_public_ip_address": true,
-      "ssh_private_ip": false,
-      "ssh_username": "ubuntu",
+      "ssh_username": "{{user `ssh_username`}}",
       "ssh_pty" : true,
       "ami_name": "compliance-{{timestamp}}"
     },
@@ -67,7 +67,7 @@
       "disk_size": "80",
       "image_name": "compliance-{{timestamp}}",
       "machine_type": "n1-standard-2",
-      "ssh_username": "ubuntu",
+      "ssh_username": "{{user `ssh_username`}}",
       "ssh_pty" : true
     }
   ],
@@ -87,9 +87,10 @@
       "type": "chef-solo",
       "install_command": "{{user `chef_install_url`}} | sudo bash -s -- -c {{user `chef_channel`}} -v {{user `chef_ver`}}",
       "cookbook_paths": [ "{{pwd}}/vendored-cookbooks/compliance" ],
-      "run_list": [ "apt", "compliance" ],
+      "run_list": [ "compliance", "wombat::authorized-keys", "wombat::etc-hosts" ],
       "json": {
         "demo": {
+          "admin-user": "{{user `ssh_username`}}",
           "domain_prefix": "{{user `domain_prefix`}}",
           "domain": "{{user `domain`}}",
           "enterprise": "{{user `enterprise`}}",

data/packer/infranodes-windows.json

@@ -0,0 +1,100 @@
+{
+  "variables": {
+    "aws_access_key": "{{env `AWS_ACCESS_KEY_ID`}}",
+    "aws_secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}",
+    "aws_region": "{{env `AWS_REGION`}}",
+    "aws_source_ami": "ami-87c037e7",
+    "azure_client_id": "{{env `AZURE_CLIENT_ID`}}",
+    "azure_tenant_id": "{{env `AZURE_TENANT_ID`}}",
+    "azure_client_secret": "{{env `AZURE_CLIENT_SECRET`}}",
+    "azure_subscription_id": "{{env `AZURE_SUBSCRIPTION_ID`}}",
+    "azure_storage_account": "{{env `AZURE_STORAGE_ACCOUNT`}}",
+    "azure_resource_group": "{{env `AZURE_RESOURCE_GROUP`}}",
+    "gce_account_file": "{{env `GCE_ACCOUNT_FILE`}}",
+    "gce_project_id": "{{env `GCE_PROJECT_ID`}}",
+    "gce_zone": "{{env `GCE_ZONE`}}",
+    "gce_source_image": "windows-server-2012-r2-dc-v20160809",
+    "build-nodes": "1",
+    "chef_channel": "stable",
+    "chef_install_url": "curl -L https://omnitruck.chef.io/install.sh",
+    "chef_ver": "latest",
+    "domain": "animals.biz",
+    "domain_prefix": "",
+    "enterprise": "mammals",
+    "node-name": "acceptance",
+    "org": "marsupials",
+    "ssh_username": "ubuntu",
+    "winrm_password": "RL9@T40BTmXh",
+    "winrm_username": "Administrator",
+    "workstations": "1"
+  },
+
+  "builders": [
+    { "type": "amazon-ebs",
+      "access_key": "{{user `aws_access_key`}}",
+      "secret_key": "{{user `aws_secret_key`}}",
+      "region": "{{user `aws_region`}}",
+      "source_ami": "{{user `aws_source_ami`}}",
+      "instance_type": "m4.large",
+      "communicator": "winrm",
+      "associate_public_ip_address": true,
+      "winrm_port": 5985,
+      "winrm_username": "{{user `winrm_username`}}",
+      "winrm_password": "{{user `winrm_password`}}",
+      "user_data_file": "{{template_dir}}/scripts/bootstrap-aws.txt",
+      "ami_name": "automate-infranode-{{user `node-name`}}-{{timestamp}}"
+    },
+    {
+      "type": "googlecompute",
+      "account_file": "{{user `gce_account_file`}}",
+      "project_id": "{{user `gce_project_id`}}",
+      "source_image": "{{user `gce_source_image`}}",
+      "zone": "{{user `gce_zone`}}",
+      "disk_type": "pd-ssd",
+      "disk_size": "80",
+      "machine_type": "n1-highcpu-8",
+      "image_name": "automate-infranode-{{user `node-name`}}-{{timestamp}}",
+      "communicator": "winrm",
+      "winrm_port": 5985,
+      "winrm_username": "{{user `winrm_username`}}",
+      "winrm_password": "{{user `winrm_password`}}",
+      "metadata": {
+        "windows-startup-script-url": "gs://wombat-bootstrap/win-bootstrap.ps1"
+      }
+    }
+  ],
+
+  "provisioners" : [
+    {
+      "type": "file",
+      "source": "{{pwd}}/keys/",
+      "destination": "C:\\Windows\\Temp"
+    },
+    {
+      "type": "file",
+      "source": "{{template_dir}}/files/",
+      "destination": "C:\\Windows\\Temp"
+    },
+    {
+      "type": "chef-solo",
+      "install_command": "powershell.exe -Command \". { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -channel {{user `chef_channel`}} -version {{user `chef_ver`}}\"",
+      "guest_os_type": "windows",
+      "cookbook_paths": [ "{{pwd}}/vendored-cookbooks/infranodes" ],
+      "run_list": [ "infranodes", "wombat::etc-hosts" ],
+      "json": {
+        "demo": {
+          "admin-user": "{{user `ssh_username`}}",
+          "build-nodes": "{{user `build-nodes`}}",
+          "domain_prefix": "{{user `domain_prefix`}}",
+          "domain": "{{user `domain`}}",
+          "enterprise": "{{user `enterprise`}}",
+          "node-name": "{{user `node-name`}}",
+          "org": "{{user `org`}}",
+          "versions": {
+              "chef": "{{user `chef_channel`}}-{{user `chef_ver`}}"
+          }
+        }
+      }
+    }
+  ]
+}

data/packer/infranodes.json

@@ -23,6 +23,7 @@
     "enterprise": "mammals",
     "node-name": "acceptance",
     "org": "marsupials",
+    "ssh_username": "ubuntu",
     "workstations": "1"
   },
 
@@ -32,11 +33,10 @@
       "secret_key": "{{user `aws_secret_key`}}",
       "region": "{{user `aws_region`}}",
       "source_ami": "{{user `aws_source_ami`}}",
-      "instance_type": "c3.xlarge",
+      "instance_type": "t2.medium",
       "communicator": "ssh",
       "associate_public_ip_address": true,
-      "ssh_private_ip": false,
-      "ssh_username": "ubuntu",
+      "ssh_username": "{{user `ssh_username`}}",
       "ssh_pty" : true,
       "ami_name": "automate-infranode-{{user `node-name`}}-{{timestamp}}"
     },
@@ -68,7 +68,7 @@
       "image_name": "automate-infranode-{{user `node-name`}}-{{timestamp}}",
       "machine_type": "n1-standard-2",
       "image_name": "chef-{{timestamp}}",
-      "ssh_username": "ubuntu",
+      "ssh_username": "{{user `ssh_username`}}",
       "ssh_pty" : true
     }
   ],
@@ -88,9 +88,10 @@
       "type": "chef-solo",
       "install_command": "{{user `chef_install_url`}} | sudo bash -s -- -c {{user `chef_channel`}} -v {{user `chef_ver`}}",
       "cookbook_paths": [ "{{pwd}}/vendored-cookbooks/infranodes" ],
-      "run_list": [ "infranodes" ],
+      "run_list": [ "infranodes", "wombat::authorized-keys", "wombat::etc-hosts" ],
       "json": {
         "demo": {
+          "admin-user": "{{user `ssh_username`}}",
           "domain_prefix": "{{user `domain_prefix`}}",
           "domain": "{{user `domain`}}",
           "enterprise": "{{user `enterprise`}}",

data/packer/workstation.json

@@ -20,6 +20,7 @@
     "domain": "animals.biz",
     "enterprise": "mammals",
     "org": "marsupials",
+    "ssh_username": "ubuntu",
     "winrm_password": "RL9@T40BTmXh",
     "winrm_username": "Administrator",
     "workstation-number": "1",
@@ -32,10 +33,9 @@
       "secret_key": "{{user `aws_secret_key`}}",
       "region": "{{user `aws_region`}}",
       "source_ami": "{{user `aws_source_ami`}}",
-      "instance_type": "m3.large",
+      "instance_type": "m4.large",
       "communicator": "winrm",
       "associate_public_ip_address": true,
-      "ssh_private_ip": false,
       "winrm_port": 5985,
       "winrm_username": "{{user `winrm_username`}}",
       "winrm_password": "{{user `winrm_password`}}",
@@ -57,7 +57,7 @@
       "winrm_username": "{{user `winrm_username`}}",
       "winrm_password": "{{user `winrm_password`}}",
       "metadata": {
-        "windows-startup-script-ps1": "gs://wombat-bootstrap/win-bootstrap.ps1"
+        "windows-startup-script-url": "gs://wombat-bootstrap/win-bootstrap.ps1"
       }
     }
   ],
@@ -78,9 +78,10 @@
       "install_command": "powershell.exe -Command \". { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -channel {{user `chef_channel`}} -version {{user `chef_ver`}}\"",
       "guest_os_type": "windows",
       "cookbook_paths": [ "{{pwd}}/vendored-cookbooks/workstation" ],
-      "run_list": [ "workstation" ],
+      "run_list": [ "workstation", "wombat::etc-hosts" ],
       "json": {
         "demo": {
+          "admin-user": "{{user `ssh_username`}}",
           "domain_prefix": "{{user `domain_prefix`}}",
           "domain": "{{user `domain`}}",
           "enterprise": "{{user `enterprise`}}",

data/templates/bootstrap-aws.erb

@@ -17,7 +17,7 @@ write-host "(host) setting up WinRM"
 cmd.exe /c winrm quickconfig -q
 cmd.exe /c winrm quickconfig '-transport:http'
 cmd.exe /c winrm set "winrm/config" '@{MaxTimeoutms="1800000"}'
-cmd.exe /c winrm set "winrm/config/winrs" '@{MaxMemoryPerShellMB="512"}'
+cmd.exe /c winrm set "winrm/config/winrs" '@{MaxMemoryPerShellMB="3072"}'
 cmd.exe /c winrm set "winrm/config/service" '@{AllowUnencrypted="true"}'
 cmd.exe /c winrm set "winrm/config/client" '@{AllowUnencrypted="true"}'
 cmd.exe /c winrm set "winrm/config/service/auth" '@{Basic="true"}'
@@ -31,6 +31,6 @@ cmd.exe /c sc config winrm start= auto
 cmd.exe /c net start winrm
 cmd.exe /c wmic useraccount where "name='Administrator'" set PasswordExpires=FALSE
 
-Set-ExecutionPolicy Unrestricted
+set-executionpolicy -executionpolicy bypass -force
 
 </powershell>

data/templates/cfn.json.erb

@@ -44,11 +44,6 @@
       "Default": "<%= @chef_server_ami %>",
       "Description": "AMI ID for the Chef Server"
     },
-    "AutomateAMI": {
-      "Type": "String",
-      "Default": "<%= @automate_ami %>",
-      "Description": "AMI ID for the Automate Server"
-    },
     "ComplianceAMI": {
       "Type": "String",
       "Default": "<%= @compliance_ami %>",
@@ -73,8 +68,13 @@
       "Type": "String",
       "Default": "<%= @workstation_ami[i] %>",
       "Description": "AMI ID for the Windows Workstation"
-    }
+    },
 <% end -%>
+    "AutomateAMI": {
+      "Type": "String",
+      "Default": "<%= @automate_ami %>",
+      "Description": "AMI ID for the Automate Server"
+    }
   },
   "Resources": {
     "VPC": {
@@ -645,17 +645,18 @@
       }
     }
   },
-  "Outputs": {
-<% 1.upto(@workstations) do |i| -%>
-    "WindowsWorkstation<%= i.to_s %>PubDNS": {
-      "Description": "Public IP address of the Windows Workstation",
-      "Value": {
-        "Fn::GetAtt": [
-          "WindowsWorkstation<%= i.to_s %>",
+  "Outputs":
+<% workstations_hash = {} -%>
+<% 1.upto(@workstations) do |i|
+    workstations_hash["WindowsWorkstation#{i.to_s}PubDNS"] = {
+      "Description" => "Public IP address of the Windows Workstation",
+      "Value" => {
+        "Fn::GetAtt" => [
+          "WindowsWorkstation#{i.to_s}",
           "PublicIp"
           ]
       }
     }
-<% end -%>
-  }
+  end -%>
+<%=  workstations_hash.to_json %>
 }

data/wombat.example.yml

@@ -3,48 +3,58 @@ name: wombat
 # Uncomment domain_prefix if you wish to prepend your generated domain.
 # Ex: The below example would create foo-chef.animals.biz.
 # domain_prefix: foo-
-certs: ['automate', 'chef', 'compliance']
 domain: animals.biz
 enterprise: mammals
 org: marsupials
-build-nodes: '1'
-workstations: '1'
-workstation-passwd: 'RL9@T40BTmXh'
-infranodes:
-  # Add a list of infrastructure nodes here with their associated run list to have these nodes precreated on the Chef Server
-  # Note: the cookbook content won't be automatically uploaded, only the node object will be created with the run list added,
-  #       if the content doesn't exist at the first checkin the chef-client run will fail.
-  # acceptance:
-  #   environment: web-acceptance
-  #   run_list:
-  #     - recipe[bacon::chewy]
-  # delivered:
-  #   environment: web-delivered
-  #   run_list:
-  #     - recipe[bacon::crispy]
-version: 0.1.0
+certs: ['automate', 'chef', 'compliance']
 ttl: 6
-# Uncomment conf and subkeys to override the listed defaults.
-# These paths are relative to the directory of this file.
-# conf:
-#   key_dir: 'keys'
-#   cookbook_dir: 'cookbooks'
-#   packer_dir: 'packer'
-#   templates_dir: 'templates'
-#   log_dir: 'logs'
+linux: ubuntu
+# Must meet the minimum Microsoft Complexity Requirements
+# https://technet.microsoft.com/en-us/library/hh994562(v=ws.11).aspx)
+version: 0.2.1
 products:
-  chef: stable-12.13.37
-  chef-server: stable-12.8.0
-  chefdk: stable-0.17.17
-  compliance: stable-1.3.1
-  automate: stable-0.5.125
+  chef: stable-latest
+  chef-server: stable-latest
+  chefdk: stable-latest
+  compliance: stable-latest
+  automate: stable-latest
+  push-jobs-server: stable-latest
+  manage: stable-latest
+build-nodes:
+  count: 3
+workstations:
+  platform: windows
+  password: 'ZL9@T40BTmXhZ'
+  count: 1
+infranodes:
+# Add a list of infrastructure nodes here with their associated run list to have these nodes precreated on the Chef Server
+# Note: the cookbook content won't be automatically uploaded, only the node object will be created with the run list added,
+#       if the content doesn't exist at the first checkin the chef-client run will fail.
+# acceptance:
+# platform: windows
+#   environment: web-acceptance
+#   run_list:
+#     - recipe[bacon::chewy]
+# delivered:
+#   environment: web-delivered
+#   run_list:
+#     - recipe[bacon::crispy]
+conf:
+  key_dir: 'keys'
+  cookbook_dir: 'cookbooks'
+  packer_dir: 'packer'
+  templates_dir: 'templates'
+  log_dir: 'logs'
+  stack_dir: 'stacks'
+  audio: false
 aws:
-  region: ap-southeast-2
-  az: ap-southeast-2c
-  keypair: keypair-ap-southeast-2
+  az: us-east-1e
+  keypair: keypair-us-east
+  region: us-east-1
   source_ami:
-    ubuntu: ami-8c4cb0ec
-    windows: ami-87c037e7
+    ubuntu: ami-8e0b9499
+    windows: ami-bd3ba0aa
+    centos: ami-6d1c2007
 gce:
   zone: us-east1-b
   source_image:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wombat-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andre Elizondo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -163,7 +163,7 @@ files:
 - cookbooks/chef_server/README.md
 - cookbooks/chef_server/chefignore
 - cookbooks/chef_server/metadata.rb
-- cookbooks/chef_server/recipes/cheffish.rb
+- cookbooks/chef_server/recipes/bootstrap_users.rb
 - cookbooks/chef_server/recipes/default.rb
 - cookbooks/chef_server/test/fixtures/cookbooks/mock_data/files/automate.crt
 - cookbooks/chef_server/test/fixtures/cookbooks/mock_data/files/automate.key
@@ -283,19 +283,10 @@ files:
 - packer/chef-server.json
 - packer/compliance.json
 - packer/files/.gitkeep
+- packer/infranodes-windows.json
 - packer/infranodes.json
-- packer/mock-data/.gitignore
-- packer/mock-data/.kitchen.yml
-- packer/mock-data/Berksfile
-- packer/mock-data/README.md
-- packer/mock-data/chefignore
-- packer/mock-data/metadata.rb
-- packer/mock-data/recipes/default.rb
-- packer/mock-data/spec/spec_helper.rb
-- packer/mock-data/spec/unit/recipes/default_spec.rb
-- packer/mock-data/test/integration/default/serverspec/default_spec.rb
-- packer/mock-data/test/integration/helpers/serverspec/spec_helper.rb
 - packer/workstation.json
+- stacks/.gitkeep
 - templates/bootstrap-aws.erb
 - templates/cfn.json.erb
 - terraform/README.md
@@ -328,4 +319,3 @@ signing_key:
 specification_version: 4
 summary: Make Chef demos delightful with Wombat
 test_files: []
-has_rdoc: 

data/packer/mock-data/.gitignore

@@ -1,16 +0,0 @@
-.vagrant
-Berksfile.lock
-*~
-*#
-.#*
-\#*#
-.*.sw[a-z]
-*.un~
-
-# Bundler
-Gemfile.lock
-bin/*
-.bundle/*
-
-.kitchen/
-.kitchen.local.yml

data/packer/mock-data/.kitchen.yml

@@ -1,21 +0,0 @@
----
-driver:
-  name: vagrant
-
-provisioner:
-  name: chef_zero
-
-# Uncomment the following verifier to leverage Inspec instead of Busser (the
-# default verifier)
-# verifier:
-#   name: inspec
-
-platforms:
-  - name: ubuntu-14.04
-  - name: centos-7.1
-
-suites:
-  - name: default
-    run_list:
-      - recipe[mock-data::default]
-    attributes:

data/packer/mock-data/Berksfile

@@ -1,3 +0,0 @@
-source 'https://supermarket.chef.io'
-
-metadata

data/packer/mock-data/README.md

@@ -1,4 +0,0 @@
-# mock-data
-
-TODO: Enter the cookbook description here.
-