openstack/puppet-glance
Code Issues Proposed changes

solve duplicate declaration issue for python-openstackclient

Browse Source 
when having a controller node with several modules that use puppet-openstacklib
the package python-openstackclient is already declared. because openstacklib
adds the tag 'openstack' to the resource, we have to do it here to. otherwise
ensure_resource does not recognize it and we have a duplicate declaration
for the package.

Change-Id: Icf341ea92764f2ddb60b0e7ace09a56febe59545
Closes-Bug: #1483663
This commit is contained in:
Benedikt von St. Vieth 2015-08-12 08:21:31 +02:00
parent 4bbdb70dbf
commit 7128d96dde
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -30,5 +30,5 @@ class glance(
}
}
ensure_resource('package', 'python-openstackclient', {'ensure' => $package_ensure})
ensure_resource('package', 'python-openstackclient', {'ensure' => $package_ensure, tag => 'openstack'})
}

4
spec/classes/glance_spec.rb
View File

@ -31,7 +31,9 @@ describe 'glance' do
'mode' => '0770'
)}
it { is_expected.to contain_package('python-openstackclient') }
it { is_expected.to contain_package('python-openstackclient').with(
:tag => 'openstack'
)}
end
end