diff --git a/docker/Gemfile b/docker/Gemfile index 55d0583..8557f7b 100644 --- a/docker/Gemfile +++ b/docker/Gemfile @@ -1,15 +1,15 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' -gem 'vmpooler', '~> 3.0' +#gem 'vmpooler', '~> 3.0' gem 'vmpooler-dns-gcp', '~> 1.0' # Remove temporarily until a stable minor release is published # gem 'vmpooler-provider-ec2', '~> 0.0.1' gem 'vmpooler-provider-gce', '~> 1.0' -#gem 'vmpooler-provider-vsphere', '~> 3.0' +gem 'vmpooler-provider-vsphere', '~> 3.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', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'test_fail_migrate' # gem 'vmpooler-dns-gcp', git: 'https://github.com/puppetlabs/vmpooler-dns-gcp.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: 'update_for_redis_5' +#gem 'vmpooler-provider-vsphere', git: 'https://github.com/puppetlabs/vmpooler-provider-vsphere.git', branch: 'update_for_redis_5' diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock index 8287ee4..94ae6ac 100644 --- a/docker/Gemfile.lock +++ b/docker/Gemfile.lock @@ -1,11 +1,29 @@ GIT - remote: https://github.com/puppetlabs/vmpooler-provider-vsphere.git - revision: dd309616123366b278bb173c52ea22273b3b033c - branch: update_for_redis_5 + remote: https://github.com/puppetlabs/vmpooler.git + revision: fa3a1a0182cdbdd3c3d9a7656fc08bd90e71be62 + branch: test_fail_migrate specs: - vmpooler-provider-vsphere (3.3.2) - rbvmomi2 (>= 3.1, < 4.0) - vmpooler (~> 3.0) + vmpooler (3.5.1) + concurrent-ruby (~> 1.1) + connection_pool (~> 2.4) + deep_merge (~> 1.2) + net-ldap (~> 0.16) + opentelemetry-exporter-jaeger (= 0.23.0) + opentelemetry-instrumentation-concurrent_ruby (= 0.21.1) + opentelemetry-instrumentation-http_client (= 0.22.2) + opentelemetry-instrumentation-redis (= 0.25.3) + opentelemetry-instrumentation-sinatra (= 0.23.2) + opentelemetry-resource_detectors (= 0.24.1) + opentelemetry-sdk (~> 1.3, >= 1.3.0) + pickup (~> 0.0.11) + prometheus-client (>= 2, < 5) + puma (>= 5.0.4, < 7) + rack (>= 2.2, < 4.0) + rake (~> 13.0) + redis (~> 5.0) + sinatra (>= 2, < 4) + spicy-proton (~> 2.1) + statsd-ruby (~> 1.4) GEM remote: https://rubygems.org/ @@ -154,27 +172,6 @@ GEM tilt (2.2.0) trailblazer-option (0.1.2) uber (0.1.0) - vmpooler (3.5.1) - concurrent-ruby (~> 1.1) - connection_pool (~> 2.4) - deep_merge (~> 1.2) - net-ldap (~> 0.16) - opentelemetry-exporter-jaeger (= 0.23.0) - opentelemetry-instrumentation-concurrent_ruby (= 0.21.1) - opentelemetry-instrumentation-http_client (= 0.22.2) - opentelemetry-instrumentation-redis (= 0.25.3) - opentelemetry-instrumentation-sinatra (= 0.23.2) - opentelemetry-resource_detectors (= 0.24.1) - opentelemetry-sdk (~> 1.3, >= 1.3.0) - pickup (~> 0.0.11) - prometheus-client (>= 2, < 5) - puma (>= 5.0.4, < 7) - rack (>= 2.2, < 4.0) - rake (~> 13.0) - redis (~> 5.0) - sinatra (>= 2, < 4) - spicy-proton (~> 2.1) - statsd-ruby (~> 1.4) vmpooler-dns-gcp (1.2.0) google-cloud-dns (~> 0.35.1) googleauth (>= 0.16.2, < 1.3.0) @@ -183,6 +180,9 @@ GEM google-apis-compute_v1 (~> 0.14) googleauth (>= 0.16.2, < 1.4.0) vmpooler (~> 3.0) + vmpooler-provider-vsphere (3.3.2) + rbvmomi2 (>= 3.1, < 4.0) + vmpooler (~> 3.0) webrick (1.8.1) zonefile (1.06) @@ -190,10 +190,10 @@ PLATFORMS universal-java-11 DEPENDENCIES - vmpooler (~> 3.0) + vmpooler! vmpooler-dns-gcp (~> 1.0) vmpooler-provider-gce (~> 1.0) - vmpooler-provider-vsphere! + vmpooler-provider-vsphere (~> 3.0) BUNDLED WITH 2.4.12