openstack/fuel-library
Code Issues Proposed changes

Merge "Skip docker resource install with UCA packages"

Browse Source
This commit is contained in:
Jenkins 2016-01-18 17:08:50 +00:00 committed by Gerrit Code Review
commit 7c0d1977ca
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deployment/puppet/osnailyfacter/modular/heat/heat.pp
View File

@ -137,14 +137,17 @@ class heat::docker_resource (
} }
} }
if $::osfamily == 'RedHat' { # TODO(aschultz): ubuntu does not have a heat docker package
$docker_resource_package_name = 'openstack-heat-docker' if !$::os_package_type or $::os_package_type != 'ubuntu' {
} elsif $::osfamily == 'Debian' { if $::osfamily == 'RedHat' {
$docker_resource_package_name = 'heat-docker' $docker_resource_package_name = 'openstack-heat-docker'
} } elsif $::osfamily == 'Debian' {
$docker_resource_package_name = 'heat-docker'
}
class { 'heat::docker_resource' : class { 'heat::docker_resource' :
package_name => $docker_resource_package_name, package_name => $docker_resource_package_name,
}
} }
$haproxy_stats_url = "http://${service_endpoint}:10000/;csv" $haproxy_stats_url = "http://${service_endpoint}:10000/;csv"

19
tests/noop/spec/hosts/heat/heat_spec.rb
View File

@ -35,10 +35,21 @@ describe manifest do
sahara = Noop.hiera_structure('sahara/enabled') sahara = Noop.hiera_structure('sahara/enabled')
it 'should install heat-docker package only after heat-engine' do it 'should install heat-docker package only after heat-engine' do
should contain_package('heat-docker').with( if !facts.has_key?(:os_package_type) or facts[:os_package_type] != 'ubuntu'
'ensure' => 'installed', if facts[:osfamily] == 'RedHat'
'require' => 'Package[heat-engine]', heat_docker_package_name = 'openstack-heat-docker'
) elsif facts[:osfamily] == 'Debian'
heat_docker_package_name = 'heat-docker'
end
should contain_package('heat-docker').with(
'ensure' => 'installed',
'name' => heat_docker_package_name,
'require' => 'Package[heat-engine]')
else
should_not contain_package('heat-docker').with(
'ensure' => 'installed',
'require' => 'Package[heat-engine]')
end
end end
it 'should configure default_log_levels' do it 'should configure default_log_levels' do