chef-provisioning-vsphere 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db6d5c3d59108b03b2a029d28ea964177b662d3f
-  data.tar.gz: 002c4faa621c11d98ac61aa0520cf01beda33f5e
+  metadata.gz: 8c7843e76054d8e24c2877c39e7ea977b058ad3d
+  data.tar.gz: c680975fe63a934184a35689cbf34edb20c089b0
 SHA512:
-  metadata.gz: 19483a0d6ce2f112ddaa71021f01bb5e6bb01079d7ca48e060201fe167666e004b4476154d07b709be62fb02ad6e76ec0c0730c35566e4b7fa7d23ddc40c69fd
-  data.tar.gz: bd2984e7b7daf67e1acf20d03969346cb949c423566adce6a45bf70f663da1d5aa14591b166b0846fa7e59bef2ea1a0667e28f0bc3a65430b44992c08e840d49
+  metadata.gz: 6f0319194b827e97857e621f2ab692124bc6054222055035425909e06c09054e4c3bb9c572f6754a13467b42d5c6d289ec998a2acc1f18dd05f260d172de1ab6
+  data.tar.gz: 518ceec81e5a94b73b239aa89563b153c9a064baa98f3e8a752973a97e1bd13c086d91e7b34ab65e7b7acff964c75b28ae2a4bc74772fef59f941aaa952814f3

data/.rubocop.yml

@@ -3,6 +3,8 @@ AllCops:
     - "spec/**/*"
     - "vendor/**/*"
     - "pkg/**/*"
+    - "vsphere_testing/**/*"
+    - "examples/**/*"
     - "spec/unit/plugins/darwin/system_profiler_output.rb"
 
 inherit_from: .rubocop_todo.yml

data/CHANGELOG.md

@@ -1,7 +1,23 @@
 # Change Log
 
-## [2.0.5](https://github.com/chef-partners/chef-provisioning-vsphere/tree/2.0.5) (2017-06-06)
-[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.0.4...2.0.5)
+## [2.0.5](https://github.com/chef-partners/chef-provisioning-vsphere/tree/2.0.5) (2017-07-24)
+[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.0.5...2.0.5)
+
+**Closed issues:**
+
+- Error: ArgumentError: wrong number of arguments \(given 0, expected 1..2\) When provisioning  [\#51](https://github.com/chef-partners/chef-provisioning-vsphere/issues/51)
+- action :destroy doesn't work, OR nodes/MACHINE.json not being written out. [\#43](https://github.com/chef-partners/chef-provisioning-vsphere/issues/43)
+- Failing to test WinRM availability when creating vm [\#35](https://github.com/chef-partners/chef-provisioning-vsphere/issues/35)
+
+**Merged pull requests:**
+
+- moving to development depenadcy [\#54](https://github.com/chef-partners/chef-provisioning-vsphere/pull/54) ([jjasghar](https://github.com/jjasghar))
+- Adding github pull request setup [\#48](https://github.com/chef-partners/chef-provisioning-vsphere/pull/48) ([jjasghar](https://github.com/jjasghar))
+- Jenkinsfile for Jenkins BlueOcean [\#46](https://github.com/chef-partners/chef-provisioning-vsphere/pull/46) ([jjasghar](https://github.com/jjasghar))
+- Initial examples directory [\#45](https://github.com/chef-partners/chef-provisioning-vsphere/pull/45) ([jjasghar](https://github.com/jjasghar))
+
+## [v2.0.5](https://github.com/chef-partners/chef-provisioning-vsphere/tree/v2.0.5) (2017-06-06)
+[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.0.4...v2.0.5)
 
 **Closed issues:**
 

data/Jenkinsfile

@@ -0,0 +1,82 @@
+pipeline {
+    agent {
+        docker {
+            args "-u root"
+                reuseNode false
+                image "localhost:5000/jjkeysv5"
+                }
+    }
+    triggers {
+        pollSCM('H * * * *')
+    }
+  stages {
+    stage('Pull down ChefDK') {
+      steps {
+        sh '''apt-get update
+apt-get install -y curl sudo git build-essential
+curl -L https://chef.io/chef/install.sh | sudo bash -s -- -P chefdk -c current
+if [ -d "vsphere_testing" ]; then rm -rf vsphere_testing; fi'''
+      }
+    }
+    stage('Bundle') {
+      steps {
+        sh 'chef exec bundle install'
+      }
+    }
+    stage('Checks') {
+      steps {
+        parallel(
+          "Unit": {
+            sh 'chef exec rake unit'
+
+          },
+          "Docs": {
+            sh 'chef exec rake yard'
+
+          }
+        )
+      }
+    }
+    stage('Kitchen setup') {
+      steps {
+        sh '''if [ -d "vsphere_testing" ]; then rm -rf vsphere_testing; fi
+git clone https://github.com/jjasghar/vsphere_testing.git
+cd vsphere_testing
+for i in recipes/*; do sed -i 's/PASSWORD/Good4bye!/g' "$i"; done
+sed -i 's/PASSWORD/Good4bye!/g' .kitchen.yml
+sed -i 's/ORG/jj-model-t/g' recipes/windows_provision.rb
+chef exec bundle install
+chef exec gem install test-kitchen
+chef exec bundle exec kitchen list'''
+      }
+    }
+    stage('Kitchen verify') {
+      steps {
+        sh '''cd vsphere_testing
+chef exec bundle exec kitchen test -c 2'''
+      }
+    }
+    stage('chef-provisioning-vsphere create') {
+        steps {
+            parallel(
+                     "Linux": {
+                         sh  '''cd vsphere_testing
+chef exec bundle exec chef-client -z recipes/linux_provision.rb'''
+                             },
+                     "Windows": {
+                         sh '''cd vsphere_testing
+chef exec bundle exec chef-client -z recipes/windows_provision.rb'''
+                             }
+                     )
+                }
+    }
+    stage('chef-provisioning-vsphere delete') {
+      steps {
+        sh '''cd vsphere_testing
+chef exec bundle exec chef-client -z recipes/destroy.rb
+chef exec knife node delete testing-windows -y
+chef exec knife client delete testing-windows -y'''
+      }
+    }
+  }
+}

data/README.md

@@ -350,5 +350,7 @@ You can run then `kitchen diagnose` to verify the nodes and settings that will b
 
 We have attempted to `TODO` markings. If you find one, whether it's documentation or a feature, it's a great place to start helping out. `$ grep -r "TODO" lib/`
 
+We also have a Jenkinsfile with the complete testing suite for this repo. Please don't hesitate to pull it down and verify the changes locally with the complete integration tests that are required.
+
 [gem]: https://rubygems.org/gems/chef-provisioning-vsphere
 [travis]: https://travis-ci.org/chef-partners/chef-provisioning-vsphere

data/Rakefile

@@ -2,7 +2,6 @@
 require "bundler/gem_tasks"
 require "chef/provisioning/vsphere_driver/version"
 require "rspec/core/rake_task"
-require "chefstyle"
 require "rubocop/rake_task"
 require "yard"
 

data/chef-provisioning-vsphere.gemspec

@@ -19,19 +19,19 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files -z`.split("\x0")
   s.test_files   = s.files.grep(%r{^(test|spec|features)/})
 
-  s.add_dependency "rbvmomi", "~> 1.10"
+  s.add_dependency "chef", ">= 12.0", "< 14.0"
   s.add_dependency "chef-provisioning", "~> 2.0"
-  s.add_dependency "github_changelog_generator"
   s.add_dependency "cheffish", ">= 4.0", "< 14.0"
-  s.add_dependency "chef", ">= 12.0", "< 14.0"
+  s.add_dependency "rbvmomi", "~> 1.10"
 
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rake"
   s.add_development_dependency "chefstyle"
+  s.add_development_dependency "github_changelog_generator"
   s.add_development_dependency "pry"
   s.add_development_dependency "pry-byebug"
   s.add_development_dependency "pry-stack_explorer"
+  s.add_development_dependency "rake"
   s.add_development_dependency "rb-readline"
+  s.add_development_dependency "rspec"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "yard"
 end

data/examples/ubuntu-kitchen.yml

@@ -0,0 +1,45 @@
+---
+driver:
+  name: vsphere
+  driver_options:
+    host: '172.16.20.2'
+    user: 'administrator@vsphere.local'
+    password: 'PASSWORD'
+    insecure: true
+  machine_options:
+    start_timeout: 600
+    create_timeout: 600
+    ready_timeout: 90
+    bootstrap_options:
+      use_linked_clone: true
+      datacenter: 'Datacenter'
+      template_name: 'ubuntu16'
+      template_folder: 'Linux'
+      resource_pool: 'Cluster'
+      num_cpus: 2
+      memory_mb: 4096
+      ssh:
+        user: ubuntu
+        paranoid: false
+        password: PASSWORD
+        port: 22
+
+provisioner:
+  name: chef_zero
+  sudo_command: sudo
+
+verifier:
+  name: inspec
+
+transport:
+  username: "admini"
+  password: admini
+
+platforms:
+  - name: ubuntu-16.04
+
+suites:
+  - name: default
+    run_list:
+      - recipe[vsphere_demo::default]
+    attributes:

data/examples/ubuntu-provision.rb

@@ -0,0 +1,35 @@
+require 'chef/provisioning'
+require 'chef/provisioning/vsphere_driver'
+
+#
+# This is the main way to connect to vSphere
+#
+with_vsphere_driver host: '172.16.20.2',
+  insecure: true,
+  user:     'administrator@vsphere.local',
+  password: 'PASSWORD'
+
+#
+# These are the machine_options that you need to declare
+#
+with_machine_options :bootstrap_options => {
+                               num_cpus: 2,
+                               memory_mb: 4096,
+                               datacenter: 'Datacenter',
+                               resource_pool: 'Cluster',
+                               template_folder: 'Linux',
+                               template_name: 'ubuntu16',
+                               :ssh => {
+                                 :user => 'admini',
+                                 :password => 'PASSWORD',
+                                 :paranoid => false,
+                               }
+                             },
+                :sudo => true
+
+#
+# This is where you can declare the machine
+#
+machine "testing-ubuntu" do
+  tag "haha"
+end

data/examples/win-provision.rb

@@ -0,0 +1,47 @@
+require 'chef/provisioning'
+require 'chef/provisioning/vsphere_driver'
+
+
+#
+# This is the main way to connect to vSphere
+#
+with_vsphere_driver host: '172.16.20.2',
+  insecure: true,
+  user:     'administrator@vsphere.local',
+  password: 'PASSWORD'
+
+#
+# These are the machine_options that you need to declare
+#
+win_bootstrap_options = { :bootstrap_options => {
+                            num_cpus: 2,
+                            memory_mb: 8096,
+                            datacenter: 'Datacenter',
+                            resource_pool: 'Cluster',
+                            template_folder: 'Windows',
+                            template_name: 'windows2012R2',
+                            :ssh => {
+                              :user => 'Administrator',
+                              :password => 'P@ssw0rd!!!',
+                              :paranoid => false,
+                              :port => "5985"
+                            }
+                          },
+                          ssh_options: { :keepalive => true, :keepalive_interval => 50, :user_known_hosts_file => '/dev/null' },
+                          ready_timeout: '30'
+                        }
+
+#
+# WinRM requires a Chef server (not sure why) so you need to declare it here
+#
+with_chef_server "https://api.chef.io/organizations/ORG",
+                 :client_name => Chef::Config[:node_name],
+                 :signing_key_filename => Chef::Config[:client_key]
+
+#
+# This is where you can declare the machine
+#
+machine "testing-windows" do
+  machine_options win_bootstrap_options
+  tag "haha"
+end

data/examples/win-ubuntu-kitchen.yml

@@ -0,0 +1,63 @@
+---
+driver:
+  name: vsphere
+  driver_options:
+    host: '172.16.20.2'
+    user: 'administrator@vsphere.local'
+    password: 'PASSWORD'
+    insecure: true
+  machine_options:
+    start_timeout: 600
+    create_timeout: 600
+    ready_timeout: 90
+    bootstrap_options:
+      use_linked_clone: true
+      datacenter: 'Datacenter'
+      template_name: 'ubuntu16'
+      template_folder: 'Linux'
+      resource_pool: 'Cluster'
+      num_cpus: 2
+      memory_mb: 4096
+      ssh:
+        user: ubuntu
+        paranoid: false
+        password: 'PASSWORD'
+        port: 22
+
+provisioner:
+  name: chef_zero
+  sudo_command: sudo
+
+verifier:
+  name: inspec
+
+transport:
+  username: "ubuntu"
+  password: 'PASSWORD'
+
+platforms:
+  - name: ubuntu-16.04
+  - name: windows
+    driver:
+      machine_options:
+        start_timeout: 600
+        create_timeout: 600
+        ready_timeout: 90
+        bootstrap_options:
+          use_linked_clone: true
+          datacenter: 'Datacenter'
+          template_name: 'windows2012R2'
+          template_folder: 'Windows'
+          resource_pool: 'Cluster'
+          num_cpus: 2
+          memory_mb: 8096
+          ssh:
+            user: "administrator"
+            paranoid: false
+            password: "P@ssw0rd!!!!"
+            port: 5985
+
+suites:
+- name: default
+  run_list:
+  - recipe[my_cookbook::default]

data/lib/chef/provisioning/vsphere_driver/version.rb

@@ -2,5 +2,5 @@
 # Provisions machines in vSphere.
 module ChefProvisioningVsphere
   # The version of this awesome Gem. BOOM.
-  VERSION = "2.0.5".freeze
+  VERSION = "2.0.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - CenturyLink Cloud
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rbvmomi
+  name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '12.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '12.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: chef-provisioning
   requirement: !ruby/object:Gem::Requirement
@@ -39,20 +45,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: cheffish
   requirement: !ruby/object:Gem::Requirement
@@ -74,27 +66,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '14.0'
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '12.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: chefstyle
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
-    - - "<"
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,7 +122,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chefstyle
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,7 +136,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,7 +150,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,7 +164,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
+  name: rb-readline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -178,7 +178,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-readline
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -234,12 +234,17 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Jenkinsfile
 - LICENSE
 - LICENSE-Rally
 - README.md
 - Rakefile
 - chef-provisioning-vsphere.gemspec
 - contribution-notice
+- examples/ubuntu-kitchen.yml
+- examples/ubuntu-provision.rb
+- examples/win-provision.rb
+- examples/win-ubuntu-kitchen.yml
 - lib/chef/provisioning/driver_init/vsphere.rb
 - lib/chef/provisioning/vsphere_driver.rb
 - lib/chef/provisioning/vsphere_driver/clone_spec_builder.rb