openstack
/
puppet-tripleo
Code Issues Proposed changes

Fix parameters and headers inconsistency in the puppet manifests. 

As we are staring to manually check overcloud services
the first step is to check that the puppet profiles
are all aligned.

Changes applied:

  No logic added or removed in this submission.

  Removed unused parameters.

  Align header comments structure.

  All profiles parameters sorted following:
  "Mandatory params first sorted alphabetically
  then optional params sorted alphabetically."

Note: Following submissions will check pacemaker,
cinder, mistral and redis services in the base profiles
as some of them has the $pacemaker_master parameter
defaulted to true.

Change-Id: I2f91c3f6baa33f74b5625789eec83233179a9655
This commit is contained in:
Carlos Camacho 2016-08-05 11:54:25 +02:00
parent ac6c502a69
commit 689d80e971
129 changed files with 449 additions and 605 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/ceilometer/agent/central.pp
View File

@ -23,11 +23,9 @@
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::ceilometer::agent::central (
$step = hiera('step'),
) {
include ::tripleo::profile::base::ceilometer
if $step >= 4 {

2
manifests/profile/base/ceilometer/agent/compute.pp
View File

@ -23,11 +23,9 @@
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::ceilometer::agent::compute (
$step = hiera('step'),
) {
include ::tripleo::profile::base::ceilometer
if $step >= 4 {

2
manifests/profile/base/ceilometer/agent/notification.pp
View File

@ -23,11 +23,9 @@
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::ceilometer::agent::notification (
$step = hiera('step'),
) {
include ::tripleo::profile::base::ceilometer
if $step >= 4 {

2
manifests/profile/base/ceilometer/api.pp
View File

@ -23,11 +23,9 @@
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::ceilometer::api (
$step = hiera('step'),
) {
include ::tripleo::profile::base::ceilometer
if $step >= 4 {

2
manifests/profile/base/ceilometer/collector.pp
View File

@ -26,7 +26,7 @@
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::ceilometer::collector (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),

2
manifests/profile/base/ceilometer/expirer.pp
View File

@ -23,11 +23,9 @@
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::ceilometer::expirer (
$step = hiera('step'),
) {
include ::tripleo::profile::base::ceilometer
if $step >= 4 {

1
manifests/profile/base/ceph/client.pp
View File

@ -26,7 +26,6 @@
class tripleo::profile::base::ceph::client (
$step = hiera('step'),
) {
include ::tripleo::profile::base::ceph
if $step >= 2 {

1
manifests/profile/base/ceph/mon.pp
View File

@ -37,7 +37,6 @@ class tripleo::profile::base::ceph::mon (
$ceph_pools = {},
$step = hiera('step'),
) {
include ::tripleo::profile::base::ceph
if $step >= 2 {

1
manifests/profile/base/ceph/osd.pp
View File

@ -31,7 +31,6 @@ class tripleo::profile::base::ceph::osd (
$ceph_osd_selinux_permissive = false,
$step = hiera('step'),
) {
include ::tripleo::profile::base::ceph
if $step >= 3 {

1
manifests/profile/base/cinder.pp
View File

@ -37,7 +37,6 @@ class tripleo::profile::base::cinder (
$pacemaker_master = true,
$step = hiera('step'),
) {
if $step >= 4 or ($step >= 3 and $pacemaker_master) {
include ::cinder
include ::cinder::config

2
manifests/profile/base/cinder/api.pp
View File

@ -26,7 +26,7 @@
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::cinder::api (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),

1
manifests/profile/base/cinder/scheduler.pp
View File

@ -26,7 +26,6 @@
class tripleo::profile::base::cinder::scheduler (
$step = hiera('step'),
) {
include ::tripleo::profile::base::cinder
if $step >= 4 {

1
manifests/profile/base/cinder/volume.pp
View File

@ -61,7 +61,6 @@ class tripleo::profile::base::cinder::volume (
$cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef),
$step = hiera('step'),
) {
include ::tripleo::profile::base::cinder
if $step >= 4 {

1
manifests/profile/base/cinder/volume/dellsc.pp
View File

@ -31,7 +31,6 @@ class tripleo::profile::base::cinder::volume::dellsc (
$backend_name = hiera('cinder::backend::dellsc_iscsi::volume_backend_name', 'tripleo_dellsc'),
$step = hiera('step'),
) {
include ::tripleo::profile::base::cinder::volume
if $step >= 4 {

1
manifests/profile/base/cinder/volume/eqlx.pp
View File

@ -31,7 +31,6 @@ class tripleo::profile::base::cinder::volume::eqlx (
$backend_name = hiera('cinder::backend::eqlx::volume_backend_name', 'tripleo_eqlx'),
$step = hiera('step'),
) {
include ::tripleo::profile::base::cinder::volume
if $step >= 4 {

17
manifests/profile/base/cinder/volume/iscsi.pp
View File

@ -21,6 +21,10 @@
# [*cinder_iscsi_address*]
# The address where to bind the iscsi targets daemon
#
# [*backend_name*]
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_iscsi'
#
# [*cinder_iscsi_helper*]
# (Optional) The iscsi helper to use
# Defaults to 'tgtadm'
@ -29,10 +33,6 @@
# (Optional) The size (in MB) of the LVM loopback volume
# Defaults to '10280'
#
# [*backend_name*]
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_iscsi'
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
@ -40,12 +40,11 @@
#
class tripleo::profile::base::cinder::volume::iscsi (
$cinder_iscsi_address,
$cinder_iscsi_helper = 'tgtadm',
$cinder_lvm_loop_device_size = '10280',
$backend_name = hiera('cinder::backend::iscsi::volume_backend_name', 'tripleo_iscsi'),
$step = hiera('step'),
$backend_name = hiera('cinder::backend::iscsi::volume_backend_name', 'tripleo_iscsi'),
$cinder_iscsi_helper = 'tgtadm',
$cinder_lvm_loop_device_size = '10280',
$step = hiera('step'),
) {
include ::tripleo::profile::base::cinder::volume
if $step >= 4 {

1
manifests/profile/base/cinder/volume/netapp.pp
View File

@ -31,7 +31,6 @@ class tripleo::profile::base::cinder::volume::netapp (
$backend_name = hiera('cinder::backend::netapp::volume_backend_name', 'tripleo_netapp'),
$step = hiera('step'),
) {
include ::tripleo::profile::base::cinder::volume
if $step >= 4 {

11
manifests/profile/base/cinder/volume/nfs.pp
View File

@ -18,10 +18,6 @@
#
# === Parameters
#
# [*cinder_nfs_mount_options*]
# (Optional) List of mount options for the NFS share
# Defaults to ''
#
# [*cinder_nfs_servers*]
# List of NFS shares to mount
#
@ -29,18 +25,21 @@
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_nfs'
#
# [*cinder_nfs_mount_options*]
# (Optional) List of mount options for the NFS share
# Defaults to ''
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::cinder::volume::nfs (
$cinder_nfs_mount_options = '',
$cinder_nfs_servers,
$backend_name = hiera('cinder::backend::nfs::volume_backend_name', 'tripleo_nfs'),
$cinder_nfs_mount_options = '',
$step = hiera('step'),
) {
include ::tripleo::profile::base::cinder::volume
if $step >= 4 {

11
manifests/profile/base/cinder/volume/rbd.pp
View File

@ -18,6 +18,10 @@
#
# === Parameters
#
# [*backend_name*]
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_ceph'
#
# [*cinder_rbd_backend_host*]
# (Optional) String to use as backend_host in the backend stanza
# Defaults to 'cinder::host'
@ -34,24 +38,19 @@
# (Optional) The user name for the RBD client
# Defaults to 'openstack'
#
# [*backend_name*]
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_ceph'
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::cinder::volume::rbd (
$backend_name = hiera('cinder::backend::rbd::volume_backend_name', 'tripleo_ceph'),
$cinder_rbd_backend_host = hiera('cinder::host', 'hostgroup'),
$cinder_rbd_pool_name = 'volumes',
$cinder_rbd_secret_uuid = hiera('ceph::profile::params::fsid', undef),
$cinder_rbd_user_name = 'openstack',
$backend_name = hiera('cinder::backend::rbd::volume_backend_name', 'tripleo_ceph'),
$step = hiera('step'),
) {
include ::tripleo::profile::base::cinder::volume
if $step >= 4 {

5
manifests/profile/base/database/mongodb.pp
View File

@ -32,10 +32,9 @@
#
class tripleo::profile::base::database::mongodb (
$mongodb_replset,
$bootstrap_node = downcase(hiera('bootstrap_nodeid')),
$step = hiera('step'),
$bootstrap_node = downcase(hiera('bootstrap_nodeid')),
$step = hiera('step'),
) {
if $step >= 2 {
include ::mongodb::globals

9
manifests/profile/base/database/mongodbcommon.pp
View File

@ -18,18 +18,17 @@
#
# === Parameters
#
# [*mongodb_node_ips*]
# List of The mongodb node ip addresses
#
# [*mongodb_ipv6_enabled*]
# A boolean value for mongodb server ipv6 is enabled or not
# Defaults to false
#
# [*mongodb_node_ips*]
# List of The mongodb node ip addresses
#
class tripleo::profile::base::database::mongodbcommon (
$mongodb_node_ips = hiera('mongo_node_ips'),
$mongodb_ipv6_enabled = false,
$mongodb_node_ips = hiera('mongo_node_ips'),
) {
$port = '27017'
# NOTE(gfidente): the following vars are needed on all nodes so they

21
manifests/profile/base/database/mysql.pp
View File

@ -18,29 +18,30 @@
#
# === Parameters
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# [*manage_resources*]
# (Optional) Whether or not manage root user, root my.cnf, and service.
# Defaults to true
#
# [*mysql_server_options*]
# (Optional) Extras options to deploy MySQL. Useful when deploying Galera cluster.
# Should be an hash.
# Defaults to {}
#
# [*manage_resources*]
# (Optional) Whether or not manage root user, root my.cnf, and service.
# Defaults to true
#
# [*remove_default_accounts*]
# (Optional) Whether or not remove default MySQL accounts.
# Defaults to true
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::database::mysql (
$step = hiera('step'),
$mysql_server_options = {},
$manage_resources = true,
$mysql_server_options = {},
$remove_default_accounts = true,
$step = hiera('step'),
) {
validate_hash($mysql_server_options)

12
manifests/profile/base/database/redis.pp
View File

@ -18,26 +18,24 @@
#
# === Parameters
#
# [*redis_node_ips*]
# (Optional) List of Redis node ips
# Defaults to hiera('redis_node_ips')
#
# [*bootstrap_nodeid*]
# (Optional) Hostname of Redis master
# Defaults to hiera('bootstrap_nodeid')
#
# [*redis_node_ips*]
# (Optional) List of Redis node ips
# Defaults to hiera('redis_node_ips')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::database::redis (
$redis_node_ips = hiera('redis_node_ips'),
$bootstrap_nodeid = hiera('bootstrap_nodeid'),
$redis_node_ips = hiera('redis_node_ips'),
$step = hiera('step'),
) {
if $step >= 2 {
if $bootstrap_nodeid == $::hostname {
$slaveof = undef

10
manifests/profile/base/glance/api.pp
View File

@ -18,18 +18,18 @@
#
# === Parameters
#
# [*glance_backend*]
# (Optional) Glance backend(s) to use.
# Defaults to downcase(hiera('glance_backend', 'swift'))
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
# [*glance_backend*]
# (Optional) Glance backend(s) to use.
# Defaults to downcase(hiera('glance_backend', 'swift'))
#
class tripleo::profile::base::glance::api (
$step = hiera('step'),
$glance_backend = downcase(hiera('glance_backend', 'swift')),
$step = hiera('step'),
) {
if $step >= 4 {

10
manifests/profile/base/glance/registry.pp
View File

@ -22,19 +22,19 @@
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
# [*glance_backend*]
# (Optional) Glance backend(s) to use.
# Defaults to downcase(hiera('glance_backend', 'swift'))
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
# [*glance_backend*]
# (Optional) Glance backend(s) to use.
# Defaults to downcase(hiera('glance_backend', 'swift'))
class tripleo::profile::base::glance::registry (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),
$glance_backend = downcase(hiera('glance_backend', 'swift')),
$step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true

2
manifests/profile/base/gnocchi.pp
View File

@ -23,11 +23,9 @@
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::gnocchi (
$step = hiera('step'),
) {
if $step >= 3 {
include ::gnocchi
include ::gnocchi::config

12
manifests/profile/base/gnocchi/api.pp
View File

@ -18,22 +18,22 @@
#
# === Parameters
#
# [*gnocchi_backend*]
# (Optional) Gnocchi backend string file, swift or rbd
# Defaults to swift
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
# [*gnocchi_backend*]
# (Optional) Gnocchi backend string file, swift or rbd
# Defaults to swift
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::gnocchi::api (
$gnocchi_backend = downcase(hiera('gnocchi_backend', 'swift')),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$gnocchi_backend = downcase(hiera('gnocchi_backend', 'swift')),
$step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {

2
manifests/profile/base/gnocchi/metricd.pp
View File

@ -23,11 +23,9 @@
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::gnocchi::metricd (
$step = hiera('step'),
) {
include ::tripleo::profile::base::gnocchi
if $step >= 4 {

2
manifests/profile/base/gnocchi/statsd.pp
View File

@ -23,11 +23,9 @@
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::gnocchi::statsd (
$step = hiera('step'),
) {
include ::tripleo::profile::base::gnocchi
if $step >= 4 {

51
manifests/profile/base/haproxy.pp
View File

@ -18,27 +18,6 @@
#
# === Parameters
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
# [*enable_load_balancer*]
# (Optional) Whether or not loadbalancer is enabled.
# Defaults to hiera('enable_load_balancer', true).
#
# [*generate_service_certificates*]
# (Optional) Whether or not certmonger will generate certificates for
# HAProxy. This could be as many as specified by the $certificates_specs
# variable.
# Note that this doesn't configure the certificates in haproxy, it merely
# creates the certificates.
# Defaults to hiera('generate_service_certificate', false).
#
# [*certmonger_ca*]
# (Optional) The CA that certmonger will use to generate the certificates.
# Defaults to hiera('certmonger_ca', 'local').
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
# it will create.
@ -53,14 +32,34 @@
# principal: "haproxy/<undercloud fqdn>"
# Defaults to {}.
#
# [*certmonger_ca*]
# (Optional) The CA that certmonger will use to generate the certificates.
# Defaults to hiera('certmonger_ca', 'local').
#
# [*enable_load_balancer*]
# (Optional) Whether or not loadbalancer is enabled.
# Defaults to hiera('enable_load_balancer', true).
#
# [*generate_service_certificates*]
# (Optional) Whether or not certmonger will generate certificates for
# HAProxy. This could be as many as specified by the $certificates_specs
# variable.
# Note that this doesn't configure the certificates in haproxy, it merely
# creates the certificates.
# Defaults to hiera('generate_service_certificate', false).
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::haproxy (
$enable_load_balancer = hiera('enable_load_balancer', true),
$step = hiera('step'),
$generate_service_certificates = hiera('generate_service_certificates', false),
$certmonger_ca = hiera('certmonger_ca', 'local'),
$certificates_specs = {},
$certmonger_ca = hiera('certmonger_ca', 'local'),
$enable_load_balancer = hiera('enable_load_balancer', true),
$generate_service_certificates = hiera('generate_service_certificates', false),
$step = hiera('step'),
) {
if $step >= 1 {
if $enable_load_balancer {
if str2bool($generate_service_certificates) {

25
manifests/profile/base/heat.pp
View File

@ -18,15 +18,6 @@
#
# === Parameters
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
# [*notification_driver*]
# (Optional) Heat notification driver to use.
# Defaults to 'messaging'
#
# [*bootstrap_master*]
# (Optional) The hostname of the node responsible for bootstrapping
# Defaults to downcase(hiera('bootstrap_nodeid'))
@ -35,13 +26,21 @@
# (Optional) Whether keystone token flushing should be enabled
# Defaults to hiera('keystone_enable_db_purge', true)
#
# [*notification_driver*]
# (Optional) Heat notification driver to use.
# Defaults to 'messaging'
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::heat (
$step = hiera('step'),
$bootstrap_master = downcase(hiera('bootstrap_nodeid')),
$manage_db_purge = hiera('heat_enable_db_purge', true),
$notification_driver = 'messaging',
$bootstrap_master = downcase(hiera('bootstrap_nodeid')),
$manage_db_purge = hiera('heat_enable_db_purge', true),
$step = hiera('step'),
) {
# Domain resources will be created at step5 on the pacemaker_master so we
# configure heat.conf at step3 and 4 but actually create the domain later.
if $step == 3 or $step == 4 {

3
manifests/profile/base/heat/api.pp
View File

@ -24,9 +24,8 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::heat::api (
$step = hiera('step'),
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::heat
include ::heat::api

3
manifests/profile/base/heat/api_cfn.pp
View File

@ -24,9 +24,8 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::heat::api_cfn (
$step = hiera('step'),
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::heat
include ::heat::api_cfn

3
manifests/profile/base/heat/api_cloudwatch.pp
View File

@ -24,9 +24,8 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::heat::api_cloudwatch (
$step = hiera('step'),
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::heat
include ::heat::api_cloudwatch

2
manifests/profile/base/heat/engine.pp
View File

@ -26,7 +26,7 @@
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::heat::engine (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),

2
manifests/profile/base/ironic.pp
View File

@ -25,7 +25,7 @@
# [*step*]
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
class tripleo::profile::base::ironic (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),

4
manifests/profile/base/ironic/api.pp
View File

@ -23,10 +23,10 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::ironic::api (
$step = hiera('step'),
$step = hiera('step'),
) {
include ::tripleo::profile::base::ironic
if $step >= 4 {
include ::ironic::api
}

3
manifests/profile/base/ironic/conductor.pp
View File

@ -23,9 +23,8 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::ironic::conductor (
$step = hiera('step'),
$step = hiera('step'),
) {
include ::tripleo::profile::base::ironic
if $step >= 4 {

10
manifests/profile/base/keepalived.pp
View File

@ -18,25 +18,23 @@
#
# === Parameters
#
# [*enable_load_balancer*]
# (Optional) Whether or not loadbalancer is enabled.
# Defaults to hiera('enable_load_balancer', true).
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
# [*enable_load_balancer*]
# (Optional) Whether or not loadbalancer is enabled.
# Defaults to hiera('enable_load_balancer', true).
#
class tripleo::profile::base::keepalived (
$enable_load_balancer = hiera('enable_load_balancer', true),
$step = hiera('step'),
) {
if $step >= 1 {
if $enable_load_balancer and hiera('enable_keepalived', true){
include ::tripleo::keepalived
}
}
}

12
manifests/profile/base/keystone.pp
View File

@ -18,22 +18,22 @@
#
# === Parameters
#
# [*manage_db_purge*]
# (Optional) Whether keystone token flushing should be enabled
# Defaults to hiera('keystone_enable_db_purge', true)
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
# [*manage_db_purge*]
# (Optional) Whether keystone token flushing should be enabled
# Defaults to hiera('keystone_enable_db_purge', true)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::keystone (
$manage_db_purge = hiera('keystone_enable_db_purge', true),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$manage_db_purge = hiera('keystone_enable_db_purge', true),
$step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {

3
manifests/profile/base/manila/api.pp
View File

@ -24,9 +24,8 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::manila::api (
$step = hiera('step'),
$step = hiera('step'),
) {
if $step >= 4 {
include ::manila
include ::manila::api

2
manifests/profile/base/manila/scheduler.pp
View File

@ -26,7 +26,7 @@
# (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'),

4
manifests/profile/base/manila/share.pp
View File

@ -24,12 +24,10 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::manila::share (
$step = hiera('step'),
$step = hiera('step'),
) {
if $step >= 4 {
include ::manila::share
}
}

4
manifests/profile/base/memcached.pp
View File

@ -23,11 +23,9 @@
# for more details.
# Defaults to hiera('step')
#
#
class tripleo::profile::base::memcached (
$step = hiera('step'),
$step = hiera('step'),
) {
if $step >= 1 {
include ::memcached
}

11
manifests/profile/base/mistral.pp
View File

@ -18,20 +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')
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
class tripleo::profile::base::mistral (
$step = hiera('step'),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {

11
manifests/profile/base/mistral/api.pp
View File

@ -18,20 +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')
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
class tripleo::profile::base::mistral::api (
$step = hiera('step'),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {

11
manifests/profile/base/mistral/engine.pp
View File

@ -18,20 +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')
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
class tripleo::profile::base::mistral::engine (
$step = hiera('step'),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {

13
manifests/profile/base/mistral/executor.pp
View File

@ -18,21 +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')
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
class tripleo::profile::base::mistral::executor (
$step = hiera('step'),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
@ -44,5 +42,4 @@ class tripleo::profile::base::mistral::executor (
if $step >= 4 and $sync_db {
include ::mistral::executor
}
}

1
manifests/profile/base/monitoring/fluentd.pp
View File

@ -25,7 +25,6 @@
class tripleo::profile::base::monitoring::fluentd (
$step = hiera('step', undef)
) {
if $step == undef or $step >= 3 {
include ::fluentd

16
manifests/profile/base/monitoring/rabbitmq.pp
View File

@ -18,22 +18,22 @@
#
# === Parameters
#
# [*vhost*]
# (Optional) String. RabbitMQ vhost to be used by Sensu
# Defaults to '/sensu'
# [*password*]
# (Optional) String. Password to connect to RabbitMQ server
# Defaults to hiera('rabbit_password', undef)
#
# [*user*]
# (Optional) String. Username to connect to RabbitMQ server
# Defaults to hiera('rabbit_username', 'sensu')
#
# [*password*]
# (Optional) String. Password to connect to RabbitMQ server
# Defaults to hiera('rabbit_password', undef)
# [*vhost*]
# (Optional) String. RabbitMQ vhost to be used by Sensu
# Defaults to '/sensu'
#
class tripleo::profile::base::monitoring::rabbitmq (
$vhost = hiera('monitoring_rabbitmq_vhost', '/sensu'),
$user = hiera('monitoring_rabbitmq_username', 'sensu'),
$password = hiera('monitoring_rabbitmq_password', undef),
$user = hiera('monitoring_rabbitmq_username', 'sensu'),
$vhost = hiera('monitoring_rabbitmq_vhost', '/sensu'),
) {
rabbitmq_vhost { 'sensu-rabbit-vhost':
ensure => present,

2
manifests/profile/base/monitoring/sensu.pp
View File

@ -25,10 +25,8 @@
class tripleo::profile::base::monitoring::sensu (
$step = hiera('step', undef),
) {
if $step == undef or $step >= 3 {
include ::sensu
package { 'osops-tools-monitoring-oschecks':
ensure => 'present'
}

1
manifests/profile/base/monitoring/uchiwa.pp
View File

@ -25,7 +25,6 @@
class tripleo::profile::base::monitoring::uchiwa (
$step = hiera('step', undef),
) {
if $step == undef or $step >= 3 {
include ::uchiwa
}

18
manifests/profile/base/neutron/agents/midonet.pp
View File

@ -18,26 +18,24 @@
#
# === Parameters
#
# [*neutron_api_node_ips*]
# (Optional) The IPs of the Neutron API hosts
# Defaults to hiera('neutron_api_node_ips')
#
# [*midonet_libvirt_qemu_data*]
# (Optional) qemu.conf data for midonet.
# Defaults to hiera('midonet_libvirt_qemu_data')
#
# [*neutron_api_node_ips*]
# (Optional) The IPs of the Neutron API hosts
# Defaults to hiera('neutron_api_node_ips')
#
# [*step*]
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::agents::midonet (
$neutron_api_node_ips = hiera('neutron_api_node_ips', ''),
$midonet_libvirt_qemu_data = hiera('midonet_libvirt_qemu_data', ''),
$step = hiera('step'),
$midonet_libvirt_qemu_data = hiera('midonet_libvirt_qemu_data', ''),
$neutron_api_node_ips = hiera('neutron_api_node_ips', ''),
$step = hiera('step'),
) {
if $step >= 4 {
# TODO(devvesa) provide non-controller ips for these services
class { '::tripleo::network::midonet::agent':
zookeeper_servers => $neutron_api_node_ips,
@ -50,7 +48,5 @@ class tripleo::profile::base::neutron::agents::midonet (
content => hiera('midonet_libvirt_qemu_data')
}
}
}
}

34
manifests/profile/base/neutron/agents/nuage.pp
View File

@ -18,36 +18,34 @@
#
# === Parameters
#
# [*nova_os_tenant_name*]
# (Optional) Nova tenant name
# Defaults to hiera('nova_os_tenant_name')
#
# [*nova_os_password*]
# (Optional) Nova password
# Defaults to hiera('nova_password')
# [*nova_auth_ip*]
# (Optional) Nova auth IP
# Defaults to hiera('keystone_public_api_virtual_ip')
#
# [*nova_metadata_ip*]
# (Optional) Nova metadata node IPs
# Defaults to hiera('nova_metadata_node_ips')
#
# [*nova_auth_ip*]
# (Optional) Nova auth IP
# Defaults to hiera('keystone_public_api_virtual_ip')
# [*nova_os_password*]
# (Optional) Nova password
# Defaults to hiera('nova_password')
#
# [*nova_os_tenant_name*]
# (Optional) Nova tenant name
# Defaults to hiera('nova_os_tenant_name')
#
# [*step*]
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::agents::nuage (
$nova_os_tenant_name = hiera('nova::api::admin_tenant_name', ''),
$nova_os_password = hiera('nova_password', ''),
$nova_metadata_ip = hiera('nova_metadata_node_ips', ''),
$nova_auth_ip = hiera('keystone_public_api_virtual_ip', ''),
$step = hiera('step'),
$nova_auth_ip = hiera('keystone_public_api_virtual_ip', ''),
$nova_metadata_ip = hiera('nova_metadata_node_ips', ''),
$nova_os_password = hiera('nova_password', ''),
$nova_os_tenant_name = hiera('nova::api::admin_tenant_name', ''),
$step = hiera('step'),
) {
if $step >= 4 {
include ::nuage::vrs
class { '::nuage::metadataagent':
@ -56,7 +54,5 @@ class tripleo::profile::base::neutron::agents::nuage (
nova_metadata_ip => $nova_metadata_ip,
nova_auth_ip => $nova_auth_ip,
}
}
}

2
manifests/profile/base/neutron/dhcp.pp
View File

@ -24,7 +24,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::dhcp (
$step = hiera('step'),
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::neutron

6
manifests/profile/base/neutron/l3.pp
View File

@ -18,17 +18,13 @@
#
# === Parameters
#
# [*neutron_ovs_use_veth*]
# (Optional) Whether to set ovs_use_veth (for older kernel support)
# Defaults to hiera('neutron_ovs_use_veth', false)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::l3 (
$step = hiera('step'),
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::neutron

2
manifests/profile/base/neutron/metadata.pp
View File

@ -24,7 +24,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::metadata (
$step = hiera('step'),
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::neutron

84
manifests/profile/base/neutron/midonet.pp
View File

@ -18,14 +18,42 @@
#
# === Parameters
#
# [*vip*]
# (Optional) Public Virtual IP Address for this cloud
# Defaults to hiera('public_virtual_ip')
# [*admin_password*]
# (Optional) Admin Password for Midonet API
# Defaults to hiera('admin_password')
#
# [*bind_address*]
# (Optional) The address to bind Cassandra and Midonet API to
# Defaults to hiera('neutron::bind_host')
#
# [*keystone_admin_token*]
# (Optional) The Keystone Admin Token
# Defaults to hiera('keystone::admin_token')
#
# [*neutron_api_node_ips*]
# (Optional) The IPs of the Neutron API hosts
# Defaults to hiera('neutron_api_node_ips')
#
# [*neutron_auth_password*]
# (Optional) Password to use for Neutron authentication
# Defaults to hiera('neutron::server::auth_password')
#
# [*neutron_auth_tenant*]
# (Optional) Tenant to use for Neutron authentication
# Defaults to hiera('neutron::server::auth_tenant')
#
# [*step*]
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
# [*vip*]
# (Optional) Public Virtual IP Address for this cloud
# Defaults to hiera('public_virtual_ip')
#
# [*zk_on_controller*]
# (Optional) Whether to put zookeeper on the controllers
# Defaults to hiera('enable_zookeeper_on_controller')
#
# [*zookeeper_client_ip*]
# (Optional) The IP of the Zookeeper Client
# Defaults to hiera('neutron::bind_host')
@ -34,53 +62,19 @@
# (Optional) The IPs of the Zookeeper Servers
# Defaults to hiera('controller_node_names')
#
# [*neutron_api_node_ips*]
# (Optional) The IPs of the Neutron API hosts
# Defaults to hiera('neutron_api_node_ips')
#
# [*bind_address*]
# (Optional) The address to bind Cassandra and Midonet API to
# Defaults to hiera('neutron::bind_host')
#
# [*admin_password*]
# (Optional) Admin Password for Midonet API
# Defaults to hiera('admin_password')
#
# [*zk_on_controller*]
# (Optional) Whether to put zookeeper on the controllers
# Defaults to hiera('enable_zookeeper_on_controller')
#
# [*neutron_auth_tenant*]
# (Optional) Tenant to use for Neutron authentication
# Defaults to hiera('neutron::server::auth_tenant')
#
# [*neutron_auth_password*]
# (Optional) Password to use for Neutron authentication
# Defaults to hiera('neutron::server::auth_password')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
# [*step*]
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::midonet (
$vip = hiera('public_virtual_ip'),
$admin_password = hiera('admin_password', ''),
$bind_address = hiera('neutron::bind_host', ''),
$keystone_admin_token = hiera('keystone::admin_token', ''),
$neutron_api_node_ips = hiera('neutron_api_node_ips', ''),
$neutron_auth_password = hiera('neutron::server::auth_password', ''),
$neutron_auth_tenant = hiera('neutron::server::auth_tenant', ''),
$step = hiera('step'),
$vip = hiera('public_virtual_ip'),
$zk_on_controller = hiera('enable_zookeeper_on_controller', ''),
$zookeeper_client_ip = hiera('neutron::bind_host', ''),
$zookeeper_hostnames = hiera('controller_node_names', ''),
$neutron_api_node_ips = hiera('neutron_api_node_ips', ''),
$bind_address = hiera('neutron::bind_host', ''),
$admin_password = hiera('admin_password', ''),
$zk_on_controller = hiera('enable_zookeeper_on_controller', ''),
$neutron_auth_tenant = hiera('neutron::server::auth_tenant', ''),
$neutron_auth_password = hiera('neutron::server::auth_password', ''),
$step = hiera('step'),
) {
include ::tripleo::profile::base::neutron
include ::tripleo::profile::base::neutron::agents::midonet

1
manifests/profile/base/neutron/ovs.pp
View File

@ -26,7 +26,6 @@
class tripleo::profile::base::neutron::ovs(
$step = hiera('step'),
) {
include ::tripleo::profile::base::neutron
if $step >= 4 {

16
manifests/profile/base/neutron/plugins/ml2.pp
View File

@ -18,23 +18,23 @@
#
# === Parameters
#
# [*mechanism_drivers*]
# (Optional) The mechanism drivers to use with the Ml2 plugin
# Defaults to hiera('neutron::plugins::ml2::mechanism_drivers')
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
# [*mechanism_drivers*]
# (Optional) The mechanism drivers to use with the Ml2 plugin
# Defaults to hiera('neutron::plugins::ml2::mechanism_drivers')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::plugins::ml2 (
$mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
$step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true

2
manifests/profile/base/neutron/plugins/nuage.pp
View File

@ -24,7 +24,7 @@
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::plugins::nuage (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),

2
manifests/profile/base/neutron/plugins/opencontrail.pp
View File

@ -24,7 +24,7 @@
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::plugins::opencontrail (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),

2
manifests/profile/base/neutron/plugins/plumgrid.pp
View File

@ -26,7 +26,7 @@
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::plugins::plumgrid (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),

18
manifests/profile/base/nova.pp
View File

@ -22,28 +22,28 @@
# (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')
# [*libvirt_enabled*]
# (Optional) Whether or not Libvirt is enabled.
# Defaults to false
#
# [*manage_migration*]
# (Optional) Whether or not manage Nova Live migration
# Defaults to false
#
# [*libvirt_enabled*]
# (Optional) Whether or not Libvirt is enabled.
# Defaults to false
#
# [*nova_compute_enabled*]
# (Optional) Whether or not nova-compute is enabled.
# Defaults to false
#
# [*step*]
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
class tripleo::profile::base::nova (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),
$manage_migration = false,
$libvirt_enabled = false,
$manage_migration = false,
$nova_compute_enabled = false,
$step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true

2
manifests/profile/base/nova/compute/ironic.pp
View File

@ -26,11 +26,9 @@
class tripleo::profile::base::nova::compute::ironic (
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::nova::compute
include ::nova::compute::ironic
include ::nova::network::neutron
}
}

1
manifests/profile/base/nova/compute/libvirt.pp
View File

@ -26,7 +26,6 @@
class tripleo::profile::base::nova::compute::libvirt (
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::nova::compute

2
manifests/profile/base/nova/conductor.pp
View File

@ -26,10 +26,8 @@
class tripleo::profile::base::nova::conductor (
$step = hiera('step'),
) {
include ::tripleo::profile::base::nova
if $step >= 4 {
include ::nova::conductor
}
}

2
manifests/profile/base/nova/consoleauth.pp
View File

@ -26,10 +26,8 @@
class tripleo::profile::base::nova::consoleauth (
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::nova
include ::nova::consoleauth
}
}

1
manifests/profile/base/nova/libvirt.pp
View File

@ -26,7 +26,6 @@
class tripleo::profile::base::nova::libvirt (
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::nova
include ::nova::compute::libvirt::services

2
manifests/profile/base/nova/scheduler.pp
View File

@ -26,11 +26,9 @@
class tripleo::profile::base::nova::scheduler (
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::nova
include ::nova::scheduler
include ::nova::scheduler::filter
}
}

2
manifests/profile/base/nova/vncproxy.pp
View File

@ -26,10 +26,8 @@
class tripleo::profile::base::nova::vncproxy (
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::nova
include ::nova::vncproxy
}
}

1
manifests/profile/base/pacemaker.pp
View File

@ -26,7 +26,6 @@
class tripleo::profile::base::pacemaker (
$step = hiera('step'),
) {
Pcmk_resource <| |> {
tries => 10,
try_sleep => 3,

29
manifests/profile/base/rabbitmq.pp
View File

@ -18,25 +18,25 @@
#
# === Parameters
#
# [*nodes*]
# (Optional) Array of host(s) for RabbitMQ nodes.
# Defaults to hiera('rabbit_node_ips', []).
#
# [*ipv6*]
# (Optional) Whether to deploy RabbitMQ on IPv6 network.
# Defaults to str2bool(hiera('rabbit_ipv6', false)).
# [*config_variables*]
# (Optional) RabbitMQ environment.
# Defaults to hiera('rabbitmq_config_variables').
#
# [*environment*]
# (Optional) RabbitMQ environment.
# Defaults to hiera('rabbitmq_environment').
#
# [*ipv6*]
# (Optional) Whether to deploy RabbitMQ on IPv6 network.
# Defaults to str2bool(hiera('rabbit_ipv6', false)).
#
# [*kernel_variables*]
# (Optional) RabbitMQ environment.
# Defaults to hiera('rabbitmq_environment').
#
# [*config_variables*]
# (Optional) RabbitMQ environment.
# Defaults to hiera('rabbitmq_config_variables').
# [*nodes*]
# (Optional) Array of host(s) for RabbitMQ nodes.
# Defaults to hiera('rabbit_node_ips', []).
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -44,14 +44,13 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::rabbitmq (
$nodes = hiera('rabbit_node_ips', []),
$ipv6 = str2bool(hiera('rabbit_ipv6', false)),
$environment = hiera('rabbitmq_environment'),
$kernel_variables = hiera('rabbitmq_kernel_variables'),
$config_variables = hiera('rabbitmq_config_variables'),
$environment = hiera('rabbitmq_environment'),
$ipv6 = str2bool(hiera('rabbit_ipv6', false)),
$kernel_variables = hiera('rabbitmq_kernel_variables'),
$nodes = hiera('rabbit_node_ips', []),
$step = hiera('step'),
) {
# IPv6 environment, necessary for RabbitMQ.
if $ipv6 {
$rabbit_env = merge($environment, {

2
manifests/profile/base/sahara/api.pp
View File

@ -24,7 +24,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::sahara::api (
$step = hiera('step'),
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::sahara

2
manifests/profile/base/sahara/engine.pp
View File

@ -26,7 +26,7 @@
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::sahara::engine (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),

19
manifests/profile/base/snmp.pp
View File

@ -18,25 +18,24 @@
#
# === Parameters
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# [*snmpd_password*]
# The SNMP password
# Defaults to hiera('snmpd_readonly_user_password')
#
# [*snmpd_user*]
# The SNMP username
# Defaults to hiera('snmpd_readonly_user_name')
#
# [*snmpd_password*]
# The SNMP password
# Defaults to hiera('snmpd_readonly_user_password')
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::snmp (
$step = hiera('step'),
$snmpd_user = hiera('snmpd_readonly_user_name'),
$snmpd_password = hiera('snmpd_readonly_user_password'),
$snmpd_user = hiera('snmpd_readonly_user_name'),
$step = hiera('step'),
) {
if $step >= 4 {
snmp::snmpv3_user { $snmpd_user:
authtype => 'MD5',

3
manifests/profile/base/swift/add_devices.pp
View File

@ -20,11 +20,10 @@
#
# [*swift_zones*]
# (Optional) The number of swift zones.
#
define tripleo::profile::base::swift::add_devices(
$swift_zones = '1'
){
# NOTE(dprince): Swift zones is not yet properly wired into the Heat
# templates. See: https://review.openstack.org/#/c/97758/3
# For now our regex supports the r1z1-192.0.2.6:%PORT%/d1 syntax or the

2
manifests/profile/base/swift/proxy.pp
View File

@ -23,11 +23,9 @@
# for more details.
# Defaults to hiera('step')
#
#
class tripleo::profile::base::swift::proxy (
$step = hiera('step'),
) {
if $step >= 4 {
include ::swift::proxy
include ::swift::proxy::proxy_logging

39
manifests/profile/base/swift/ringbuilder.pp
View File

@ -18,30 +18,33 @@
#
# === Parameters
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# [*swift_zones*]
# (Optional) The swift zones
# Defaults to 1
# [*replicas*]
# replicas
#
# [*build_ring*] = true,
# (Optional) Whether to build the ring
# Defaults to true
#
# [*devices*]
# (Optional) The swift devices
# Defaults to ''
# [*build_ring*] = true,
# (Optional) Whether to build the ring
# Defaults to true
# [*replicas*]
# replicas
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
# [*swift_zones*]
# (Optional) The swift zones
# Defaults to 1
#
class tripleo::profile::base::swift::ringbuilder (
$step = hiera('step'),
$swift_zones = '1',
$devices = '',
$build_ring = true,
$replicas,
$build_ring = true,
$devices = '',
$step = hiera('step'),
$swift_zones = '1',
) {
if $step >= 2 {
# pre-install swift here so we can build rings
include ::swift

11
manifests/profile/base/swift/storage.pp
View File

@ -18,21 +18,20 @@
#
# === Parameters
#
# [*enable_swift_storage*]
# (Optional) enable_swift_storage
# Deprecated: defaults to true
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
# [*enable_swift_storage*]
# (Optional) enable_swift_storage
# Deprecated: defaults to true
#
class tripleo::profile::base::swift::storage (
$step = hiera('step'),
# Deprecated conditional to support ControllerEnableSwiftStorage parameter
$enable_swift_storage = true,
$step = hiera('step'),
) {
if $step >= 4 {
if $enable_swift_storage {
include ::swift::storage::all

2
manifests/profile/base/trove/api.pp
View File

@ -26,7 +26,7 @@
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::trove::api (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),

1
manifests/profile/pacemaker/apache.pp
View File

@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::apache (
$bootstrap_node = hiera('bootstrap_nodeid'),
$step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {

1
manifests/profile/pacemaker/ceilometer.pp
View File

@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::ceilometer (
$bootstrap_node = hiera('bootstrap_nodeid'),
$step = hiera('step'),
) {
include ::tripleo::profile::base::ceilometer
$ceilometer_backend = downcase(hiera('ceilometer_backend', 'mongodb'))

1
manifests/profile/pacemaker/ceilometer/agent/central.pp
View File

@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::ceilometer::agent::central (
$pacemaker_master = hiera('bootstrap_nodeid'),
$step = hiera('step'),
) {
include ::ceilometer::params
include ::tripleo::profile::pacemaker::ceilometer
include ::tripleo::profile::base::ceilometer::agent::central

1
manifests/profile/pacemaker/ceilometer/agent/notification.pp
View File

@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::ceilometer::agent::notification (
$pacemaker_master = hiera('bootstrap_nodeid'),
$step = hiera('step'),
) {
include ::ceilometer::params
include ::tripleo::profile::pacemaker::ceilometer
include ::tripleo::profile::base::ceilometer::agent::notification

1
manifests/profile/pacemaker/ceilometer/api.pp
View File

@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::ceilometer::api (
$pacemaker_master = hiera('bootstrap_nodeid'),
$step = hiera('step'),
) {
include ::ceilometer::params
include ::tripleo::profile::pacemaker::ceilometer
include ::tripleo::profile::base::ceilometer::api

7
manifests/profile/pacemaker/ceilometer/collector.pp
View File

@ -27,19 +27,12 @@
# for more details.
# Defaults to hiera('step')
#
# [*sync_db*]
# (Optional) Whether to run db sync
# Defaults to undef
#
class tripleo::profile::pacemaker::ceilometer::collector (
$pacemaker_master = hiera('bootstrap_nodeid'),
$step = hiera('step'),
$sync_db = true,
) {
include ::ceilometer::params
include ::tripleo::profile::pacemaker::ceilometer
include ::tripleo::profile::base::ceilometer::collector
if $step >= 5 and downcase($::hostname) == $pacemaker_master {

1
manifests/profile/pacemaker/cinder/api.pp
View File

@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::cinder::api (
$bootstrap_node = hiera('bootstrap_nodeid'),
$step = hiera('step'),
) {
Service <| tag == 'cinder-service' |> {
hasrestart => true,
restart => '/bin/true',

1
manifests/profile/pacemaker/cinder/scheduler.pp
View File

@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::cinder::scheduler (
$bootstrap_node = hiera('bootstrap_nodeid'),
$step = hiera('step'),
) {
Service <| tag == 'cinder-service' |> {
hasrestart => true,
restart => '/bin/true',

1
manifests/profile/pacemaker/cinder/volume.pp
View File

@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::cinder::volume (
$bootstrap_node = hiera('bootstrap_nodeid'),
$step = hiera('step'),
) {
Service <| tag == 'cinder::volume' |> {
hasrestart => true,
restart => '/bin/true',

5
manifests/profile/pacemaker/core.pp
View File

@ -28,10 +28,9 @@
# Defaults to hiera('step')
#
class tripleo::profile::pacemaker::core (
$bootstrap_node = hiera('bootstrap_nodeid'),
$step = hiera('step'),
$bootstrap_node = hiera('bootstrap_nodeid'),
$step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {

5
manifests/profile/pacemaker/database/mongodb.pp
View File

@ -32,10 +32,9 @@
#
class tripleo::profile::pacemaker::database::mongodb (
$mongodb_replset,
$bootstrap_node = hiera('bootstrap_nodeid'),
$step = hiera('step'),
$bootstrap_node = hiera('bootstrap_nodeid'),
$step = hiera('step'),
) {
if $step >= 1 {
include ::mongodb::globals
include ::mongodb::client

1
manifests/profile/pacemaker/database/mysql.pp
View File

@ -26,7 +26,6 @@
class tripleo::profile::pacemaker::database::mysql (
$step = hiera('step'),
) {
if $::hostname == downcase(hiera('bootstrap_nodeid')) {
$pacemaker_master = true
} else {

1
manifests/profile/pacemaker/database/redis.pp
View File

@ -31,7 +31,6 @@
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::pacemaker::database::redis (
$bootstrap_node = hiera('bootstrap_nodeid'),
$enable_load_balancer = hiera('enable_load_balancer', true),

23
manifests/profile/pacemaker/glance.pp
View File

@ -22,19 +22,10 @@
# (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')
#
# [*glance_backend*]
# (Optional) Glance backend(s) to use.
# Defaults to downcase(hiera('glance_backend', 'swift'))
#
# [*glance_file_pcmk_manage*]
# (Optional) Whether or not manage glance_file_pcmk.
# Defaults to hiera('glance_file_pcmk_manage', false)
#
# [*glance_file_pcmk_device*]
# (Optional) Device to mount glance file backend.
# Defaults to hiera('glance_file_pcmk_device', '')
@ -47,21 +38,29 @@
# (Optional) Filesystem type to mount glance file backend.
# Defaults to hiera('glance_file_pcmk_fstype', '')
#
# [*glance_file_pcmk_manage*]
# (Optional) Whether or not manage glance_file_pcmk.
# Defaults to hiera('glance_file_pcmk_manage', false)
#
# [*glance_file_pcmk_options*]
# (Optional) pcmk options to mount Glance file backend..
# Defaults to hiera('glance_file_pcmk_options', '')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::pacemaker::glance (
$bootstrap_node = hiera('bootstrap_nodeid'),
$step = hiera('step'),
$glance_backend = downcase(hiera('glance_backend', 'swift')),
$glance_file_pcmk_manage = hiera('glance_file_pcmk_manage', false),
$glance_file_pcmk_device = hiera('glance_file_pcmk_device', ''),
$glance_file_pcmk_directory = hiera('glance_file_pcmk_directory', ''),
$glance_file_pcmk_fstype = hiera('glance_file_pcmk_fstype', ''),
$glance_file_pcmk_manage = hiera('glance_file_pcmk_manage', false),
$glance_file_pcmk_options = hiera('glance_file_pcmk_options', ''),
$step = hiera('step'),
) {
Service <| tag == 'glance-service' |> {
hasrestart => true,
restart => '/bin/true',

14
manifests/profile/pacemaker/gnocchi.pp
View File

@ -18,26 +18,24 @@
#
# === Parameters
#
# [*gnocchi_indexer_backend*]
# (Optional) Gnocchi indexer backend
# Defaults to mysql
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
# [*gnocchi_indexer_backend*]
# (Optional) Gnocchi indexer backend
# Defaults to mysql
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::pacemaker::gnocchi (
$bootstrap_node = hiera('bootstrap_nodeid'),
$gnocchi_indexer_backend = downcase(hiera('gnocchi_indexer_backend', 'mysql')),
$bootstrap_node = hiera('bootstrap_nodeid'),
$step = hiera('step'),
$step = hiera('step'),
) {
Service <| tag == 'gnocchi-service' |> {
hasrestart => true,
restart => '/bin/true',

10
manifests/profile/pacemaker/gnocchi/api.pp
View File

@ -22,15 +22,11 @@
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::pacemaker::gnocchi::api (
$step = hiera('step'),
$step = hiera('step'),
) {
include ::tripleo::profile::pacemaker::gnocchi
include ::tripleo::profile::pacemaker::apache
class { '::tripleo::profile::base::gnocchi::api':
step => $step,
}
include ::tripleo::profile::base::gnocchi::api
}

2
manifests/profile/pacemaker/gnocchi/metricd.pp
View File

@ -27,12 +27,10 @@
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::pacemaker::gnocchi::metricd (
$pacemaker_master = hiera('bootstrap_nodeid'),
$step = hiera('step'),
) {
include ::gnocchi::params
include ::tripleo::profile::pacemaker::gnocchi

2
manifests/profile/pacemaker/gnocchi/statsd.pp
View File

@ -27,12 +27,10 @@
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::pacemaker::gnocchi::statsd (
$pacemaker_master = hiera('bootstrap_nodeid'),
$step = hiera('step'),
) {
include ::gnocchi::params
include ::tripleo::profile::pacemaker::gnocchi

11
manifests/profile/pacemaker/haproxy.pp
View File

@ -22,21 +22,20 @@
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
# [*enable_load_balancer*]
# (Optional) Whether load balancing is enabled for this cluster
# Defaults to hiera('enable_load_balancer', true)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
# [*enable_load_balancer*]
# (Optional) Whether load balancing is enabled for this cluster
# Defaults to hiera('enable_load_balancer', true)
#
class tripleo::profile::pacemaker::haproxy (
$bootstrap_node = hiera('bootstrap_nodeid'),
$enable_load_balancer = hiera('enable_load_balancer', true),
$step = hiera('step'),
$enable_load_balancer = hiera('enable_load_balancer', true)
) {
include ::tripleo::profile::base::haproxy
if $::hostname == downcase($bootstrap_node) {

Some files were not shown because too many files have changed in this diff Show More