elevage 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c2d9f567bd44e3a933c726450c349d5e2934f9d
-  data.tar.gz: 15373183e1e134e0494073b28d9ee23ec2a7d443
+  metadata.gz: 514c5dc7d1fb4db21af17572c2c32e7539f4d1cb
+  data.tar.gz: 1eb5b0f8cbf909f9433c540ae346f3f5721d34e4
 SHA512:
-  metadata.gz: 8a69e7cc605360c1012b64a909cb94695e71437809be67e8ddb4b60db2810588d13ea439bf79fc1110fd2f38c604c8bcc39956094745ffef82b162e6e749f448
-  data.tar.gz: f31e5eb225111343c722b99ff0f79515c9c7b5ad2b29cc3a787530f4408508f325597666209bc9a6b76e64e1127160fafd138ae611e0ee829b72a47b1bc9fd13
+  metadata.gz: 918a6904ec87bd8bc15220803f10a578dd887fa7ef082664d22fee58bf360d1d12dc8d765a68d01619feb875ddb6967ad13ef49ed718c11dfe893ed862339909
+  data.tar.gz: b52f136162f81e76e00bb617206c1e6a3e84151c273aa304f37f1d005adb43ef3465281e4f8df1fcbdab5885a5ccd2b92093cf2c4faea87b2d63b32688f0750c

data/README.md

@@ -73,6 +73,17 @@ Generate a new environment file.  Comments within the template files describe ne
 $ elevage generate <environment name>
 ```
 
+Windows nodes require the `ostype` parameter under `pools` to equal `'windows'`.  This was required so that only the vm name is paseed in instead of the FQDN.
+
+```YAML
+pools:
+  vmdefaults: &vmdefaults
+    count:
+    tier:
+    image:
+    ostype: 'windows'
+```
+
 Provision nodes from platform and environment definition
 
 ```bash

data/features/archive

@@ -29,6 +29,7 @@
           count: 2
           tier: Web
           image: 'aw-nonprod-oel6_20130815'
+          ostype: 'linux'
           compute: nonprodweb
 
         appvmdefaults: &appvmdefaults

data/features/build.feature

@@ -34,6 +34,7 @@ Feature: Provisioning platform vm's
           count: 2
           tier: Web
           image: 'centos-6.5-x86_64-20140714'
+          ostype: 'linux'
           compute: nonprodweb
           port: 80
           runlist:

data/features/generate.feature

@@ -33,6 +33,7 @@ Feature: GENERATE new environment yml file
           count: 2
           tier: Web
           image: 'centos-6.5-x86_64-20140714'
+          ostype: 'linux'
           compute: nonprodweb
           port: 80
           runlist:

data/features/health_env_failure.feature

@@ -34,6 +34,7 @@ Feature: HEALTH check of erroneous environment-only definition file items
           count: 2
           tier: Web
           image: 'centos-6.5-x86_64-20140714'
+          ostype: 'linux'
           compute: nonprodweb
           port: 80
           runlist:

data/features/health_failure.feature

@@ -33,6 +33,7 @@ Feature: HEALTH check of erroneous platform definition file items
           count: 2
           tier: Web
           image: 'centos-6.5-x86_64-20140714'
+          ostype: 'linux'
           compute: nonprodweb
           port: 80
           runlist:

data/features/health_success.feature

@@ -33,6 +33,7 @@ Feature: HEALTH check of correct platform definition file items
           count: 2
           tier: Web
           image: 'centos-6.5-x86_64-20140714'
+          ostype: 'linux'
           compute: nonprodweb
           port: 80
           runlist:

data/features/list.feature

@@ -33,6 +33,7 @@ Feature: LIST platform definition file items
           count: 2
           tier: Web
           image: 'centos-6.5-x86_64-20140714'
+          ostype: 'linux'
           compute: nonprodweb
           port: 80
           runlist:
@@ -269,11 +270,11 @@ Feature: LIST platform definition file items
 
     When I run `elevage list pools`
     Then the exit status should be 0
-    And the output should contain "appvmdefaults:\n  count: 2\n  tier: App\n  image: centos-6.5-x86_64-20140714\n  compute: nonprodapp\n  port: 80"
+    And the output should contain "appvmdefaults:\n  count: 2\n  tier: App\n  image: centos-6.5-x86_64-20140714\n  ostype: linux\n  compute: nonprodapp\n  port: 80"
 
     When I run `elevage list components`
     Then the exit status should be 0
-    And the output should contain "terracotta:\n  count: 2\n  tier: Web\n  image: centos32g-6.5-x86_64-20140714\n  compute: nonprodtc\n  port: 80"
+    And the output should contain "terracotta:\n  count: 2\n  tier: Web\n  image: centos32g-6.5-x86_64-20140714\n  ostype: linux\n  compute: nonprodtc\n  port: 80"
 
     When I run `elevage list vcenter`
     Then the exit status should be 0

data/features/new.feature

@@ -65,4 +65,4 @@ Feature: creating NEW platform definition files
 #    And the file "app_definition/infrastructure/compute.yml" should contain:
 #    """
 #    compute:
-#    """
+#    """

data/lib/elevage/provisioner.rb

@@ -5,7 +5,7 @@ require_relative 'platform'
 require_relative 'provisionerrunqueue'
 
 module Elevage
-  # rubocop:disable ClassLength
+  # rubocop:disable ClassLength, CyclomaticComplexity
 
   # Provisioner is responsible for the actual execution of the commands to
   # create the requested virtual machine.
@@ -44,7 +44,7 @@ module Elevage
       puts @environment.to_yaml
     end
 
-    # rubocop:disable MethodLength, CyclomaticComplexity
+    # rubocop:disable MethodLength
 
     # Build the the virtual machine
     def build
@@ -99,7 +99,7 @@ module Elevage
       # exit status is a failure, and the details will be in the logfile
       status.exitstatus == 0 ? true : false
     end
-    # rubocop:enable MethodLength, CyclomaticComplexity
+    # rubocop:enable MethodLength
 
     private
 
@@ -151,7 +151,7 @@ module Elevage
       knife_cmd << " --dest-folder '#{@vcenter['destfolder']}"
       knife_cmd << "/#{@component['tier']}" if @vcenter['appendtier']
       knife_cmd << '\''
-      knife_cmd << " --resource-pool '#{@vcenter['resourcepool']}'"
+      knife_cmd << " --resource-pool '#{@vcenter['resourcepool']}'" if vcenter['resourcepool']
       knife_cmd << " --datastore '#{select_datastore}'"
 
       # VM Hardware
@@ -201,12 +201,12 @@ module Elevage
 
       # Finally, the name of the VM as seen by vSphere.
       # Whereas nodename will optionally append the domain name, VM names
-      # should *always* have the domain name appended.
+      # should *always* have the domain name appended - UNLESS it's windows
       vmname = String.new(@name)
-      vmname << @vcenter['domain']
+      vmname << @vcenter['domain'] if @component['ostype'] != 'windows'
       knife_cmd << " #{vmname}"
     end
     # rubocop:enable MethodLength, LineLength
   end
-  # rubocop:enable ClassLength
+  # rubocop:enable ClassLength, CyclomaticComplexity
 end

data/lib/elevage/templates/platform.yml.tt

@@ -80,6 +80,7 @@ platform:
       count:
       tier:
       image:
+      ostype:
       compute:
       port:
       runlist:
@@ -107,4 +108,4 @@ platform:
   components:
 
     component:
-      <<: *vmdefaults
+      <<: *vmdefaults

data/lib/elevage/version.rb

@@ -1,4 +1,4 @@
 # simple gem version number tracking
 module Elevage
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elevage
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nic Cheneweth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler