wombat-cli 0.4.1 → 0.4.2

data/generator_files/wombat.yml

@@ -1,71 +1,71 @@
----
-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-
-domain: animals.biz
-enterprise: mammals
-org: marsupials
-certs: ['automate', 'chef', 'compliance']
-ttl: 6
-linux: ubuntu
-version: 0.2.1
-owner:
-products:
-  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: 1
-workstations:
-  platform: windows
-  # Must meet the minimum Microsoft Complexity Requirements
-  # https://technet.microsoft.com/en-us/library/hh994562(v=ws.11).aspx)
-  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'
-  template_dir: 'templates'
-  log_dir: 'logs'
-  stack_dir: 'stacks'
-  audio: false
-aws:
-  az: us-east-1e
-  keypair: keypair-us-east
-  region: us-east-1
-  # This optional key presumes these IAM roles are already created
-  # and are only applied to workstations currently
-  # iam_roles: ['iam_role', 'iam_roles_buddy']
-  source_image:
-    ubuntu: ami-8e0b9499
-    windows: ami-1c7ad77c
-    centos: ami-6d1c2007
-azure:
-  location: eastus
-  storage_account:
-gce:
-  zone: us-east1-b
-  project: wombat-gce
-  account_file: wombat-gce.json
-  source_image:
-    ubuntu: ubuntu-1404-trusty-v20160809a
-    windows: windows-server-2012-r2-dc-v20160809
+---
+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-
+domain: animals.biz
+enterprise: mammals
+org: marsupials
+certs: ['automate', 'chef', 'compliance']
+ttl: 6
+linux: ubuntu
+version: 0.2.1
+owner:
+products:
+  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: 1
+workstations:
+  platform: windows
+  # Must meet the minimum Microsoft Complexity Requirements
+  # https://technet.microsoft.com/en-us/library/hh994562(v=ws.11).aspx)
+  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'
+  template_dir: 'templates'
+  log_dir: 'logs'
+  stack_dir: 'stacks'
+  audio: false
+aws:
+  az: us-east-1e
+  keypair: keypair-us-east
+  region: us-east-1
+  # This optional key presumes these IAM roles are already created
+  # and are only applied to workstations currently
+  # iam_roles: ['iam_role', 'iam_roles_buddy']
+  source_image:
+    ubuntu: ami-8e0b9499
+    windows: ami-1c7ad77c
+    centos: ami-6d1c2007
+azure:
+  location: eastus
+  storage_account:
+gce:
+  zone: us-east1-b
+  project: wombat-gce
+  account_file: wombat-gce.json
+  source_image:
+    ubuntu: ubuntu-1404-trusty-v20160809a
+    windows: windows-server-2012-r2-dc-v20160809

data/lib/wombat/aws.rb

@@ -1,67 +1,67 @@
-require "wombat/common"
-require "aws-sdk"
-
-# http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Client.html#describe_images-instance_method
-# https://github.com/test-kitchen/kitchen-ec2/blob/aa8e7f2cf9bfbb10fa4057f3297c2a20dc079f7b/lib/kitchen/driver/aws/standard_platform.rb
-# https://github.com/test-kitchen/kitchen-ec2/blob/aa8e7f2cf9bfbb10fa4057f3297c2a20dc079f7b/lib/kitchen/driver/aws/standard_platform/ubuntu.rb
-
-module Wombat
-  module Aws
-    include Wombat::Common
-
-    def find_latest_amis
-      client = ::Aws::EC2::Client.new(:region => wombat["aws"]["region"])
-      # static list of images
-      desc_hash = {
-        "ubuntu-16.04" => ["ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-*", "099720109477"],
-        "ubuntu-14.04" => ["ubuntu/images/hvm-ssd/ubuntu-trusty-14.04-amd64-server-*", "099720109477"],
-        "centos-7" => ["CentOS Linux 7 x86_64 HVM EBS*", "679593333241"],
-        "windows-2012r2" => ["Windows_Server-2012-R2_RTM-English-64Bit-Base-*", "801119661308"]
-      }
-      desc_hash.each do |k, v|
-        resp = client.describe_images({
-          dry_run: false,
-          filters: [
-            {
-              name: "name",
-              values: [v[0]],
-            },
-            {
-              name: "owner-id",
-              values: [v[1]],
-            },
-          ],
-        })
-        images = sort_images(resp.images)
-
-        puts "#{k}: #{images[:image_id]}"
-
-      end
-    end
-
-    def prefer(images, &block)
-      # Put the matching ones *before* the non-matching ones.
-      matching, non_matching = images.partition(&block)
-      matching + non_matching
-    end
-
-    def sort_images(images)
-      # P5: We prefer more recent images over older ones
-      images = images.sort_by(&:creation_date).reverse
-      # P4: We prefer x86_64 over i386 (if available)
-      images = prefer(images) { |image| image.architecture == :x86_64 }
-      # P3: We prefer gp2 (SSD) (if available)
-      images = prefer(images) do |image|
-        image.block_device_mappings.any? do |b|
-          b.device_name == image.root_device_name && b.ebs && b.ebs.volume_type == "gp2"
-        end
-      end
-      # P2: We prefer ebs over instance_store (if available)
-      images = prefer(images) { |image| image.root_device_type == "ebs" }
-      # P1: We prefer hvm (the modern standard)
-      images = prefer(images) { |image| image.virtualization_type == "hvm" }
-      # Grab the image from the top of the stack
-      images.first
-    end
-  end
-end
+require "wombat/common"
+require "aws-sdk"
+
+# http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Client.html#describe_images-instance_method
+# https://github.com/test-kitchen/kitchen-ec2/blob/aa8e7f2cf9bfbb10fa4057f3297c2a20dc079f7b/lib/kitchen/driver/aws/standard_platform.rb
+# https://github.com/test-kitchen/kitchen-ec2/blob/aa8e7f2cf9bfbb10fa4057f3297c2a20dc079f7b/lib/kitchen/driver/aws/standard_platform/ubuntu.rb
+
+module Wombat
+  module Aws
+    include Wombat::Common
+
+    def find_latest_amis
+      client = ::Aws::EC2::Client.new(:region => wombat["aws"]["region"])
+      # static list of images
+      desc_hash = {
+        "ubuntu-16.04" => ["ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-*", "099720109477"],
+        "ubuntu-14.04" => ["ubuntu/images/hvm-ssd/ubuntu-trusty-14.04-amd64-server-*", "099720109477"],
+        "centos-7" => ["CentOS Linux 7 x86_64 HVM EBS*", "679593333241"],
+        "windows-2012r2" => ["Windows_Server-2012-R2_RTM-English-64Bit-Base-*", "801119661308"]
+      }
+      desc_hash.each do |k, v|
+        resp = client.describe_images({
+          dry_run: false,
+          filters: [
+            {
+              name: "name",
+              values: [v[0]],
+            },
+            {
+              name: "owner-id",
+              values: [v[1]],
+            },
+          ],
+        })
+        images = sort_images(resp.images)
+
+        puts "#{k}: #{images[:image_id]}"
+
+      end
+    end
+
+    def prefer(images, &block)
+      # Put the matching ones *before* the non-matching ones.
+      matching, non_matching = images.partition(&block)
+      matching + non_matching
+    end
+
+    def sort_images(images)
+      # P5: We prefer more recent images over older ones
+      images = images.sort_by(&:creation_date).reverse
+      # P4: We prefer x86_64 over i386 (if available)
+      images = prefer(images) { |image| image.architecture == :x86_64 }
+      # P3: We prefer gp2 (SSD) (if available)
+      images = prefer(images) do |image|
+        image.block_device_mappings.any? do |b|
+          b.device_name == image.root_device_name && b.ebs && b.ebs.volume_type == "gp2"
+        end
+      end
+      # P2: We prefer ebs over instance_store (if available)
+      images = prefer(images) { |image| image.root_device_type == "ebs" }
+      # P1: We prefer hvm (the modern standard)
+      images = prefer(images) { |image| image.virtualization_type == "hvm" }
+      # Grab the image from the top of the stack
+      images.first
+    end
+  end
+end