openstack/puppet-tripleo
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2017-05-26 14:48:19 +00:00 committed by Gerrit Code Review
commit 019efc9378
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,
}
}
}