Merge pull request #336 from mattkirby/fix_pooler_147

(POOLER-147) Fix create_linked_clone pool option
This commit is contained in:
Spencer McElmurry 2019-08-23 11:02:15 -05:00 committed by GitHub
commit f229d404e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions

View file

@ -12,6 +12,9 @@ If you're looking for changes from before this, refer to the project's
git logs & PR history. git logs & PR history.
# [Unreleased](https://github.com/puppetlabs/vmpooler/compare/0.7.0...master) # [Unreleased](https://github.com/puppetlabs/vmpooler/compare/0.7.0...master)
### Fixed
- Correctly detect create\_linked\_clone on a pool level (POOLER-147)
# [0.7.0](https://github.com/puppetlabs/vmpooler/compare/0.6.3...0.7.0) # [0.7.0](https://github.com/puppetlabs/vmpooler/compare/0.6.3...0.7.0)
### Added ### Added

View file

@ -1037,8 +1037,8 @@ module Vmpooler
end end
def linked_clone?(pool) def linked_clone?(pool)
return if pool[:create_linked_clone] == false return if pool['create_linked_clone'] == false
return true if pool[:create_linked_clone] return true if pool['create_linked_clone']
return true if @config[:config]['create_linked_clones'] return true if @config[:config]['create_linked_clones']
end end
end end

View file

@ -59,6 +59,7 @@ describe 'Vmpooler::PoolManager::Provider::VSphere' do
# Drop the connection pool timeout way down for spec tests so they fail fast # Drop the connection pool timeout way down for spec tests so they fail fast
connection_pool_timeout: 1 connection_pool_timeout: 1
datacenter: MockDC datacenter: MockDC
create_linked_clones: true
:pools: :pools:
- name: '#{poolname}' - name: '#{poolname}'
alias: [ 'mockpool' ] alias: [ 'mockpool' ]
@ -3439,7 +3440,7 @@ EOT
describe 'get_disk_backing' do describe 'get_disk_backing' do
it 'should return moveChildMostDiskBacking when linked clone enabled' do it 'should return moveChildMostDiskBacking when linked clone enabled' do
expect( subject.get_disk_backing({create_linked_clone: true}) ).to eq(:moveChildMostDiskBacking) expect( subject.get_disk_backing({'create_linked_clone' => true}) ).to eq(:moveChildMostDiskBacking)
end end
it 'should return moveAllDiskBackingsAndConsolidate when no preference is specified' do it 'should return moveAllDiskBackingsAndConsolidate when no preference is specified' do
@ -3453,7 +3454,7 @@ EOT
describe 'linked_clone?' do describe 'linked_clone?' do
it 'should return true when linked clone is enabled on the pool' do it 'should return true when linked clone is enabled on the pool' do
expect( subject.linked_clone?({create_linked_clone: true}) ).to be true expect( subject.linked_clone?({'create_linked_clone' => true}) ).to be true
end end
it 'should return nil when linked clone is not enabled on the pool' do it 'should return nil when linked clone is not enabled on the pool' do