diff --git a/docker/Gemfile b/docker/Gemfile index c04b8eb..e77204b 100644 --- a/docker/Gemfile +++ b/docker/Gemfile @@ -5,11 +5,11 @@ 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: 'POD-8' # 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: 'my-feature' +gem 'vmpooler-provider-vsphere', git: 'https://github.com/puppetlabs/vmpooler-provider-vsphere.git', branch: 'POD-8' diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock index b81a56b..d92ab18 100644 --- a/docker/Gemfile.lock +++ b/docker/Gemfile.lock @@ -1,6 +1,15 @@ +GIT + remote: https://github.com/puppetlabs/vmpooler-provider-vsphere.git + revision: b77f015d2e4a4d4648c060a501edf28f0436b750 + branch: POD-8 + specs: + vmpooler-provider-vsphere (3.2.0) + rbvmomi2 (>= 3.1, < 4.0) + vmpooler (~> 3.0) + GIT remote: https://github.com/puppetlabs/vmpooler.git - revision: 2b98b95cb9731dc3fb4aa9852937002a00a85a4d + revision: 76c08d003f511ddca56e1982804dc36f5c0e3968 branch: POD-8 specs: vmpooler (3.4.0) @@ -180,9 +189,6 @@ GEM google-apis-compute_v1 (~> 0.14) googleauth (>= 0.16.2, < 1.4.0) vmpooler (~> 3.0) - vmpooler-provider-vsphere (3.3.0) - rbvmomi2 (>= 3.1, < 4.0) - vmpooler (~> 3.0) webrick (1.8.1) zonefile (1.06) @@ -193,7 +199,7 @@ DEPENDENCIES vmpooler! vmpooler-dns-gcp (~> 1.0) vmpooler-provider-gce (~> 1.0) - vmpooler-provider-vsphere (~> 3.0) + vmpooler-provider-vsphere! BUNDLED WITH - 2.4.12 + 2.4.19 diff --git a/docker/vmpooler.yaml b/docker/vmpooler.yaml index 09146a5..1c7a172 100644 --- a/docker/vmpooler.yaml +++ b/docker/vmpooler.yaml @@ -23,6 +23,7 @@ logfile: '/var/log/vmpooler.log' task_limit: 10 timeout: 15 + timeout_notification: 1 vm_checktime: 1 vm_lifetime: 12 vm_lifetime_auth: 24 @@ -39,6 +40,7 @@ datastore: 'vmstorage' size: 5 timeout: 15 + timeout_notification: 1 ready_ttl: 1440 provider: dummy dns_plugin: 'example' @@ -49,6 +51,7 @@ datastore: 'vmstorage' size: 5 timeout: 15 + timeout_notification: 1 ready_ttl: 1440 provider: dummy dns_plugin: 'example'