Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Add knife-azure to DK #2227

Merged
merged 2 commits into from
Aug 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ end
# We equality pin the chef gem itself to assert which version we're shipping.
group(:omnibus_package) do
gem "appbundler"
gem "berkshelf", ">= 7.0.5"
gem "berkshelf", ">= 7.0.8"
gem "chef-vault", ">= 3.4.1"
# Expeditor manages the version of chef released to Rubygems. We only release 'stable' chef
# gems to Rubygems now, so letting this float on latest should always give us the latest
Expand All @@ -70,16 +70,17 @@ group(:omnibus_package) do
gem "kitchen-inspec", ">= 1.0"
gem "kitchen-vagrant", ">= 1.6"
gem "knife-acl", ">= 1.0.3"
gem "knife-azure", ">= 2.0.1"
gem "knife-ec2", ">= 1.0"
gem "knife-google", ">= 3.3.3"
gem "knife-tidy", ">= 1.2.0"
gem "knife-windows", ">= 1.9.1"
gem "knife-windows", ">= 3.0"
gem "knife-opc", ">= 0.4.0"
gem "knife-vsphere", ">= 2.1.1"
gem "mixlib-archive", ">= 0.4.16"
gem "ohai", ">= 14"
gem "net-ssh", ">= 4.2.0"
gem "test-kitchen", ">= 1.23"
gem "test-kitchen", ">= 2.0"
gem "listen"
gem "dco"

Expand Down Expand Up @@ -134,8 +135,7 @@ end

gem "chefstyle", group: :test

# TODO delete this when we figure out how to include the pushy windows dependencies
# correctly
# Ensure support for push-client on Windows
platforms :mswin, :mingw do
gem "rdp-ruby-wmi"
gem "windows-pr"
Expand Down
30 changes: 23 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ GEM
artifactory (3.0.5)
ast (2.4.0)
aws-eventstream (1.0.3)
aws-partitions (1.203.0)
aws-partitions (1.204.0)
aws-sdk-apigateway (1.34.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
Expand Down Expand Up @@ -77,7 +77,7 @@ GEM
aws-sdk-configservice (1.35.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.63.0)
aws-sdk-core (3.64.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
Expand All @@ -100,7 +100,7 @@ GEM
aws-sdk-eks (1.24.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
aws-sdk-elasticache (1.23.0)
aws-sdk-elasticache (1.24.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
aws-sdk-elasticbeanstalk (1.25.0)
Expand Down Expand Up @@ -167,7 +167,7 @@ GEM
aws-sdk-sns (1.19.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
aws-sdk-sqs (1.20.0)
aws-sdk-sqs (1.21.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
aws-sdk-ssm (1.54.0)
Expand All @@ -181,12 +181,16 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
azure_graph_rbac (0.17.1)
ms_rest_azure (~> 0.11.0)
azure_mgmt_compute (0.18.7)
ms_rest_azure (~> 0.11.1)
azure_mgmt_key_vault (0.17.4)
ms_rest_azure (~> 0.11.0)
azure_mgmt_network (0.19.0)
ms_rest_azure (~> 0.11.1)
azure_mgmt_resources (0.17.6)
ms_rest_azure (~> 0.11.1)
azure_mgmt_storage (0.17.10)
ms_rest_azure (~> 0.11.1)
backports (3.15.0)
bcrypt_pbkdf (1.0.1)
bcrypt_pbkdf (1.0.1-x64-mingw32)
Expand Down Expand Up @@ -536,6 +540,17 @@ GEM
kitchen-vagrant (1.6.0)
test-kitchen (>= 1.4, < 3)
knife-acl (1.0.3)
knife-azure (2.0.1)
azure_mgmt_compute (~> 0.18, >= 0.18.3)
azure_mgmt_network (~> 0.18, >= 0.18.2)
azure_mgmt_resources (~> 0.17, >= 0.17.2)
azure_mgmt_storage (~> 0.17, >= 0.17.3)
chef (>= 15.1)
chef-bin (>= 15.1)
ffi
ipaddress
listen (~> 3.1)
nokogiri (>= 1.5.5)
knife-cloud (1.2.3)
excon (>= 0.50)
knife-windows (>= 1.0)
Expand Down Expand Up @@ -966,7 +981,7 @@ DEPENDENCIES
appbundler
artifactory
bcrypt_pbkdf
berkshelf (>= 7.0.5)
berkshelf (>= 7.0.8)
bundler
chef (= 15.2.20)
chef-apply (= 0.3.0)
Expand Down Expand Up @@ -999,14 +1014,15 @@ DEPENDENCIES
kitchen-inspec (>= 1.0)
kitchen-vagrant (>= 1.6)
knife-acl (>= 1.0.3)
knife-azure (>= 2.0.1)
knife-ec2 (>= 1.0)
knife-google (>= 3.3.3)
knife-opc (>= 0.4.0)
knife-push
knife-spork
knife-tidy (>= 1.2.0)
knife-vsphere (>= 2.1.1)
knife-windows (>= 1.9.1)
knife-windows (>= 3.0)
listen
minitest (<= 5.10.3)
mixlib-archive (>= 0.4.16)
Expand All @@ -1030,7 +1046,7 @@ DEPENDENCIES
ruby-prof
ruby-shadow
stove
test-kitchen (>= 1.23)
test-kitchen (>= 2.0)
win32-api
win32-dir
win32-event
Expand Down
8 changes: 4 additions & 4 deletions omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ GIT

GIT
remote: https://github.com/chef/omnibus.git
revision: a0fb4a162261f57ffd7b1fff980911b474970cb9
revision: c4c0c518caf5c559ddf3d0ae773013d5dbc6bd3c
branch: master
specs:
omnibus (6.1.0)
omnibus (6.1.2)
aws-sdk-s3 (~> 1)
chef-sugar (>= 3.3)
cleanroom (~> 1.0)
Expand All @@ -33,8 +33,8 @@ GEM
artifactory (3.0.5)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
aws-partitions (1.199.0)
aws-sdk-core (3.62.0)
aws-partitions (1.204.0)
aws-sdk-core (3.64.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
Expand Down