Merge "Restart glance-glare service after installing murano-glance plugin"

This commit is contained in:
Jenkins 2016-11-03 13:03:44 +00:00 committed by Gerrit Code Review
commit 2ee501c3ab
2 changed files with 6 additions and 3 deletions

View File

@ -12,6 +12,11 @@ if has_key($murano_plugins, 'glance_artifacts_plugin') and $murano_plugins['glan
package {'murano-glance-artifacts-plugin':
ensure => 'latest',
}
include ::glance::params
ensure_resource('service', 'glance-glare',
{ ensure => running, name => $::glance::params::glare_service_name })
Package['murano-glance-artifacts-plugin'] ~> Service['glance-glare']
} else {
$use_glare = false
}
@ -27,8 +32,6 @@ include ::horizon::params
ensure_resource('service', 'httpd', {
'ensure' => 'running',
'enable' => true,
'restart' => true,
'name' => $::horizon::params::http_service,
})

View File

@ -99,7 +99,7 @@
type: puppet
groups: ['primary-controller','controller']
required_for: [murano-controller-end]
requires: [horizon]
requires: [horizon, glance]
condition:
yaql_exp: >
$.get('detach-murano', {}).get('metadata', {}).get('enabled', false) and