openstack/puppet-tripleo
Code Issues Proposed changes

Pass mistral::api service_name from t-h-t

Browse Source 
In order to have the chicken-egg work, service_name had to be explicitly
passed to ::mistral::api. This switches to using values from t-h-t.

Change-Id: Ib94e51f863ba59a1a1db47d58aed3ba4e5fc9650
Depends-On: Ie98dd5061d92dbc3c15bdd8926b0e3d62cc471f6
This commit is contained in:
Brad P. Crochet 2017-04-26 13:46:17 -04:00
parent 732d878644
commit 5f0f850d78
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/profile/base/mistral/api.pp
View File

@ -75,19 +75,11 @@ class tripleo::profile::base::mistral::api (
}
if $step >= 3 {
# TODO: Cleanup when this passes t-h-t
class { '::mistral::api':
service_name => 'httpd',
}
include ::mistral::api
include ::apache::mod::ssl
class { '::mistral::wsgi::apache':
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,
# The following are temporary and will be passed via t-h-t
ssl => $enable_internal_tls,
servername => hiera("fqdn_${mistral_api_network}"),
bind_host => hiera('mistral::api::bind_host'),
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,
}
}
}