PSARC/2016/001 OpenStack Puppet Modules
22491714 Request to integrate OpenStack Puppet modules
In-house patch to add support for Solaris 11.3 and 12.0. This patch
has not yet been submitted upstream due to requirements for 3rd party
CI testing.
--- openstack-heat-6.1.0/manifests/api.pp.orig 2015-08-10 09:46:05.129811698 -0700
+++ openstack-heat-6.1.0/manifests/api.pp 2015-08-10 09:47:39.509312624 -0700
@@ -62,12 +62,22 @@ class heat::api (
include ::heat::params
include ::heat::policy
+ if ( $heat::params::api_package_name != $heat::params::common_package_name ) {
+ ensure_packages([$heat::params::api_package_name],
+ {
+ ensure => $package_ensure,
+ name => $::heat::params::api_package_name,
+ tag => ['openstack'],
+ }
+ )
+ }
+
Heat_config<||> ~> Service['heat-api']
Class['heat::policy'] -> Service['heat-api']
- Package['heat-api'] -> Heat_config<||>
- Package['heat-api'] -> Class['heat::policy']
- Package['heat-api'] -> Service['heat-api']
+ Package[$::heat::params::api_package_name] -> Heat_config<||>
+ Package[$::heat::params::api_package_name] -> Class['heat::policy']
+ Package[$::heat::params::api_package_name] -> Service['heat-api']
if $use_ssl {
if !$cert_file {
@@ -78,12 +88,6 @@ class heat::api (
}
}
- package { 'heat-api':
- ensure => $package_ensure,
- name => $::heat::params::api_package_name,
- tag => 'openstack',
- }
-
if $manage_service {
if $enabled {
$service_ensure = 'running'
@@ -99,7 +103,7 @@ class heat::api (
hasstatus => true,
hasrestart => true,
require => [Package['heat-common'],
- Package['heat-api']],
+ Package[$::heat::params::api_package_name]],
subscribe => $::heat::subscribe_sync_db,
}