Graph-based upgrade-db. Ironic support.

It hasn't been tested in a lab with Ironic

Change-Id: I65f5bef8277d9786053b3447800c278b04cf62a7
This commit is contained in:
Pavel Chechetin 2016-08-19 11:17:50 +03:00
parent eb28c36bbd
commit dab67b9922
3 changed files with 21 additions and 4 deletions

View File

@ -19,6 +19,10 @@ class octane_tasks::dbsync (
include ::sahara::db::sync
}
if $ironic_enabled {
include ::ironic::db::sync
}
# All db sync classes have "refreshonly => true" by default
Exec <||> {
refreshonly => false

View File

@ -22,9 +22,13 @@ class octane_tasks::mysqldump_create inherits octane_tasks::params {
$murano_db = []
}
# TODO(pchechetin): Add Ironic support
if $ironic_enabled {
$ironic_db = ['ironic']
} else {
$ironic_db = []
}
$db_list = join(concat($os_base_dbs, $sahara_db, $murano_db), ' ')
$db_list = join(concat($os_base_dbs, $sahara_db, $murano_db, $ironic_db), ' ')
exec { 'backup_and_encrypt':
command => "mysqldump ${mysql_args} --databases ${db_list} | ${compress_and_enc_command}",

View File

@ -8,12 +8,14 @@ class octane_tasks::params (
$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']
# Nova
@ -74,7 +76,13 @@ class octane_tasks::params (
$sahara_services_list = []
}
# TODO(pchechetin): Add Ironic support
# Ironic
# NOTE(pchechetin): A list of services for Ironic support should be tested in a lab
if $ironic_enabled {
$ironic_services_list = ['ironic-api']
} else {
$ironic_services_list = []
}
# Pacemaker services
$cluster_services_list = [
@ -93,7 +101,8 @@ class octane_tasks::params (
$cinder_services_list,
$heat_services_list,
$murano_services_list,
$sahara_services_list
$sahara_services_list,
$ironic_services_list
)
# NOTE: Swift is not supported by Octane