Move inclusion of ::manila::db::mysql in manila/api profile
In puppet-manila it is the api service performing db sync, not scheduler. This change moves ::manila::db::mysql (which creates the empty database and users) in the tripleo manila/api profile. Also moves rabbit config into a general manila base profile as that would be needed by the scheduler service as well. Change-Id: I2b537f735b8d1be8f39e8c274be3872b193c1014
This commit is contained in:
parent
ceccbfdd7b
commit
783929074b
|
@ -0,0 +1,50 @@
|
|||
# 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::manila
|
||||
#
|
||||
# Manila common profile for tripleo
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*bootstrap_node*]
|
||||
# (Optional) The hostname of the node responsible for bootstrapping tasks
|
||||
# Defaults to hiera('bootstrap_nodeid')
|
||||
#
|
||||
# [*step*]
|
||||
# (Optional) The current step of the deployment
|
||||
# Defaults to hiera('step')
|
||||
#
|
||||
# [*rabbit_hosts*]
|
||||
# list of the rabbbit host IPs
|
||||
# Defaults to hiera('rabbitmq_node_ips')
|
||||
|
||||
class tripleo::profile::base::manila (
|
||||
$bootstrap_node = hiera('bootstrap_nodeid', undef),
|
||||
$step = hiera('step'),
|
||||
$rabbit_hosts = hiera('rabbitmq_node_ips', undef),
|
||||
) {
|
||||
if $::hostname == downcase($bootstrap_node) {
|
||||
$sync_db = true
|
||||
} else {
|
||||
$sync_db = false
|
||||
}
|
||||
|
||||
if $step >= 4 or ($step >= 3 and $sync_db) {
|
||||
class { '::manila' :
|
||||
rabbit_hosts => $rabbit_hosts,
|
||||
}
|
||||
include ::manila::config
|
||||
}
|
||||
}
|
|
@ -18,24 +18,32 @@
|
|||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*bootstrap_node*]
|
||||
# (Optional) The hostname of the node responsible for bootstrapping tasks
|
||||
# Defaults to hiera('bootstrap_nodeid')
|
||||
#
|
||||
# [*step*]
|
||||
# (Optional) The current step in deployment. See tripleo-heat-templates
|
||||
# for more details.
|
||||
# Defaults to hiera('step')
|
||||
#
|
||||
# [*rabbit_hosts*]
|
||||
# list of the rabbbit host IPs
|
||||
# Defaults to hiera('rabbitmq_node_ips')
|
||||
|
||||
class tripleo::profile::base::manila::api (
|
||||
$step = hiera('step'),
|
||||
$rabbit_hosts = hiera('rabbitmq_node_ips', undef),
|
||||
$bootstrap_node = hiera('bootstrap_nodeid', undef),
|
||||
$step = hiera('step'),
|
||||
) {
|
||||
if $step >= 4 {
|
||||
class { '::manila' :
|
||||
rabbit_hosts => $rabbit_hosts,
|
||||
}
|
||||
if $::hostname == downcase($bootstrap_node) {
|
||||
$sync_db = true
|
||||
} else {
|
||||
$sync_db = false
|
||||
}
|
||||
|
||||
include ::tripleo::profile::base::manila
|
||||
|
||||
if $step >= 3 and $sync_db {
|
||||
include ::manila::db::mysql
|
||||
}
|
||||
|
||||
if $step >= 4 or ($step >= 3 and $sync_db) {
|
||||
include ::manila::api
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -18,34 +18,19 @@
|
|||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*bootstrap_node*]
|
||||
# (Optional) The hostname of the node responsible for bootstrapping tasks
|
||||
# Defaults to hiera('bootstrap_nodeid')
|
||||
#
|
||||
# [*step*]
|
||||
# (Optional) The current step in deployment. See tripleo-heat-templates
|
||||
# for more details.
|
||||
# Defaults to hiera('step')
|
||||
#
|
||||
class tripleo::profile::base::manila::scheduler (
|
||||
$bootstrap_node = hiera('bootstrap_nodeid', undef),
|
||||
$step = hiera('step'),
|
||||
$step = hiera('step'),
|
||||
) {
|
||||
if $::hostname == downcase($bootstrap_node) {
|
||||
$sync_db = true
|
||||
} else {
|
||||
$sync_db = false
|
||||
}
|
||||
|
||||
if $step >= 3 and $sync_db {
|
||||
include ::manila::db::mysql
|
||||
}
|
||||
include ::tripleo::profile::base::manila
|
||||
|
||||
if $step >= 4 {
|
||||
include ::manila::compute::nova
|
||||
include ::manila::network::neutron
|
||||
include ::manila::scheduler
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -26,8 +26,9 @@
|
|||
class tripleo::profile::base::manila::share (
|
||||
$step = hiera('step'),
|
||||
) {
|
||||
include ::tripleo::profile::base::manila
|
||||
|
||||
if $step >= 4 {
|
||||
include ::manila::share
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -46,11 +46,11 @@ class tripleo::profile::pacemaker::manila (
|
|||
stop => '/bin/true',
|
||||
}
|
||||
|
||||
if $step >= 4 {
|
||||
include ::tripleo::profile::base::manila::api
|
||||
include ::tripleo::profile::base::manila::scheduler
|
||||
include ::tripleo::profile::base::manila::share
|
||||
include ::tripleo::profile::base::manila::api
|
||||
include ::tripleo::profile::base::manila::scheduler
|
||||
include ::tripleo::profile::base::manila::share
|
||||
|
||||
if $step >= 4 {
|
||||
# manila generic:
|
||||
$manila_generic_enable = hiera('manila_generic_enable_backend', false)
|
||||
if $manila_generic_enable {
|
||||
|
|
Loading…
Reference in New Issue