Merge "Use new openstackclient tag"
This commit is contained in:
commit
e7de290ccf
@ -14,10 +14,12 @@ class heat::client (
|
|||||||
include heat::deps
|
include heat::deps
|
||||||
include heat::params
|
include heat::params
|
||||||
|
|
||||||
|
# NOTE(tkajinam): heat-package tag is used because heatclient is required
|
||||||
|
# by heat
|
||||||
package { 'python-heatclient':
|
package { 'python-heatclient':
|
||||||
ensure => $ensure,
|
ensure => $ensure,
|
||||||
name => $::heat::params::client_package_name,
|
name => $::heat::params::client_package_name,
|
||||||
tag => 'openstack',
|
tag => ['openstack', 'openstackclient', 'heat-package'],
|
||||||
}
|
}
|
||||||
|
|
||||||
include openstacklib::openstackclient
|
include openstacklib::openstackclient
|
||||||
|
@ -2,18 +2,7 @@ require 'spec_helper'
|
|||||||
|
|
||||||
describe 'heat::client' do
|
describe 'heat::client' do
|
||||||
|
|
||||||
let :params do
|
|
||||||
{}
|
|
||||||
end
|
|
||||||
|
|
||||||
let :default_params do
|
|
||||||
{ :package_ensure => 'present' }
|
|
||||||
end
|
|
||||||
|
|
||||||
shared_examples_for 'heat client' do
|
shared_examples_for 'heat client' do
|
||||||
let :p do
|
|
||||||
default_params.merge(params)
|
|
||||||
end
|
|
||||||
|
|
||||||
it { is_expected.to contain_class('heat::deps') }
|
it { is_expected.to contain_class('heat::deps') }
|
||||||
it { is_expected.to contain_class('heat::params') }
|
it { is_expected.to contain_class('heat::params') }
|
||||||
@ -21,8 +10,8 @@ describe 'heat::client' do
|
|||||||
it 'installs heat client package' do
|
it 'installs heat client package' do
|
||||||
is_expected.to contain_package('python-heatclient').with(
|
is_expected.to contain_package('python-heatclient').with(
|
||||||
:name => platform_params[:client_package_name],
|
:name => platform_params[:client_package_name],
|
||||||
:ensure => p[:package_ensure],
|
:ensure => 'present',
|
||||||
:tag => 'openstack'
|
:tag => ['openstack', 'openstackclient', 'heat-package']
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user