Skip to content

Commit

Permalink
Merge pull request #911 from chef/revert_knife
Browse files Browse the repository at this point in the history
Revert new knife plugin versions until we can test further
  • Loading branch information
tas50 authored Feb 2, 2020
2 parents 8b7ac98 + 163eab9 commit 85bc188
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 20 deletions.
14 changes: 7 additions & 7 deletions components/gems/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ group(:omnibus_package) do
gem "kitchen-vcenter", ">= 2.0"

# knife plugins
gem "knife-acl", ">= 1.0.3"
gem "knife-azure", ">= 2.0.10"
gem "knife-ec2", ">= 1.0"
gem "knife-google", ">= 4.2.7"
gem "knife-acl", "= 1.0.6"
gem "knife-azure", "= 2.0.6"
gem "knife-ec2", "= 1.0.28"
gem "knife-google", "= 4.2.4"
gem "knife-tidy", ">= 1.2.0"
gem "knife-windows", ">= 3.0"
gem "knife-windows", "= 3.0.6"
gem "knife-opc", ">= 0.4.0"
gem "knife-vcenter", ">= 3.0.1"
gem "knife-vsphere", ">= 4.0"
gem "knife-vcenter", "= 3.0.0"
gem "knife-vsphere", "= 4.0.8"

# ed25519 ssh key support done here as it's a native gem we can't put in train
gem "ed25519"
Expand Down
27 changes: 14 additions & 13 deletions components/gems/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ GEM
test-kitchen (>= 1.16, < 3.0)
vsphere-automation-sdk (~> 0.4)
knife-acl (1.0.6)
knife-azure (2.0.11)
knife-azure (2.0.6)
azure_mgmt_compute (~> 0.18, >= 0.18.3)
azure_mgmt_network (~> 0.18, >= 0.18.2)
azure_mgmt_resources (~> 0.17, >= 0.17.2)
Expand All @@ -560,27 +560,28 @@ GEM
aws-sdk-ec2 (~> 1.95)
aws-sdk-s3 (~> 1.43)
chef (>= 15.1)
knife-google (4.2.7)
knife-google (4.2.4)
gcewinpass (~> 1.1)
google-api-client (>= 0.23.9, < 0.37.0)
google-api-client (>= 0.23.9, < 0.35.0)
knife-cloud (>= 2.0.0)
knife-opc (0.4.1)
knife-push (1.1.5)
chef (>= 13.0)
knife-tidy (2.0.9)
knife-vcenter (3.0.1)
knife-vcenter (3.0.0)
knife-cloud (>= 1.2, < 3.0)
rb-readline (~> 0.5)
rbvmomi (>= 1.11, < 3.0)
savon (~> 2.11)
vsphere-automation-sdk (~> 0.4)
knife-vsphere (4.1.1)
knife-vsphere (4.0.8)
chef (>= 15.1)
chef-bin (>= 15.1)
chef-vault (>= 2.6.0)
filesize (>= 0.1.1, < 0.3.0)
netaddr (~> 1.5)
rbvmomi (>= 1.8, < 3.0)
knife-windows (3.0.10)
knife-windows (3.0.6)
chef (>= 15.0)
winrm (~> 2.1)
winrm-elevated (~> 1.0)
Expand Down Expand Up @@ -1056,16 +1057,16 @@ DEPENDENCIES
kitchen-inspec (>= 1.0)
kitchen-vagrant (>= 1.6)
kitchen-vcenter (>= 2.0)
knife-acl (>= 1.0.3)
knife-azure (>= 2.0.10)
knife-ec2 (>= 1.0)
knife-google (>= 4.2.7)
knife-acl (= 1.0.6)
knife-azure (= 2.0.6)
knife-ec2 (= 1.0.28)
knife-google (= 4.2.4)
knife-opc (>= 0.4.0)
knife-push
knife-tidy (>= 1.2.0)
knife-vcenter (>= 3.0.1)
knife-vsphere (>= 4.0)
knife-windows (>= 3.0)
knife-vcenter (= 3.0.0)
knife-vsphere (= 4.0.8)
knife-windows (= 3.0.6)
listen
mdl (>= 0.7.0)
minitest (<= 5.11.3)
Expand Down

0 comments on commit 85bc188

Please sign in to comment.