From e284e21405e9d50bfe114178a955918eddfbfaee Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 22 Apr 2016 16:45:56 +0200 Subject: Move databases creation and sync with the role This change moves the database creation and sync with the role profile, so that it's only executed when the role is enabled and by the role itself. It also calls the non-pacemaker profiles out of the 'step' conditional because the non-pacemaker profiles know how to deal with 'step' already. Change-Id: I6c752cb53090e7ef8e0319bade462f2453ed7660 Related-Bug: 1572952 --- manifests/profile/pacemaker/database/schemas.pp | 65 ------------------------- 1 file changed, 65 deletions(-) delete mode 100644 manifests/profile/pacemaker/database/schemas.pp (limited to 'manifests/profile/pacemaker/database') diff --git a/manifests/profile/pacemaker/database/schemas.pp b/manifests/profile/pacemaker/database/schemas.pp deleted file mode 100644 index 489e75b..0000000 --- a/manifests/profile/pacemaker/database/schemas.pp +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2016 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# == Class: tripleo::profile::base::pacemaker::schemas -# -# OpenStack Database Schema Pacemaker HA profile for tripleo -# -# === Parameters -# -# [*step*] -# (Optional) The current deployment step -# Defaults to hiera('step') -# -# [*ceilometer_backend*] -# (Optional) The backend used by ceilometer, usually either 'mysql' -# or 'mongodb' -# Defaults to hiera('ceilometer_backend') -# -# [*gnocchi_indexer_backend*] -# (Optional) Type of backend used as Gnocchi indexer -# Defaults to hiera('gnocchi_indexer_backend') -# -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master in this cluster -# Defaults to hiera('bootstrap_nodeid') -# -class tripleo::profile::pacemaker::database::schemas ( - $step = hiera('step'), - $ceilometer_backend = hiera('ceilometer_backend'), - $gnocchi_indexer_backend = hiera('gnocchi_indexer_backend'), - $pacemaker_master = hiera('bootstrap_nodeid') -) { - if downcase($pacemaker_master) == $::hostname and $step >= 2 { - include ::tripleo::profile::base::database::schemas - - if downcase($ceilometer_backend) == 'mysql' { - Exec['galera-ready'] -> Class['::ceilometer::db::mysql'] - Exec['galera-ready'] -> Class['::aodh::db::mysql'] - } - - if downcase($gnocchi_indexer_backend) == 'mysql' { - Exec['galera-ready'] -> Class['::gnocchi::db::mysql'] - } - - Exec['galera-ready'] -> Class['::cinder::db::mysql'] - Exec['galera-ready'] -> Class['::glance::db::mysql'] - Exec['galera-ready'] -> Class['::keystone::db::mysql'] - Exec['galera-ready'] -> Class['::nova::db::mysql'] - Exec['galera-ready'] -> Class['::nova::db::mysql_api'] - Exec['galera-ready'] -> Class['::neutron::db::mysql'] - Exec['galera-ready'] -> Class['::heat::db::mysql'] - Exec['galera-ready'] -> Class['::sahara::db::mysql'] - } -} -- cgit 1.2.3-korg