94f13e6608
The step is typically set with the hieradata setting an integer value:
{"step": 1}
However it would be useful for the value to be a string so that
substitutions are possible, for example:
{"step": "%{::step}"}
This change ensures the step parameter defaults to an integer by
calling Integer(hiera('step'))
This change was made by manually removing the undef defaults from
fluentd.pp, uchiwa.pp, and sensu.pp then bulk updating with:
find ./ -type f -print0 |xargs -0 sed -i "s/= hiera('step')/= Integer(hiera('step'))/"
Change-Id: I8a47ca53a7dea8391103abcb8960a97036a6f5b3
100 lines
3.4 KiB
Puppet
100 lines
3.4 KiB
Puppet
# 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::haproxy
|
|
#
|
|
# Loadbalancer profile for tripleo
|
|
#
|
|
# === Parameters
|
|
#
|
|
# [*enable_ssl*]
|
|
# (Optional) Whether SSL should be used for the connection to the server or
|
|
# not.
|
|
# Defaults to false
|
|
#
|
|
# [*mysql_read_default_file*]
|
|
# (Optional) Name of the file that will be passed to pymysql connection strings
|
|
# Defaults to '/etc/my.cnf.d/tripleo.cnf'
|
|
#
|
|
# [*mysql_read_default_group*]
|
|
# (Optional) Name of the ini section to be passed to pymysql connection strings
|
|
# Defaults to 'tripleo'
|
|
#
|
|
# [*mysql_client_bind_address*]
|
|
# (Optional) Client IP address of the host that will be written in the mysql_read_default_file
|
|
# Defaults to undef
|
|
#
|
|
# [*ssl_ca*]
|
|
# (Optional) The SSL CA file to use to verify the MySQL server's certificate.
|
|
# Defaults to '/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt'
|
|
#
|
|
# [*step*]
|
|
# (Optional) The current step in deployment. See tripleo-heat-templates
|
|
# for more details.
|
|
# Defaults to hiera('step')
|
|
#
|
|
class tripleo::profile::base::database::mysql::client (
|
|
$enable_ssl = false,
|
|
$mysql_read_default_file = '/etc/my.cnf.d/tripleo.cnf',
|
|
$mysql_read_default_group = 'tripleo',
|
|
$mysql_client_bind_address = undef,
|
|
$ssl_ca = '/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt',
|
|
$step = Integer(hiera('step')),
|
|
) {
|
|
if $step >= 1 {
|
|
# If the folder /etc/my.cnf.d does not exist (e.g. if mariadb is not
|
|
# present in the base image but installed as a package afterwards),
|
|
# create it. We do not want to touch the permissions in case it already
|
|
# exists due to the mariadb server package being pre-installed
|
|
# Note: We use exec instead of file in the case that the mysql class is
|
|
# included on this node as well (we'd get duplicate declaration in such a
|
|
# situation when using file)
|
|
if $mysql_client_bind_address {
|
|
$client_bind_changes = [
|
|
"set ${mysql_read_default_group}/bind-address '${mysql_client_bind_address}'"
|
|
]
|
|
} else {
|
|
$client_bind_changes = [
|
|
"rm ${mysql_read_default_group}/bind-address"
|
|
]
|
|
}
|
|
|
|
if $enable_ssl {
|
|
$changes_ssl = [
|
|
"set ${mysql_read_default_group}/ssl '1'",
|
|
"set ${mysql_read_default_group}/ssl-ca '${ssl_ca}'"
|
|
]
|
|
} else {
|
|
$changes_ssl = [
|
|
"rm ${mysql_read_default_group}/ssl",
|
|
"rm ${mysql_read_default_group}/ssl-ca"
|
|
]
|
|
}
|
|
|
|
$conf_changes = union($client_bind_changes, $changes_ssl)
|
|
|
|
# Create /etc/my.cnf.d/tripleo.cnf
|
|
exec { 'directory-create-etc-my.cnf.d':
|
|
command => 'mkdir -p /etc/my.cnf.d',
|
|
unless => 'test -d /etc/my.cnf.d',
|
|
path => ['/usr/bin', '/usr/sbin', '/bin', '/sbin'],
|
|
} ->
|
|
augeas { 'tripleo-mysql-client-conf':
|
|
incl => $mysql_read_default_file,
|
|
lens => 'Puppet.lns',
|
|
changes => $conf_changes,
|
|
}
|
|
}
|
|
}
|