openstack
/
fuel-octane
Code Issues Proposed changes

Merge "Handle Murano installed by plugin"

This commit is contained in:
Jenkins 2016-09-23 22:20:40 +00:00 committed by Gerrit Code Review
parent 70862068c9 4eea18f781
commit 41e15426fc
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/octane_tasks/manifests/dbsync.pp
View File

@ -12,7 +12,7 @@ class octane_tasks::dbsync (
include ::cinder::db::sync
include ::heat::db::sync
if $octane_tasks::params::murano_enabled {
if $octane_tasks::params::murano_enabled or $octane_tasks::params::murano_plugin_enabled {
include ::murano::db::sync
}

29
deployment/puppet/octane_tasks/manifests/params.pp
View File

@ -4,19 +4,22 @@
#
class octane_tasks::params (
) {
$nova_hash = hiera_hash('nova')
$ceilometer_hash = hiera_hash('ceilometer', {'enabled' => false})
$sahara_hash = hiera_hash('sahara', {'enabled' => false})
$murano_hash = hiera_hash('murano', {'enabled' => false})
$ironic_hash = hiera_hash('ironic', {'enabled' => false})
$storage_hash = hiera_hash('storage', {})
$fuel_version = hiera('fuel_version', '9.0')
$nova_hash = hiera_hash('nova')
$ceilometer_hash = hiera_hash('ceilometer', {'enabled' => false})
$sahara_hash = hiera_hash('sahara', {'enabled' => false})
$murano_hash = hiera_hash('murano', {'enabled' => false})
$ironic_hash = hiera_hash('ironic', {'enabled' => false})
$storage_hash = hiera_hash('storage', {})
$fuel_version = hiera('fuel_version', '9.0')
$ceilometer_enabled = $ceilometer_hash['enabled']
$sahara_enabled = $sahara_hash['enabled']
$murano_enabled = $murano_hash['enabled']
$ironic_enabled = $ironic_hash['enabled']
$cinder_vol_on_ctrl = $storage_hash['volumes_ceph']
$murano_plugin_hash = hiera_hash('detach-murano', {'metadata' => {'enabled' => false} })
$ceilometer_enabled = $ceilometer_hash['enabled']
$sahara_enabled = $sahara_hash['enabled']
$murano_enabled = $murano_hash['enabled']
$murano_plugin_enabled = $murano_plugin_hash['metadata']['enabled']
$ironic_enabled = $ironic_hash['enabled']
$cinder_vol_on_ctrl = $storage_hash['volumes_ceph']
# Nova
$nova_services_list = [
@ -63,7 +66,7 @@ class octane_tasks::params (
]
# Murano
if $murano_enabled {
if $murano_enabled or $murano_plugin_enabled {
$murano_services_list = ['murano-api', 'murano-engine']
} else {
$murano_services_list = []