diff --git a/docker/Gemfile b/docker/Gemfile index e345644..41b2cc3 100644 --- a/docker/Gemfile +++ b/docker/Gemfile @@ -1,12 +1,13 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' gem 'vmpooler', '~> 2.4' -gem 'vmpooler-provider-ec2', '~> 0.0.1' +# Remove temporarily until a stable minor release is published +# gem 'vmpooler-provider-ec2', '~> 0.0.1' gem 'vmpooler-provider-gce', '~> 0.4' -# gem 'vmpooler-provider-vsphere', '~> 1.6' +gem 'vmpooler-provider-vsphere', '~> 2.0' # For development install via a git branch use something like: # gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'my-feature' # gem 'vmpooler-provider-ec2', git: 'https://github.com/puppetlabs/vmpooler-provider-ec2.git', branch: 'my-feature' # gem 'vmpooler-provider-gce', git: 'https://github.com/puppetlabs/vmpooler-provider-gce.git', branch: 'my-feature' -gem 'vmpooler-provider-vsphere', git: 'https://github.com/puppetlabs/vmpooler-provider-vsphere.git', branch: 'use-rbvmomi2' +# gem 'vmpooler-provider-vsphere', git: 'https://github.com/puppetlabs/vmpooler-provider-vsphere.git', branch: 'my-feature' diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock index 606e623..767e89c 100644 --- a/docker/Gemfile.lock +++ b/docker/Gemfile.lock @@ -1,12 +1,3 @@ -GIT - remote: https://github.com/puppetlabs/vmpooler-provider-vsphere.git - revision: b855080acbe6201871e35d5374de2e159d95f44c - branch: use-rbvmomi2 - specs: - vmpooler-provider-vsphere (1.6.0) - rbvmomi2 (>= 3.1, < 4.0) - vmpooler (~> 2.4) - GEM remote: https://rubygems.org/ specs: @@ -34,7 +25,7 @@ GEM faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) - google-apis-compute_v1 (0.59.0) + google-apis-compute_v1 (0.60.0) google-apis-core (>= 0.9.1, < 2.a) google-apis-core (0.10.0) addressable (~> 2.5, >= 2.5.1) @@ -186,6 +177,9 @@ GEM google-apis-compute_v1 (~> 0.14) google-cloud-dns (~> 0.35.1) googleauth (>= 0.16.2, < 1.3.0) + vmpooler-provider-vsphere (2.0.0) + rbvmomi2 (>= 3.1, < 4.0) + vmpooler (~> 2.4) webrick (1.8.1) zonefile (1.06) @@ -196,7 +190,7 @@ DEPENDENCIES vmpooler (~> 2.4) vmpooler-provider-ec2 (~> 0.0.1) vmpooler-provider-gce (~> 0.4) - vmpooler-provider-vsphere! + vmpooler-provider-vsphere (~> 2.0) BUNDLED WITH 2.4.5