Merge "Disable cfapi service provided by old plugin version"

This commit is contained in:
Jenkins 2016-10-10 11:46:58 +00:00 committed by Gerrit Code Review
commit fbd411cba9
1 changed files with 3 additions and 2 deletions

View File

@ -15,8 +15,9 @@ service { 'murano-engine':
name => $::murano::params::engine_service_name
}
$base_cfapi = hiera_hash('murano-cfapi', {})
if pick($base_cfapi['enabled'], false) {
$base_cfapi = hiera_hash('murano-cfapi', {})
$plugin_cfapi = hiera_hash('murano_cfapi_plugin', {})
if pick($base_cfapi['enabled'], false) or pick($plugin_cfapi['enabled'], false) {
service { 'murano-cfapi':
ensure => 'stopped',
name => $::murano::params::cfapi_service_name