mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 01:58:41 -05:00
Allow user to specify a configuration file in VMPOOLER_CONFIG_FILE
variable Previously, there were two ways to configure Vmpooler, either by changing the contents of vmpooler.yaml or by assigning the raw YAML to the VMPOOLER_CONFIG environment variable. This commit adds a new environment variable called VMPOOLER_CONFIG_FILE that can be assigned the name of a config file to use. Also fixes #240 by whitelisting the Symbol class when calling YAML.safe_load in Vmpooler.config.
This commit is contained in:
parent
28922df28e
commit
878c93f646
8 changed files with 152 additions and 13 deletions
|
|
@ -820,7 +820,7 @@ EOT
|
|||
|
||||
it 'should honor the insecure setting' do
|
||||
pending('Resolution of issue https://github.com/puppetlabs/vmpooler/issues/207')
|
||||
config[:vsphere][:insecure] = false
|
||||
config[:providers][:vsphere][:insecure] = false
|
||||
|
||||
expect(RbVmomi::VIM).to receive(:connect).with({
|
||||
:host => credentials['server'],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue