From ba51b80d1890884dca013d73188f53bfbc703240 Mon Sep 17 00:00:00 2001 From: Thom May Date: Thu, 28 Sep 2017 19:56:28 +0100 Subject: [PATCH] Revert "add kitchen-google, remove chef-provisioning-fog" --- Gemfile | 2 +- Gemfile.lock | 250 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 211 insertions(+), 41 deletions(-) diff --git a/Gemfile b/Gemfile index c6d2c4258..6dc58a069 100644 --- a/Gemfile +++ b/Gemfile @@ -42,6 +42,7 @@ group(:omnibus_package) do gem "chef-provisioning", ">= 2.4.0" gem "chef-provisioning-aws", ">= 2.0" gem "chef-provisioning-azure", ">= 0.6.0" + gem "chef-provisioning-fog", ">= 0.20.0" gem "chef-vault" gem "chef", "= 13.4.24" gem "cheffish", ">= 13.0" @@ -53,7 +54,6 @@ group(:omnibus_package) do gem "kitchen-hyperv" gem "kitchen-inspec" gem "kitchen-vagrant" - gem "kitchen-google", ">= 1.3.0" gem "knife-windows" gem "knife-opc", ">= 0.3.2" gem "ohai", ">= 13.1.0" diff --git a/Gemfile.lock b/Gemfile.lock index 8272b8729..2151a5c94 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,26 +17,34 @@ PATH GEM remote: https://rubygems.org/ specs: + CFPropertyList (2.3.5) + activesupport (4.2.9) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) app_conf (0.4.2) appbundler (0.10.0) mixlib-cli (~> 1.4) - mixlib-shellout (~> 2.0) artifactory (2.8.2) ast (2.3.0) - aws-sdk (2.10.54) - aws-sdk-resources (= 2.10.54) - aws-sdk-core (2.10.54) + autoparse (0.3.3) + addressable (>= 2.3.1) + extlib (>= 0.9.15) + multi_json (>= 1.0.0) + aws-sdk (2.10.52) + aws-sdk-resources (= 2.10.52) + aws-sdk-core (2.10.52) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.10.54) - aws-sdk-core (= 2.10.54) + aws-sdk-resources (2.10.52) + aws-sdk-core (= 2.10.52) aws-sdk-v1 (1.67.0) json (~> 1.4) nokogiri (~> 1) aws-sigv4 (1.0.2) - backports (3.8.0) berkshelf (6.3.1) buff-config (~> 2.0) buff-extensions (~> 2.0) @@ -169,6 +177,15 @@ GEM chef-provisioning-azure (0.6.0) chef-provisioning (>= 1.0, < 3.0) stuartpreston-azure-sdk-for-ruby (~> 0.7) + chef-provisioning-fog (0.21.0) + chef-provisioning (>= 1.0, < 3.0) + fog (>= 1.37.0) + fog-digitalocean + fog-scaleway + fog-softlayer (~> 1.1.0) + google-api-client (~> 0.8.0) + retryable + winrm-elevated chef-sugar (3.5.0) chef-vault (3.3.0) chef-zero (13.1.0) @@ -193,21 +210,16 @@ GEM mixlib-archive (~> 0.4) cookstyle (2.1.0) rubocop (= 0.49.1) - cucumber (3.0.0) + cucumber (2.4.0) builder (>= 2.1.2) - cucumber-core (~> 3.0.0) - cucumber-expressions (~> 4.0.3) + cucumber-core (~> 1.5.0) cucumber-wire (~> 0.0.1) - diff-lcs (~> 1.3) + diff-lcs (>= 1.1.3) gherkin (~> 4.0) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) - cucumber-core (3.0.0) - backports (>= 3.8.0) - cucumber-tag_expressions (>= 1.0.1) - gherkin (>= 4.1.3) - cucumber-expressions (4.0.3) - cucumber-tag_expressions (1.0.1) + cucumber-core (1.5.0) + gherkin (~> 4.0) cucumber-wire (0.0.1) dco (1.0.1) git (~> 1.3) @@ -224,6 +236,7 @@ GEM json erubis (2.7.0) excon (0.59.0) + extlib (0.9.16) faraday (0.13.1) multipart-post (>= 1.2, < 3) fauxhai (5.4.0) @@ -239,6 +252,156 @@ GEM ffi ffi-yajl (2.3.1) libyajl2 (~> 1.2) + fission (0.5.0) + CFPropertyList (~> 2.2) + fog (1.41.0) + fog-aliyun (>= 0.1.0) + fog-atmos + fog-aws (>= 0.6.0) + fog-brightbox (~> 0.4) + fog-cloudatcost (~> 0.1.0) + fog-core (~> 1.45) + fog-digitalocean (>= 0.3.0) + fog-dnsimple (~> 1.0) + fog-dynect (~> 0.0.2) + fog-ecloud (~> 0.1) + fog-google (<= 0.1.0) + fog-internet-archive + fog-joyent + fog-json + fog-local + fog-openstack + fog-powerdns (>= 0.1.1) + fog-profitbricks + fog-rackspace + fog-radosgw (>= 0.0.2) + fog-riakcs + fog-sakuracloud (>= 0.0.4) + fog-serverlove + fog-softlayer + fog-storm_on_demand + fog-terremark + fog-vmfusion + fog-voxel + fog-vsphere (>= 0.4.0) + fog-xenserver + fog-xml (~> 0.1.1) + ipaddress (~> 0.5) + json (>= 1.8, < 2.0) + fog-aliyun (0.2.0) + fog-core (~> 1.27) + fog-json (~> 1.0) + ipaddress (~> 0.8) + xml-simple (~> 1.1) + fog-atmos (0.1.0) + fog-core + fog-xml + fog-aws (1.4.1) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-brightbox (0.13.0) + fog-core (~> 1.22) + fog-json + inflecto (~> 0.0.2) + fog-cloudatcost (0.1.2) + fog-core (~> 1.36) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-core (1.45.0) + builder + excon (~> 0.58) + formatador (~> 0.2) + fog-digitalocean (0.3.0) + fog-core (~> 1.42) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.5) + fog-dnsimple (1.0.0) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-dynect (0.0.3) + fog-core + fog-json + fog-xml + fog-ecloud (0.3.0) + fog-core + fog-xml + fog-google (0.1.0) + fog-core + fog-json + fog-xml + fog-internet-archive (0.0.1) + fog-core + fog-json + fog-xml + fog-joyent (0.0.1) + fog-core (~> 1.42) + fog-json (>= 1.0) + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-local (0.4.0) + fog-core (~> 1.27) + fog-openstack (0.1.21) + fog-core (>= 1.40) + fog-json (>= 1.0) + ipaddress (>= 0.8) + fog-powerdns (0.1.1) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + fog-profitbricks (4.0.0) + fog-core (~> 1.42) + fog-json (~> 1.0) + fog-rackspace (0.1.5) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) + fog-radosgw (0.0.5) + fog-core (>= 1.21.0) + fog-json + fog-xml (>= 0.0.1) + fog-riakcs (0.1.0) + fog-core + fog-json + fog-xml + fog-sakuracloud (1.7.5) + fog-core + fog-json + fog-scaleway (0.3.0) + fog-core (~> 1.42) + fog-json (~> 1.0) + fog-serverlove (0.1.2) + fog-core + fog-json + fog-softlayer (1.1.4) + fog-core + fog-json + fog-storm_on_demand (0.1.1) + fog-core + fog-json + fog-terremark (0.1.0) + fog-core + fog-xml + fog-vmfusion (0.1.0) + fission + fog-core + fog-voxel (0.1.0) + fog-core + fog-xml + fog-vsphere (1.13.0) + fog-core + rbvmomi (~> 1.9) + fog-xenserver (0.3.0) + fog-core + fog-xml + fog-xml (0.1.3) + fog-core + nokogiri (>= 1.5.11, < 2.0.0) foodcritic (11.4.0) cucumber-core (>= 1.3) erubis @@ -249,19 +412,19 @@ GEM treetop (~> 1.4) formatador (0.2.5) fuzzyurl (0.9.0) - gcewinpass (1.0.0) - google-api-client (~> 0.9.0) gherkin (4.1.3) git (1.3.0) - google-api-client (0.9.28) + google-api-client (0.8.7) + activesupport (>= 3.2, < 5.0) addressable (~> 2.3) - googleauth (~> 0.5) - httpclient (~> 2.7) - hurley (~> 0.1) - memoist (~> 0.11) - mime-types (>= 1.6) - representable (~> 2.3.0) - retriable (~> 2.0) + autoparse (~> 0.3) + extlib (~> 0.9) + faraday (~> 0.9) + googleauth (~> 0.3) + launchy (~> 2.4) + multi_json (~> 1.10) + retriable (~> 1.4) + signet (~> 0.6) googleauth (0.5.3) faraday (~> 0.12) jwt (~> 1.4) @@ -289,7 +452,8 @@ GEM hitimes (1.2.6-x86-mingw32) htmlentities (4.3.4) httpclient (2.8.3) - hurley (0.2) + i18n (0.8.6) + inflecto (0.0.2) inifile (3.0.0) iniparse (1.4.4) inspec (1.39.1) @@ -327,10 +491,6 @@ GEM multi_json retryable (~> 2.0) test-kitchen (~> 1.4, >= 1.4.1) - kitchen-google (1.3.0) - gcewinpass (~> 1.0) - google-api-client (~> 0.9.0) - test-kitchen kitchen-hyperv (0.5.1) test-kitchen (~> 1.4) kitchen-inspec (0.19.0) @@ -350,6 +510,8 @@ GEM knife-windows (1.9.0) winrm (~> 2.1) winrm-elevated (~> 1.0) + launchy (2.4.3) + addressable (~> 2.3) libyajl2 (1.2.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -371,6 +533,7 @@ GEM mime-types-data (3.2016.0521) mini_portile2 (2.3.0) minitar (0.5.4) + minitest (5.10.3) mixlib-archive (0.4.1) mixlib-log mixlib-authentication (1.4.2) @@ -465,11 +628,14 @@ GEM rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rb-readline (0.5.5) + rbvmomi (1.11.3) + builder (~> 3.0) + json (>= 1.8) + nokogiri (~> 1.5) + trollop (~> 2.1) rdoc (5.1.0) rdp-ruby-wmi (0.3.1) - representable (2.3.0) - uber (~> 0.0.7) - retriable (2.1.0) + retriable (1.4.1) retryable (2.0.4) ridley (5.1.1) addressable @@ -516,7 +682,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-prof (0.16.2) - ruby-progressbar (1.9.0) + ruby-progressbar (1.8.3) ruby-shadow (2.5.0) ruby_dep (1.5.0) rubyntlm (0.6.2) @@ -527,11 +693,11 @@ GEM addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) semverse (2.0.0) - serverspec (2.41.0) + serverspec (2.40.0) multi_json rspec (~> 3.0) rspec-its - specinfra (~> 2.72) + specinfra (~> 2.68) sfl (2.3) shellany (0.0.1) signet (0.7.3) @@ -569,6 +735,7 @@ GEM safe_yaml (~> 1.0) thor (~> 0.19, < 0.19.2) thor (0.19.1) + thread_safe (0.3.6) timers (4.0.4) hitimes toml (0.1.2) @@ -583,7 +750,9 @@ GEM winrm-fs (~> 1.0) treetop (1.6.8) polyglot (~> 0.3) - uber (0.0.15) + trollop (2.1.2) + tzinfo (1.2.3) + thread_safe (~> 0.1) ubuntu_ami (0.4.1) unicode-display_width (1.3.0) uuid (2.3.8) @@ -633,6 +802,7 @@ GEM rubyzip (~> 1.1) winrm (~> 2.0) wmi-lite (1.0.0) + xml-simple (1.1.5) yard (0.9.9) PLATFORMS @@ -650,6 +820,7 @@ DEPENDENCIES chef-provisioning (>= 2.4.0) chef-provisioning-aws (>= 2.0) chef-provisioning-azure (>= 0.6.0) + chef-provisioning-fog (>= 0.20.0) chef-sugar chef-vault cheffish (>= 13.0) @@ -668,7 +839,6 @@ DEPENDENCIES inspec (>= 0.29.0) kitchen-dokken (>= 2.5.0) kitchen-ec2 - kitchen-google (>= 1.3.0) kitchen-hyperv kitchen-inspec kitchen-vagrant