diff options
143 files changed, 1125 insertions, 687 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 407fbb7..e2b2cc9 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -226,6 +226,10 @@ # (optional) Enable or not MidoNet API binding # Defaults to false # +# [*zaqar_api*] +# (optional) Enable or not Zaqar Api binding +# Defaults to false +# # [*service_ports*] # (optional) Hash that contains the values to override from the service ports # The available keys to modify the services' ports are: @@ -271,6 +275,8 @@ # 'swift_proxy_ssl_port' (Defaults to 13808) # 'trove_api_port' (Defaults to 8779) # 'trove_api_ssl_port' (Defaults to 13779) +# 'zaqar_api_port' (Defaults to 8888) +# 'zaqar_api_ssl_port' (Defaults to 13888) # Defaults to {} # class tripleo::haproxy ( @@ -322,6 +328,7 @@ class tripleo::haproxy ( $redis = false, $redis_password = undef, $midonet_api = false, + $zaqar_api = false, $service_ports = {} ) { $default_service_ports = { @@ -367,6 +374,8 @@ class tripleo::haproxy ( swift_proxy_ssl_port => 13808, trove_api_port => 8779, trove_api_ssl_port => 13779, + zaqar_api_port => 8888, + zaqar_api_ssl_port => 13888, } $ports = merge($default_service_ports, $service_ports) @@ -508,6 +517,21 @@ class tripleo::haproxy ( } if $keystone_public { + $keystone_listen_opts = { + 'http-request' => [ + 'set-header X-Forwarded-Proto https if { ssl_fc }', + 'set-header X-Forwarded-Proto http if !{ ssl_fc }'], + } + if $service_certificate { + $keystone_public_tls_listen_opts = { + 'rsprep' => '^Location:\ http://(.*) Location:\ https://\1', + # NOTE(jaosorior): We always redirect to https for the public_virtual_ip. + 'redirect' => "scheme https code 301 if { hdr(host) -i ${public_virtual_ip} } !{ ssl_fc }", + 'option' => 'forwardfor', + } + } else { + $keystone_public_tls_listen_opts = {} + } ::tripleo::haproxy::endpoint { 'keystone_public': public_virtual_ip => $public_virtual_ip, internal_ip => hiera('keystone_public_api_vip', $controller_virtual_ip), @@ -515,11 +539,7 @@ class tripleo::haproxy ( ip_addresses => hiera('keystone_public_api_node_ips', $controller_hosts_real), server_names => $controller_hosts_names_real, mode => 'http', - listen_options => { - 'http-request' => [ - 'set-header X-Forwarded-Proto https if { ssl_fc }', - 'set-header X-Forwarded-Proto http if !{ ssl_fc }'], - }, + listen_options => merge($keystone_listen_opts, $keystone_public_tls_listen_opts), public_ssl_port => $ports[keystone_public_api_ssl_port], } } @@ -593,6 +613,12 @@ class tripleo::haproxy ( ip_addresses => hiera('glance_api_node_ips', $controller_hosts_real), server_names => $controller_hosts_names_real, public_ssl_port => $ports[glance_api_ssl_port], + mode => 'http', + listen_options => { + 'http-request' => [ + 'set-header X-Forwarded-Proto https if { ssl_fc }', + 'set-header X-Forwarded-Proto http if !{ ssl_fc }'], + }, } } @@ -887,4 +913,15 @@ class tripleo::haproxy ( options => $haproxy_member_options, } } + if $zaqar_api { + ::tripleo::haproxy::endpoint { 'zaqar_api': + public_virtual_ip => $public_virtual_ip, + internal_ip => hiera('zaqar_api_vip', $controller_virtual_ip), + service_port => $ports[zaqar_api_port], + ip_addresses => hiera('zaqar_api_node_ips', $controller_hosts_real), + server_names => $controller_hosts_names_real, + mode => 'http', + public_ssl_port => $ports[zaqar_api_ssl_port], + } + } } diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp new file mode 100644 index 0000000..07c0a88 --- /dev/null +++ b/manifests/profile/base/aodh.pp @@ -0,0 +1,53 @@ +# 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::aodh +# +# aodh profile for tripleo +# +# === Parameters +# +# [*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::aodh ( + $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), +) { + + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } + + if $step >= 3 and $sync_db { + include ::aodh::db::mysql + } + + if $step >= 4 or ($step >= 3 and $sync_db) { + include ::aodh + include ::aodh::auth + include ::aodh::config + include ::aodh::client + include ::aodh::db::sync + } + +} diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp new file mode 100644 index 0000000..19ecfaf --- /dev/null +++ b/manifests/profile/base/aodh/api.pp @@ -0,0 +1,47 @@ +# 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::aodh::api +# +# aodh API profile for tripleo +# +# === Parameters +# +# [*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::aodh::api ( + $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), +) { + + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } + + include ::tripleo::profile::base::aodh + + if $step >= 4 { + include ::aodh::api + include ::aodh::wsgi::apache + } +} diff --git a/manifests/profile/base/aodh/evaluator.pp b/manifests/profile/base/aodh/evaluator.pp new file mode 100644 index 0000000..ca506bc --- /dev/null +++ b/manifests/profile/base/aodh/evaluator.pp @@ -0,0 +1,48 @@ +# 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::aodh::evaluator +# +# aodh evaluator profile for tripleo +# +# === Parameters +# +# [*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::aodh::evaluator ( + $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), +) { + + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } + + include ::tripleo::profile::base::aodh + + if $step >= 4 { + include ::aodh::evaluator + } + +} + diff --git a/manifests/profile/base/aodh/listener.pp b/manifests/profile/base/aodh/listener.pp new file mode 100644 index 0000000..57ad27f --- /dev/null +++ b/manifests/profile/base/aodh/listener.pp @@ -0,0 +1,48 @@ +# 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::aodh::listener +# +# aodh listener profile for tripleo +# +# === Parameters +# +# [*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::aodh::listener ( + $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), +) { + + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } + + include ::tripleo::profile::base::aodh + + if $step >= 4 { + include ::aodh::listener + } + +} + diff --git a/manifests/profile/base/aodh/notifier.pp b/manifests/profile/base/aodh/notifier.pp new file mode 100644 index 0000000..03a0a6f --- /dev/null +++ b/manifests/profile/base/aodh/notifier.pp @@ -0,0 +1,48 @@ +# 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::aodh::notifier +# +# aodh notifier profile for tripleo +# +# === Parameters +# +# [*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::aodh::notifier ( + $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), +) { + + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } + + include ::tripleo::profile::base::aodh + + if $step >= 4 { + include ::aodh::notifier + } + +} + diff --git a/manifests/profile/base/ceilometer/agent/central.pp b/manifests/profile/base/ceilometer/agent/central.pp index 02d6d1a..c91e610 100644 --- a/manifests/profile/base/ceilometer/agent/central.pp +++ b/manifests/profile/base/ceilometer/agent/central.pp @@ -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 { diff --git a/manifests/profile/base/ceilometer/agent/compute.pp b/manifests/profile/base/ceilometer/agent/compute.pp index 3a7aa50..749bc64 100644 --- a/manifests/profile/base/ceilometer/agent/compute.pp +++ b/manifests/profile/base/ceilometer/agent/compute.pp @@ -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 { diff --git a/manifests/profile/base/ceilometer/agent/notification.pp b/manifests/profile/base/ceilometer/agent/notification.pp index 83a0234..7fe8e81 100644 --- a/manifests/profile/base/ceilometer/agent/notification.pp +++ b/manifests/profile/base/ceilometer/agent/notification.pp @@ -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 { diff --git a/manifests/profile/base/ceilometer/api.pp b/manifests/profile/base/ceilometer/api.pp index e324c00..b300a91 100644 --- a/manifests/profile/base/ceilometer/api.pp +++ b/manifests/profile/base/ceilometer/api.pp @@ -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 { diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp index b0a986f..baaf4c8 100644 --- a/manifests/profile/base/ceilometer/collector.pp +++ b/manifests/profile/base/ceilometer/collector.pp @@ -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'), @@ -44,12 +44,12 @@ class tripleo::profile::base::ceilometer::collector ( # without the brackets as 'members' argument for the 'mongodb_replset' # resource. if str2bool(hiera('mongodb::server::ipv6', false)) { - $mongo_node_ips_with_port_prefixed = prefix(hiera('mongo_node_ips'), '[') + $mongo_node_ips_with_port_prefixed = prefix(hiera('mongodb_node_ips'), '[') $mongo_node_ips_with_port = suffix($mongo_node_ips_with_port_prefixed, ']:27017') - $mongo_node_ips_with_port_nobr = suffix(hiera('mongo_node_ips'), ':27017') + $mongo_node_ips_with_port_nobr = suffix(hiera('mongodb_node_ips'), ':27017') } else { - $mongo_node_ips_with_port = suffix(hiera('mongo_node_ips'), ':27017') - $mongo_node_ips_with_port_nobr = suffix(hiera('mongo_node_ips'), ':27017') + $mongo_node_ips_with_port = suffix(hiera('mongodb_node_ips'), ':27017') + $mongo_node_ips_with_port_nobr = suffix(hiera('mongodb_node_ips'), ':27017') } $mongo_node_string = join($mongo_node_ips_with_port, ',') diff --git a/manifests/profile/base/ceilometer/expirer.pp b/manifests/profile/base/ceilometer/expirer.pp index 43d8c26..0830307 100644 --- a/manifests/profile/base/ceilometer/expirer.pp +++ b/manifests/profile/base/ceilometer/expirer.pp @@ -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 { diff --git a/manifests/profile/base/ceph/client.pp b/manifests/profile/base/ceph/client.pp index 851324a..53f09c2 100644 --- a/manifests/profile/base/ceph/client.pp +++ b/manifests/profile/base/ceph/client.pp @@ -26,7 +26,6 @@ class tripleo::profile::base::ceph::client ( $step = hiera('step'), ) { - include ::tripleo::profile::base::ceph if $step >= 2 { diff --git a/manifests/profile/base/ceph/mon.pp b/manifests/profile/base/ceph/mon.pp index 48c3721..c0768b6 100644 --- a/manifests/profile/base/ceph/mon.pp +++ b/manifests/profile/base/ceph/mon.pp @@ -19,8 +19,14 @@ # === Parameters # # [*ceph_pools*] -# (Optional) List of pools to create -# Defaults to [] +# (Optional) Hash of pools to create +# Example with hiera: +# tripleo::profile::base::ceph::mon::ceph_pools: +# mypool: +# size: 5 +# pg_num: 128 +# pgp_num: 128 +# Defaults to {} # # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates @@ -28,10 +34,9 @@ # Defaults to hiera('step') # class tripleo::profile::base::ceph::mon ( - $ceph_pools = [], + $ceph_pools = {}, $step = hiera('step'), ) { - include ::tripleo::profile::base::ceph if $step >= 2 { @@ -39,10 +44,6 @@ class tripleo::profile::base::ceph::mon ( } if $step >= 4 { - ceph::pool { $ceph_pools : - pg_num => hiera('ceph::profile::params::osd_pool_default_pg_num'), - pgp_num => hiera('ceph::profile::params::osd_pool_default_pgp_num'), - size => hiera('ceph::profile::params::osd_pool_default_size'), - } + create_resources('ceph::pool', $ceph_pools) } } diff --git a/manifests/profile/base/ceph/osd.pp b/manifests/profile/base/ceph/osd.pp index a9224d3..6940bca 100644 --- a/manifests/profile/base/ceph/osd.pp +++ b/manifests/profile/base/ceph/osd.pp @@ -31,10 +31,9 @@ class tripleo::profile::base::ceph::osd ( $ceph_osd_selinux_permissive = false, $step = hiera('step'), ) { - include ::tripleo::profile::base::ceph - if $step >= 2 { + if $step >= 3 { if $ceph_osd_selinux_permissive { exec { 'set selinux to permissive on boot': command => "sed -ie 's/^SELINUX=.*/SELINUX=permissive/' /etc/selinux/config", diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp index 27dc277..43d95b4 100644 --- a/manifests/profile/base/cinder.pp +++ b/manifests/profile/base/cinder.pp @@ -18,27 +18,30 @@ # # === Parameters # +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks +# Defaults to hiera('bootstrap_nodeid') +# # [*cinder_enable_db_purge*] # (Optional) Wheter to enable db purging # Defaults to true # -# [*pacemaker_master*] -# (Optional) The master node runs some tasks -# one step earlier than others; disable to -# the node is not the master. -# Defaults to true -# # [*step*] # (Optional) The current step of the deployment # Defaults to hiera('step') # class tripleo::profile::base::cinder ( + $bootstrap_node = hiera('bootstrap_nodeid', undef), $cinder_enable_db_purge = true, - $pacemaker_master = true, $step = hiera('step'), ) { + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } - if $step >= 4 or ($step >= 3 and $pacemaker_master) { + if $step >= 4 or ($step >= 3 and $sync_db) { include ::cinder include ::cinder::config } diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp index ad970f6..370b402 100644 --- a/manifests/profile/base/cinder/api.pp +++ b/manifests/profile/base/cinder/api.pp @@ -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'), @@ -37,9 +37,7 @@ class tripleo::profile::base::cinder::api ( $sync_db = false } - class { '::tripleo::profile::base::cinder': - pacemaker_master => $sync_db, - } + include ::tripleo::profile::base::cinder if $step >= 3 and $sync_db { include ::cinder::db::mysql diff --git a/manifests/certmonger.pp b/manifests/profile/base/cinder/backup.pp index e5f5e04..df015f7 100644 --- a/manifests/certmonger.pp +++ b/manifests/profile/base/cinder/backup.pp @@ -12,26 +12,25 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: tripleo::certmonger +# == Class: tripleo::profile::base::cinder::backup # -# Sets some default defaults necessary for the global certmonger setup. +# Cinder Backup profile for tripleo # # === Parameters # -# [*global_ca*] -# The certmonger nickname for the CA that will be used. +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') # -class tripleo::certmonger ( - $global_ca -){ - include ::certmonger +class tripleo::profile::base::cinder::backup ( + $step = hiera('step'), +) { - Certmonger_certificate { - ca => $global_ca, - ensure => 'present', - certbackend => 'FILE', - keybackend => 'FILE', - wait => true, - require => Class['::certmonger'], + include ::tripleo::profile::base::cinder + + if $step >= 4 { + include ::cinder::backup } + } diff --git a/manifests/profile/base/cinder/backup/ceph.pp b/manifests/profile/base/cinder/backup/ceph.pp new file mode 100644 index 0000000..67a666e --- /dev/null +++ b/manifests/profile/base/cinder/backup/ceph.pp @@ -0,0 +1,36 @@ +# 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::cinder::backup::ceph +# +# Cinder Backup Ceph profile for tripleo +# +# === Parameters +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::cinder::backup::ceph ( + $step = hiera('step'), +) { + + include ::tripleo::profile::base::cinder::backup + + if $step >= 4 { + include ::cinder::backup::ceph + } + +} diff --git a/manifests/profile/base/cinder/backup/swift.pp b/manifests/profile/base/cinder/backup/swift.pp new file mode 100644 index 0000000..12561bf --- /dev/null +++ b/manifests/profile/base/cinder/backup/swift.pp @@ -0,0 +1,36 @@ +# 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::cinder::backup::swift +# +# Cinder Backup Ceph profile for tripleo +# +# === Parameters +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::cinder::backup::swift ( + $step = hiera('step'), +) { + + include ::tripleo::profile::base::cinder::backup + + if $step >= 4 { + include ::cinder::backup::swift + } + +} diff --git a/manifests/profile/base/cinder/scheduler.pp b/manifests/profile/base/cinder/scheduler.pp index 68f2813..4586929 100644 --- a/manifests/profile/base/cinder/scheduler.pp +++ b/manifests/profile/base/cinder/scheduler.pp @@ -26,7 +26,6 @@ class tripleo::profile::base::cinder::scheduler ( $step = hiera('step'), ) { - include ::tripleo::profile::base::cinder if $step >= 4 { diff --git a/manifests/profile/base/cinder/volume.pp b/manifests/profile/base/cinder/volume.pp index 96cd06a..dfb034f 100644 --- a/manifests/profile/base/cinder/volume.pp +++ b/manifests/profile/base/cinder/volume.pp @@ -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 { diff --git a/manifests/profile/base/cinder/volume/dellsc.pp b/manifests/profile/base/cinder/volume/dellsc.pp index 6f7922d..534bcb7 100644 --- a/manifests/profile/base/cinder/volume/dellsc.pp +++ b/manifests/profile/base/cinder/volume/dellsc.pp @@ -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 { diff --git a/manifests/profile/base/cinder/volume/eqlx.pp b/manifests/profile/base/cinder/volume/eqlx.pp index a18270d..2399459 100644 --- a/manifests/profile/base/cinder/volume/eqlx.pp +++ b/manifests/profile/base/cinder/volume/eqlx.pp @@ -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 { diff --git a/manifests/profile/base/cinder/volume/iscsi.pp b/manifests/profile/base/cinder/volume/iscsi.pp index d857caa..d1d22bb 100644 --- a/manifests/profile/base/cinder/volume/iscsi.pp +++ b/manifests/profile/base/cinder/volume/iscsi.pp @@ -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 { diff --git a/manifests/profile/base/cinder/volume/netapp.pp b/manifests/profile/base/cinder/volume/netapp.pp index bae541f..fc652c9 100644 --- a/manifests/profile/base/cinder/volume/netapp.pp +++ b/manifests/profile/base/cinder/volume/netapp.pp @@ -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 { diff --git a/manifests/profile/base/cinder/volume/nfs.pp b/manifests/profile/base/cinder/volume/nfs.pp index a26c50e..7b1f1b9 100644 --- a/manifests/profile/base/cinder/volume/nfs.pp +++ b/manifests/profile/base/cinder/volume/nfs.pp @@ -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 { diff --git a/manifests/profile/base/cinder/volume/rbd.pp b/manifests/profile/base/cinder/volume/rbd.pp index 6c8341a..1246de8 100644 --- a/manifests/profile/base/cinder/volume/rbd.pp +++ b/manifests/profile/base/cinder/volume/rbd.pp @@ -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 { diff --git a/manifests/profile/base/database/mongodb.pp b/manifests/profile/base/database/mongodb.pp index 4c53c9c..1a19bb6 100644 --- a/manifests/profile/base/database/mongodb.pp +++ b/manifests/profile/base/database/mongodb.pp @@ -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 diff --git a/manifests/profile/base/database/mongodbcommon.pp b/manifests/profile/base/database/mongodbcommon.pp index 6530730..c61e692 100644 --- a/manifests/profile/base/database/mongodbcommon.pp +++ b/manifests/profile/base/database/mongodbcommon.pp @@ -18,22 +18,20 @@ # # === 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('mongodb_node_ips'), ) { - $port = '27017' - # NOTE(gfidente): the following vars are needed on all nodes so they - # need to stay out of pacemaker_master conditional. + # NOTE(gfidente): the following vars are needed on all nodes. # The addresses mangling will hopefully go away when we'll be able to # configure the connection string via hostnames, until then, we need to pass # the list of IPv6 addresses *with* port and without the brackets as 'members' diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp index 27df6e4..49c9df3 100644 --- a/manifests/profile/base/database/mysql.pp +++ b/manifests/profile/base/database/mysql.pp @@ -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) diff --git a/manifests/profile/base/database/redis.pp b/manifests/profile/base/database/redis.pp index 3a5200c..14f6af4 100644 --- a/manifests/profile/base/database/redis.pp +++ b/manifests/profile/base/database/redis.pp @@ -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 diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp index fd43732..845fd41 100644 --- a/manifests/profile/base/glance/api.pp +++ b/manifests/profile/base/glance/api.pp @@ -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 { diff --git a/manifests/profile/base/glance/registry.pp b/manifests/profile/base/glance/registry.pp index ce89d12..ac6796a 100644 --- a/manifests/profile/base/glance/registry.pp +++ b/manifests/profile/base/glance/registry.pp @@ -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 diff --git a/manifests/profile/base/gnocchi.pp b/manifests/profile/base/gnocchi.pp index ee903cb..6a470ca 100644 --- a/manifests/profile/base/gnocchi.pp +++ b/manifests/profile/base/gnocchi.pp @@ -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 diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp index 870a9bb..5e7e215 100644 --- a/manifests/profile/base/gnocchi/api.pp +++ b/manifests/profile/base/gnocchi/api.pp @@ -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) { diff --git a/manifests/profile/base/gnocchi/metricd.pp b/manifests/profile/base/gnocchi/metricd.pp index 29cf882..4d7eb89 100644 --- a/manifests/profile/base/gnocchi/metricd.pp +++ b/manifests/profile/base/gnocchi/metricd.pp @@ -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 { diff --git a/manifests/profile/base/gnocchi/statsd.pp b/manifests/profile/base/gnocchi/statsd.pp index 830a128..775b043 100644 --- a/manifests/profile/base/gnocchi/statsd.pp +++ b/manifests/profile/base/gnocchi/statsd.pp @@ -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 { diff --git a/manifests/profile/base/haproxy.pp b/manifests/profile/base/haproxy.pp index 7951941..4f2f850 100644 --- a/manifests/profile/base/haproxy.pp +++ b/manifests/profile/base/haproxy.pp @@ -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 ( + $certificates_specs = {}, + $certmonger_ca = hiera('certmonger_ca', 'local'), $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 = {}, + $step = hiera('step'), ) { - if $step >= 1 { if $enable_load_balancer { if str2bool($generate_service_certificates) { diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp index 1311f20..dcf0f21 100644 --- a/manifests/profile/base/heat.pp +++ b/manifests/profile/base/heat.pp @@ -18,31 +18,30 @@ # # === 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 +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks # Defaults to downcase(hiera('bootstrap_nodeid')) # # [*manage_db_purge*] # (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_node = 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 + # Domain resources will be created at step5 on the bootstrap_node so we # configure heat.conf at step3 and 4 but actually create the domain later. if $step == 3 or $step == 4 { class { '::heat::keystone::domain': @@ -63,7 +62,7 @@ class tripleo::profile::base::heat ( if $manage_db_purge { include ::heat::cron::purge_deleted } - if $bootstrap_master == $::hostname { + if $bootstrap_node == $::hostname { # Class ::heat::keystone::domain has to run on bootstrap node # because it creates DB entities via API calls. include ::heat::keystone::domain diff --git a/manifests/profile/base/heat/api.pp b/manifests/profile/base/heat/api.pp index 67a0bfc..68de12b 100644 --- a/manifests/profile/base/heat/api.pp +++ b/manifests/profile/base/heat/api.pp @@ -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 diff --git a/manifests/profile/base/heat/api_cfn.pp b/manifests/profile/base/heat/api_cfn.pp index 2813826..7c80fc6 100644 --- a/manifests/profile/base/heat/api_cfn.pp +++ b/manifests/profile/base/heat/api_cfn.pp @@ -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 diff --git a/manifests/profile/base/heat/api_cloudwatch.pp b/manifests/profile/base/heat/api_cloudwatch.pp index b2adf92..6362275 100644 --- a/manifests/profile/base/heat/api_cloudwatch.pp +++ b/manifests/profile/base/heat/api_cloudwatch.pp @@ -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 diff --git a/manifests/profile/base/heat/engine.pp b/manifests/profile/base/heat/engine.pp index 1fd627f..32a711f 100644 --- a/manifests/profile/base/heat/engine.pp +++ b/manifests/profile/base/heat/engine.pp @@ -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'), diff --git a/manifests/profile/base/horizon.pp b/manifests/profile/base/horizon.pp index 1b7df19..be07c0e 100644 --- a/manifests/profile/base/horizon.pp +++ b/manifests/profile/base/horizon.pp @@ -38,9 +38,9 @@ class tripleo::profile::base::horizon ( $neutron_options = {'profile_support' => $_profile_support } $memcached_ipv6 = hiera('memcached_ipv6', false) if $memcached_ipv6 { - $horizon_memcached_servers = hiera('memcache_node_ips_v6', '[::1]') + $horizon_memcached_servers = hiera('memcached_node_ips_v6', '[::1]') } else { - $horizon_memcached_servers = hiera('memcache_node_ips', '127.0.0.1') + $horizon_memcached_servers = hiera('memcached_node_ips', '127.0.0.1') } class { '::horizon': cache_server_ip => $horizon_memcached_servers, diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp index dd30dd7..f098d37 100644 --- a/manifests/profile/base/ironic.pp +++ b/manifests/profile/base/ironic.pp @@ -25,24 +25,25 @@ # [*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'), ) { + # Database is accessed by both API and conductor, hence it's here. if $::hostname == downcase($bootstrap_node) { $sync_db = true } else { $sync_db = false } - if $step >= 3 { - include ::ironic + if $step >= 3 and $sync_db { + include ::ironic::db::mysql + } - # Database is accessed by both API and conductor, hence it's here. - if $sync_db { - include ::ironic::db::mysql - include ::ironic::db::sync + if $step >= 4 or ($step >= 3 and $sync_db) { + class { '::ironic': + sync_db => $sync_db, } } } diff --git a/manifests/profile/base/ironic/api.pp b/manifests/profile/base/ironic/api.pp index 1406e2d..020cacb 100644 --- a/manifests/profile/base/ironic/api.pp +++ b/manifests/profile/base/ironic/api.pp @@ -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 } diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp index 7a587a5..2cb61fb 100644 --- a/manifests/profile/base/ironic/conductor.pp +++ b/manifests/profile/base/ironic/conductor.pp @@ -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 { diff --git a/manifests/profile/base/keepalived.pp b/manifests/profile/base/keepalived.pp index af7c095..f2063d6 100644 --- a/manifests/profile/base/keepalived.pp +++ b/manifests/profile/base/keepalived.pp @@ -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 } } - } diff --git a/manifests/profile/base/kernel.pp b/manifests/profile/base/kernel.pp index db0280f..df13a98 100644 --- a/manifests/profile/base/kernel.pp +++ b/manifests/profile/base/kernel.pp @@ -19,8 +19,12 @@ # class tripleo::profile::base::kernel { - create_resources(kmod::load, hiera('kernel_modules'), { }) - create_resources(sysctl::value, hiera('sysctl_settings'), { }) - Exec <| tag == 'kmod::load' |> -> Sysctl <| |> + if hiera('kernel_modules', undef) { + create_resources(kmod::load, hiera('kernel_modules'), { }) + } + if hiera('sysctl_settings', undef) { + create_resources(sysctl::value, hiera('sysctl_settings'), { }) + } + Exec <| tag == 'kmod::load' |> -> Sysctl <| |> } diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index 9617c11..d8c8e24 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -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) { @@ -67,34 +67,6 @@ class tripleo::profile::base::keystone ( include ::keystone::endpoint } - #TODO: need a cleanup-keystone-tokens.sh solution here - file { [ '/etc/keystone/ssl', '/etc/keystone/ssl/certs', '/etc/keystone/ssl/private' ]: - ensure => 'directory', - owner => 'keystone', - group => 'keystone', - require => Package['keystone'], - } - file { '/etc/keystone/ssl/certs/signing_cert.pem': - content => hiera('keystone_signing_certificate'), - owner => 'keystone', - group => 'keystone', - notify => Service[$::apache::params::service_name], - require => File['/etc/keystone/ssl/certs'], - } - file { '/etc/keystone/ssl/private/signing_key.pem': - content => hiera('keystone_signing_key'), - owner => 'keystone', - group => 'keystone', - notify => Service[$::apache::params::service_name], - require => File['/etc/keystone/ssl/private'], - } - file { '/etc/keystone/ssl/certs/ca.pem': - content => hiera('keystone_ca_certificate'), - owner => 'keystone', - group => 'keystone', - notify => Service[$::apache::params::service_name], - require => File['/etc/keystone/ssl/certs'], - } } if $step >= 5 and $manage_db_purge { diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp index c1188ec..9a3a314 100644 --- a/manifests/profile/base/manila/api.pp +++ b/manifests/profile/base/manila/api.pp @@ -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 diff --git a/manifests/profile/base/manila/scheduler.pp b/manifests/profile/base/manila/scheduler.pp index 3d39c4a..8581187 100644 --- a/manifests/profile/base/manila/scheduler.pp +++ b/manifests/profile/base/manila/scheduler.pp @@ -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'), diff --git a/manifests/profile/base/manila/share.pp b/manifests/profile/base/manila/share.pp index 932e013..ed64b29 100644 --- a/manifests/profile/base/manila/share.pp +++ b/manifests/profile/base/manila/share.pp @@ -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 } - } diff --git a/manifests/profile/base/memcached.pp b/manifests/profile/base/memcached.pp index 54d12c8..72a91e2 100644 --- a/manifests/profile/base/memcached.pp +++ b/manifests/profile/base/memcached.pp @@ -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 } diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp index 42507b9..0c41193 100644 --- a/manifests/profile/base/mistral.pp +++ b/manifests/profile/base/mistral.pp @@ -18,9 +18,9 @@ # # === Parameters # -# [*sync_db*] -# (Optional) Whether to run db sync -# Defaults to true +# [*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 @@ -28,12 +28,23 @@ # Defaults to hiera('step') # class tripleo::profile::base::mistral ( - $sync_db = true, - $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } + + if $step >= 3 and $sync_db { + include ::mistral::db::mysql + } - if $step >= 3 { + if $step >= 4 or ($step >= 3 and $sync_db) { include ::mistral include ::mistral::config + include ::mistral::client + include ::mistral::db::sync } } diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp index b955c8d..50708f1 100644 --- a/manifests/profile/base/mistral/api.pp +++ b/manifests/profile/base/mistral/api.pp @@ -18,18 +18,28 @@ # # === 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::mistral::api ( + $bootstrap_node = hiera('bootstrap_nodeid', undef), $step = hiera('step'), ) { + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } include ::tripleo::profile::base::mistral - if $step >= 4 { + if $step >= 4 or ($step >= 3 and $sync_db) { include ::mistral::api } } diff --git a/manifests/profile/base/mistral/engine.pp b/manifests/profile/base/mistral/engine.pp index 141cbad..b2d8864 100644 --- a/manifests/profile/base/mistral/engine.pp +++ b/manifests/profile/base/mistral/engine.pp @@ -18,9 +18,9 @@ # # === Parameters # -# [*sync_db*] -# (Optional) Whether to run db sync -# Defaults to undef +# [*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 @@ -28,18 +28,18 @@ # Defaults to hiera('step') # class tripleo::profile::base::mistral::engine ( - $sync_db = true, + $bootstrap_node = hiera('bootstrap_nodeid', undef), $step = hiera('step'), ) { + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } include ::tripleo::profile::base::mistral - if $step >= 3 and $sync_db { - include ::mistral::db::mysql - include ::mistral::db::sync - } - - if $step >= 4 { + if $step >= 4 or ($step >= 3 and $sync_db) { include ::mistral::engine } diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp index d7b5776..8e3f2c9 100644 --- a/manifests/profile/base/mistral/executor.pp +++ b/manifests/profile/base/mistral/executor.pp @@ -18,19 +18,28 @@ # # === 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::mistral::executor ( + $bootstrap_node = hiera('bootstrap_nodeid', undef), $step = hiera('step'), ) { + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } include ::tripleo::profile::base::mistral - if $step >= 4 { + if $step >= 4 or ($step >= 3 and $sync_db) { include ::mistral::executor } - } diff --git a/manifests/profile/base/monitoring/fluentd.pp b/manifests/profile/base/monitoring/fluentd.pp index 1ea7d39..8160452 100644 --- a/manifests/profile/base/monitoring/fluentd.pp +++ b/manifests/profile/base/monitoring/fluentd.pp @@ -25,7 +25,6 @@ class tripleo::profile::base::monitoring::fluentd ( $step = hiera('step', undef) ) { - if $step == undef or $step >= 3 { include ::fluentd diff --git a/manifests/profile/base/monitoring/rabbitmq.pp b/manifests/profile/base/monitoring/rabbitmq.pp new file mode 100644 index 0000000..cfd5016 --- /dev/null +++ b/manifests/profile/base/monitoring/rabbitmq.pp @@ -0,0 +1,54 @@ +# 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::sensu::rabbitmq +# +# RabbitMQ configuration for Sensu stack for TripleO +# +# === Parameters +# +# [*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') +# +# [*vhost*] +# (Optional) String. RabbitMQ vhost to be used by Sensu +# Defaults to '/sensu' +# +class tripleo::profile::base::monitoring::rabbitmq ( + $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, + name => $vhost + } + + rabbitmq_user { 'sensu-rabbit-user': + name => $user, + password => $password, + tags => ['monitoring'] + } + + rabbitmq_user_permissions { "${user}@${vhost}": + configure_permission => '.*', + read_permission => '.*', + write_permission => '.*', + } +} diff --git a/manifests/profile/base/monitoring/sensu.pp b/manifests/profile/base/monitoring/sensu.pp new file mode 100644 index 0000000..a6872b3 --- /dev/null +++ b/manifests/profile/base/monitoring/sensu.pp @@ -0,0 +1,34 @@ +# 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::monitoring::sensu +# +# Sensu configuration for TripleO +# +# === Parameters +# +# [*step*] +# (Optional) String. The current step of the deployment +# Defaults to hiera('step') +# +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' + } + } +} diff --git a/manifests/profile/base/monitoring/uchiwa.pp b/manifests/profile/base/monitoring/uchiwa.pp new file mode 100644 index 0000000..2674b5f --- /dev/null +++ b/manifests/profile/base/monitoring/uchiwa.pp @@ -0,0 +1,31 @@ +# 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::monitoring::uchiwa +# +# Monitoring dashboards for TripleO +# +# === Parameters +# +# [*step*] +# (Optional) String. The current step of the deployment +# Defaults to hiera('step') +# +class tripleo::profile::base::monitoring::uchiwa ( + $step = hiera('step', undef), +) { + if $step == undef or $step >= 3 { + include ::uchiwa + } +} diff --git a/manifests/profile/base/neutron/agents/midonet.pp b/manifests/profile/base/neutron/agents/midonet.pp index 52cafa9..f2ce94a 100644 --- a/manifests/profile/base/neutron/agents/midonet.pp +++ b/manifests/profile/base/neutron/agents/midonet.pp @@ -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') } } - } - } diff --git a/manifests/profile/base/neutron/agents/nuage.pp b/manifests/profile/base/neutron/agents/nuage.pp index c50feb2..80beceb 100644 --- a/manifests/profile/base/neutron/agents/nuage.pp +++ b/manifests/profile/base/neutron/agents/nuage.pp @@ -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, } - } - } diff --git a/manifests/profile/base/neutron/dhcp.pp b/manifests/profile/base/neutron/dhcp.pp index a313478..24b1a35 100644 --- a/manifests/profile/base/neutron/dhcp.pp +++ b/manifests/profile/base/neutron/dhcp.pp @@ -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 diff --git a/manifests/profile/base/neutron/l3.pp b/manifests/profile/base/neutron/l3.pp index 2b57555..14ffa82 100644 --- a/manifests/profile/base/neutron/l3.pp +++ b/manifests/profile/base/neutron/l3.pp @@ -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 diff --git a/manifests/profile/base/neutron/metadata.pp b/manifests/profile/base/neutron/metadata.pp index d7b4c99..4cc6748 100644 --- a/manifests/profile/base/neutron/metadata.pp +++ b/manifests/profile/base/neutron/metadata.pp @@ -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 diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp index 3276b82..9104cc3 100644 --- a/manifests/profile/base/neutron/midonet.pp +++ b/manifests/profile/base/neutron/midonet.pp @@ -18,69 +18,63 @@ # # === 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') # -# [*zookeeper_client_ip*] -# (Optional) The IP of the Zookeeper Client -# Defaults to hiera('neutron::bind_host') -# -# [*zookeeper_hostnames*] -# (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') +# Defaults to hiera('neutron::server::password') # -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') +# [*neutron_auth_tenant*] +# (Optional) Tenant to use for Neutron authentication +# Defaults to hiera('neutron::server::project_name') # # [*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') +# +# [*zookeeper_hostnames*] +# (Optional) The IPs of the Zookeeper Servers +# Defaults to hiera('controller_node_names') +# 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', ''), - $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', ''), + $neutron_auth_password = hiera('neutron::server::password', ''), + $neutron_auth_tenant = hiera('neutron::server::project_name', ''), $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', ''), ) { - include ::tripleo::profile::base::neutron include ::tripleo::profile::base::neutron::agents::midonet diff --git a/manifests/profile/base/neutron/ovs.pp b/manifests/profile/base/neutron/ovs.pp index f801511..a4e0cd3 100644 --- a/manifests/profile/base/neutron/ovs.pp +++ b/manifests/profile/base/neutron/ovs.pp @@ -26,7 +26,6 @@ class tripleo::profile::base::neutron::ovs( $step = hiera('step'), ) { - include ::tripleo::profile::base::neutron if $step >= 4 { diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp index 0193615..c89bc02 100644 --- a/manifests/profile/base/neutron/plugins/ml2.pp +++ b/manifests/profile/base/neutron/plugins/ml2.pp @@ -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 diff --git a/manifests/profile/base/neutron/plugins/nuage.pp b/manifests/profile/base/neutron/plugins/nuage.pp index 4ada340..0843ec4 100644 --- a/manifests/profile/base/neutron/plugins/nuage.pp +++ b/manifests/profile/base/neutron/plugins/nuage.pp @@ -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'), diff --git a/manifests/profile/base/neutron/plugins/opencontrail.pp b/manifests/profile/base/neutron/plugins/opencontrail.pp index 6cd710a..fbf46e7 100644 --- a/manifests/profile/base/neutron/plugins/opencontrail.pp +++ b/manifests/profile/base/neutron/plugins/opencontrail.pp @@ -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'), diff --git a/manifests/profile/base/neutron/plugins/plumgrid.pp b/manifests/profile/base/neutron/plugins/plumgrid.pp index efd75ac..bc73d29 100644 --- a/manifests/profile/base/neutron/plugins/plumgrid.pp +++ b/manifests/profile/base/neutron/plugins/plumgrid.pp @@ -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'), diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index 877184d..b43b8e8 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -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 @@ -52,9 +52,9 @@ class tripleo::profile::base::nova ( } if hiera('nova::use_ipv6', false) { - $memcache_servers = suffix(hiera('memcache_node_ips_v6'), ':11211') + $memcache_servers = suffix(hiera('memcached_node_ips_v6'), ':11211') } else { - $memcache_servers = suffix(hiera('memcache_node_ips'), ':11211') + $memcache_servers = suffix(hiera('memcached_node_ips'), ':11211') } if hiera('step') >= 4 or (hiera('step') >= 3 and $sync_db) { diff --git a/manifests/profile/base/nova/compute/ironic.pp b/manifests/profile/base/nova/compute/ironic.pp new file mode 100644 index 0000000..c0213fb --- /dev/null +++ b/manifests/profile/base/nova/compute/ironic.pp @@ -0,0 +1,34 @@ +# 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::nova::compute::ironic +# +# Nova Compute Ironic profile for tripleo +# +# === Parameters +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +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 + } +} diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp index 5b6f895..956f8ad 100644 --- a/manifests/profile/base/nova/compute/libvirt.pp +++ b/manifests/profile/base/nova/compute/libvirt.pp @@ -26,7 +26,6 @@ class tripleo::profile::base::nova::compute::libvirt ( $step = hiera('step'), ) { - if $step >= 4 { include ::tripleo::profile::base::nova::compute diff --git a/manifests/profile/base/nova/conductor.pp b/manifests/profile/base/nova/conductor.pp index 04c9d06..fa9f12b 100644 --- a/manifests/profile/base/nova/conductor.pp +++ b/manifests/profile/base/nova/conductor.pp @@ -26,10 +26,8 @@ class tripleo::profile::base::nova::conductor ( $step = hiera('step'), ) { - include ::tripleo::profile::base::nova if $step >= 4 { include ::nova::conductor } - } diff --git a/manifests/profile/base/nova/consoleauth.pp b/manifests/profile/base/nova/consoleauth.pp index 442cf84..8ccfb8c 100644 --- a/manifests/profile/base/nova/consoleauth.pp +++ b/manifests/profile/base/nova/consoleauth.pp @@ -26,10 +26,8 @@ class tripleo::profile::base::nova::consoleauth ( $step = hiera('step'), ) { - if $step >= 4 { include ::tripleo::profile::base::nova include ::nova::consoleauth } - } diff --git a/manifests/profile/base/nova/libvirt.pp b/manifests/profile/base/nova/libvirt.pp index 29ef372..889b80d 100644 --- a/manifests/profile/base/nova/libvirt.pp +++ b/manifests/profile/base/nova/libvirt.pp @@ -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 diff --git a/manifests/profile/base/nova/scheduler.pp b/manifests/profile/base/nova/scheduler.pp index 13b4e82..3c9b2c2 100644 --- a/manifests/profile/base/nova/scheduler.pp +++ b/manifests/profile/base/nova/scheduler.pp @@ -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 } - } diff --git a/manifests/profile/base/nova/vncproxy.pp b/manifests/profile/base/nova/vncproxy.pp index aa0cc7b..f654fef 100644 --- a/manifests/profile/base/nova/vncproxy.pp +++ b/manifests/profile/base/nova/vncproxy.pp @@ -26,10 +26,8 @@ class tripleo::profile::base::nova::vncproxy ( $step = hiera('step'), ) { - if $step >= 4 { include ::tripleo::profile::base::nova include ::nova::vncproxy } - } diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp index de3de3c..2c70eab 100644 --- a/manifests/profile/base/pacemaker.pp +++ b/manifests/profile/base/pacemaker.pp @@ -26,7 +26,6 @@ class tripleo::profile::base::pacemaker ( $step = hiera('step'), ) { - Pcmk_resource <| |> { tries => 10, try_sleep => 3, diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp index 6e86eab..2fd2347 100644 --- a/manifests/profile/base/rabbitmq.pp +++ b/manifests/profile/base/rabbitmq.pp @@ -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('rabbitmq_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)), + $config_variables = hiera('rabbitmq_config_variables'), $environment = hiera('rabbitmq_environment'), + $ipv6 = str2bool(hiera('rabbit_ipv6', false)), $kernel_variables = hiera('rabbitmq_kernel_variables'), - $config_variables = hiera('rabbitmq_config_variables'), + $nodes = hiera('rabbitmq_node_ips', []), $step = hiera('step'), ) { - # IPv6 environment, necessary for RabbitMQ. if $ipv6 { $rabbit_env = merge($environment, { diff --git a/manifests/profile/base/sahara.pp b/manifests/profile/base/sahara.pp index befb5d3..96d23a6 100644 --- a/manifests/profile/base/sahara.pp +++ b/manifests/profile/base/sahara.pp @@ -18,14 +18,27 @@ # # === 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') # class tripleo::profile::base::sahara ( - $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { - if $step >= 4 { - include ::sahara + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } + + if $step >= 4 or ($step >= 3 and $sync_db){ + class { '::sahara': + sync_db => $sync_db, + } } } diff --git a/manifests/profile/base/sahara/api.pp b/manifests/profile/base/sahara/api.pp index dc23d64..1ead106 100644 --- a/manifests/profile/base/sahara/api.pp +++ b/manifests/profile/base/sahara/api.pp @@ -24,10 +24,11 @@ # Defaults to hiera('step') # class tripleo::profile::base::sahara::api ( - $step = hiera('step'), + $step = hiera('step'), ) { + include ::tripleo::profile::base::sahara + if $step >= 4 { - include ::tripleo::profile::base::sahara include ::sahara::service::api } } diff --git a/manifests/profile/base/sahara/engine.pp b/manifests/profile/base/sahara/engine.pp index f792a96..4dbaa85 100644 --- a/manifests/profile/base/sahara/engine.pp +++ b/manifests/profile/base/sahara/engine.pp @@ -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'), @@ -37,12 +37,13 @@ class tripleo::profile::base::sahara::engine ( $sync_db = false } + include ::tripleo::profile::base::sahara + if $step >= 3 and $sync_db { include ::sahara::db::mysql } if $step >= 4 or ($step >= 3 and $sync_db) { - include ::tripleo::profile::base::sahara include ::sahara::service::engine } } diff --git a/manifests/profile/base/snmp.pp b/manifests/profile/base/snmp.pp index 40f7393..2ed6752 100644 --- a/manifests/profile/base/snmp.pp +++ b/manifests/profile/base/snmp.pp @@ -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', diff --git a/manifests/profile/base/swift/add_devices.pp b/manifests/profile/base/swift/add_devices.pp index f61f418..bd4c91c 100644 --- a/manifests/profile/base/swift/add_devices.pp +++ b/manifests/profile/base/swift/add_devices.pp @@ -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 diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp index 40e61ae..1e763a1 100644 --- a/manifests/profile/base/swift/proxy.pp +++ b/manifests/profile/base/swift/proxy.pp @@ -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 diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp index d94c6be..e0f67cd 100644 --- a/manifests/profile/base/swift/ringbuilder.pp +++ b/manifests/profile/base/swift/ringbuilder.pp @@ -18,30 +18,33 @@ # # === Parameters # -# [*step*] +# [*replicas*] +# replicas +# +# [*build_ring*] = true, +# (Optional) Whether to build the ring +# Defaults to true +# +# [*devices*] +# (Optional) The swift devices +# Defaults to '' +# +# [*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 -# [*devices*] -# (Optional) The swift devices -# Defaults to '' -# [*build_ring*] = true, -# (Optional) Whether to build the ring -# Defaults to true -# [*replicas*] -# replicas - +# 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 diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp index 3447a44..0b09ea6 100644 --- a/manifests/profile/base/swift/storage.pp +++ b/manifests/profile/base/swift/storage.pp @@ -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::disks diff --git a/manifests/profile/base/trove/api.pp b/manifests/profile/base/trove/api.pp index 06edf7f..7a78171 100644 --- a/manifests/profile/base/trove/api.pp +++ b/manifests/profile/base/trove/api.pp @@ -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'), diff --git a/manifests/profile/pacemaker/apache.pp b/manifests/profile/pacemaker/apache.pp index 4b0b16e..980b3a4 100644 --- a/manifests/profile/pacemaker/apache.pp +++ b/manifests/profile/pacemaker/apache.pp @@ -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 { diff --git a/manifests/profile/pacemaker/ceilometer.pp b/manifests/profile/pacemaker/ceilometer.pp index 23021fc..531b4bc 100644 --- a/manifests/profile/pacemaker/ceilometer.pp +++ b/manifests/profile/pacemaker/ceilometer.pp @@ -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')) diff --git a/manifests/profile/pacemaker/ceilometer/agent/central.pp b/manifests/profile/pacemaker/ceilometer/agent/central.pp index e227614..90266be 100644 --- a/manifests/profile/pacemaker/ceilometer/agent/central.pp +++ b/manifests/profile/pacemaker/ceilometer/agent/central.pp @@ -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 diff --git a/manifests/profile/pacemaker/ceilometer/agent/notification.pp b/manifests/profile/pacemaker/ceilometer/agent/notification.pp index 868bb22..e419356 100644 --- a/manifests/profile/pacemaker/ceilometer/agent/notification.pp +++ b/manifests/profile/pacemaker/ceilometer/agent/notification.pp @@ -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 diff --git a/manifests/profile/pacemaker/ceilometer/api.pp b/manifests/profile/pacemaker/ceilometer/api.pp index 3006be8..0eddaec 100644 --- a/manifests/profile/pacemaker/ceilometer/api.pp +++ b/manifests/profile/pacemaker/ceilometer/api.pp @@ -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 diff --git a/manifests/profile/pacemaker/ceilometer/collector.pp b/manifests/profile/pacemaker/ceilometer/collector.pp index 6610a07..d0f7217 100644 --- a/manifests/profile/pacemaker/ceilometer/collector.pp +++ b/manifests/profile/pacemaker/ceilometer/collector.pp @@ -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 { diff --git a/manifests/profile/pacemaker/cinder/api.pp b/manifests/profile/pacemaker/cinder/api.pp index 6354244..d18942d 100644 --- a/manifests/profile/pacemaker/cinder/api.pp +++ b/manifests/profile/pacemaker/cinder/api.pp @@ -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', diff --git a/manifests/profile/pacemaker/cinder/backup.pp b/manifests/profile/pacemaker/cinder/backup.pp new file mode 100644 index 0000000..20a0104 --- /dev/null +++ b/manifests/profile/pacemaker/cinder/backup.pp @@ -0,0 +1,54 @@ +# 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::pacemaker::cinder::backup +# +# Cinder Backup Pacemaker HA 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 in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::pacemaker::cinder::backup ( + $bootstrap_node = hiera('bootstrap_nodeid'), + $step = hiera('step'), +) { + + Service <| tag == 'cinder::backup' |> { + hasrestart => true, + restart => '/bin/true', + start => '/bin/true', + stop => '/bin/true', + } + + if $::hostname == downcase($bootstrap_node) { + $pacemaker_master = true + } else { + $pacemaker_master = false + } + + include ::tripleo::profile::base::cinder::backup + + if $step >= 5 and $pacemaker_master { + pacemaker::resource::service { $::cinder::params::backup_service : } + } + +} diff --git a/manifests/profile/pacemaker/cinder/scheduler.pp b/manifests/profile/pacemaker/cinder/scheduler.pp index 9b79903..e25ef54 100644 --- a/manifests/profile/pacemaker/cinder/scheduler.pp +++ b/manifests/profile/pacemaker/cinder/scheduler.pp @@ -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', @@ -67,6 +66,22 @@ class tripleo::profile::pacemaker::cinder::scheduler ( require => [Pacemaker::Resource::Service[$::cinder::params::api_service], Pacemaker::Resource::Service[$::cinder::params::scheduler_service]], } + pacemaker::constraint::base { 'cinder-scheduler-then-cinder-volume-constraint': + constraint_type => 'order', + first_resource => "${::cinder::params::scheduler_service}-clone", + second_resource => $::cinder::params::volume_service, + first_action => 'start', + second_action => 'start', + require => [Pacemaker::Resource::Service[$::cinder::params::scheduler_service], + Pacemaker::Resource::Service[$::cinder::params::volume_service]], + } + pacemaker::constraint::colocation { 'cinder-volume-with-cinder-scheduler-colocation': + source => $::cinder::params::volume_service, + target => "${::cinder::params::scheduler_service}-clone", + score => 'INFINITY', + require => [Pacemaker::Resource::Service[$::cinder::params::scheduler_service], + Pacemaker::Resource::Service[$::cinder::params::volume_service]], + } } } diff --git a/manifests/profile/pacemaker/cinder/volume.pp b/manifests/profile/pacemaker/cinder/volume.pp index a4f251e..5a581eb 100644 --- a/manifests/profile/pacemaker/cinder/volume.pp +++ b/manifests/profile/pacemaker/cinder/volume.pp @@ -31,8 +31,7 @@ class tripleo::profile::pacemaker::cinder::volume ( $bootstrap_node = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - - Service <| tag == 'cinder-service' |> { + Service <| tag == 'cinder::volume' |> { hasrestart => true, restart => '/bin/true', start => '/bin/true', @@ -49,22 +48,6 @@ class tripleo::profile::pacemaker::cinder::volume ( if $step >= 5 and $pacemaker_master { pacemaker::resource::service { $::cinder::params::volume_service : } - pacemaker::constraint::base { 'cinder-scheduler-then-cinder-volume-constraint': - constraint_type => 'order', - first_resource => "${::cinder::params::scheduler_service}-clone", - second_resource => $::cinder::params::volume_service, - first_action => 'start', - second_action => 'start', - require => [Pacemaker::Resource::Service[$::cinder::params::scheduler_service], - Pacemaker::Resource::Service[$::cinder::params::volume_service]], - } - pacemaker::constraint::colocation { 'cinder-volume-with-cinder-scheduler-colocation': - source => $::cinder::params::volume_service, - target => "${::cinder::params::scheduler_service}-clone", - score => 'INFINITY', - require => [Pacemaker::Resource::Service[$::cinder::params::scheduler_service], - Pacemaker::Resource::Service[$::cinder::params::volume_service]], - } } } diff --git a/manifests/profile/pacemaker/core.pp b/manifests/profile/pacemaker/core.pp index b8b0781..359a817 100644 --- a/manifests/profile/pacemaker/core.pp +++ b/manifests/profile/pacemaker/core.pp @@ -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 { diff --git a/manifests/profile/pacemaker/database/mongodb.pp b/manifests/profile/pacemaker/database/mongodb.pp index 15c84d7..e4b5fcf 100644 --- a/manifests/profile/pacemaker/database/mongodb.pp +++ b/manifests/profile/pacemaker/database/mongodb.pp @@ -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 diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp index cc95092..529aeac 100644 --- a/manifests/profile/pacemaker/database/mysql.pp +++ b/manifests/profile/pacemaker/database/mysql.pp @@ -26,7 +26,6 @@ class tripleo::profile::pacemaker::database::mysql ( $step = hiera('step'), ) { - if $::hostname == downcase(hiera('bootstrap_nodeid')) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/database/redis.pp b/manifests/profile/pacemaker/database/redis.pp index 27dcbe9..8a37ce9 100644 --- a/manifests/profile/pacemaker/database/redis.pp +++ b/manifests/profile/pacemaker/database/redis.pp @@ -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), diff --git a/manifests/profile/pacemaker/glance.pp b/manifests/profile/pacemaker/glance.pp index 91fddf6..664b91f 100644 --- a/manifests/profile/pacemaker/glance.pp +++ b/manifests/profile/pacemaker/glance.pp @@ -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', diff --git a/manifests/profile/pacemaker/gnocchi.pp b/manifests/profile/pacemaker/gnocchi.pp index c8630ce..5bfc174 100644 --- a/manifests/profile/pacemaker/gnocchi.pp +++ b/manifests/profile/pacemaker/gnocchi.pp @@ -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', diff --git a/manifests/profile/pacemaker/gnocchi/api.pp b/manifests/profile/pacemaker/gnocchi/api.pp index ede4c9a..29f2435 100644 --- a/manifests/profile/pacemaker/gnocchi/api.pp +++ b/manifests/profile/pacemaker/gnocchi/api.pp @@ -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 } diff --git a/manifests/profile/pacemaker/gnocchi/metricd.pp b/manifests/profile/pacemaker/gnocchi/metricd.pp index 4ac5e74..c9dc2d9 100644 --- a/manifests/profile/pacemaker/gnocchi/metricd.pp +++ b/manifests/profile/pacemaker/gnocchi/metricd.pp @@ -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 diff --git a/manifests/profile/pacemaker/gnocchi/statsd.pp b/manifests/profile/pacemaker/gnocchi/statsd.pp index 526dcac..42d30b9 100644 --- a/manifests/profile/pacemaker/gnocchi/statsd.pp +++ b/manifests/profile/pacemaker/gnocchi/statsd.pp @@ -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 diff --git a/manifests/profile/pacemaker/haproxy.pp b/manifests/profile/pacemaker/haproxy.pp index a7aca58..1b83d9b 100644 --- a/manifests/profile/pacemaker/haproxy.pp +++ b/manifests/profile/pacemaker/haproxy.pp @@ -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) { diff --git a/manifests/profile/pacemaker/heat.pp b/manifests/profile/pacemaker/heat.pp index e72f02a..e3c1598 100644 --- a/manifests/profile/pacemaker/heat.pp +++ b/manifests/profile/pacemaker/heat.pp @@ -18,20 +18,14 @@ # # === 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::pacemaker::heat ( - $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), + $step = hiera('step'), ) { - Service <| tag == 'heat-service' |> { hasrestart => true, restart => '/bin/true', @@ -39,8 +33,6 @@ class tripleo::profile::pacemaker::heat ( stop => '/bin/true', } - class { '::tripleo::profile::base::heat': - bootstrap_master => $bootstrap_node, - } + include ::tripleo::profile::base::heat } diff --git a/manifests/profile/pacemaker/heat/api.pp b/manifests/profile/pacemaker/heat/api.pp index ed9ca5b..0fc4f8a 100644 --- a/manifests/profile/pacemaker/heat/api.pp +++ b/manifests/profile/pacemaker/heat/api.pp @@ -28,10 +28,9 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::heat::api ( - $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 { diff --git a/manifests/profile/pacemaker/heat/api_cfn.pp b/manifests/profile/pacemaker/heat/api_cfn.pp index d3ba6e4..1230c6b 100644 --- a/manifests/profile/pacemaker/heat/api_cfn.pp +++ b/manifests/profile/pacemaker/heat/api_cfn.pp @@ -28,10 +28,9 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::heat::api_cfn ( - $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 { diff --git a/manifests/profile/pacemaker/heat/api_cloudwatch.pp b/manifests/profile/pacemaker/heat/api_cloudwatch.pp index a7784fb..6110a0c 100644 --- a/manifests/profile/pacemaker/heat/api_cloudwatch.pp +++ b/manifests/profile/pacemaker/heat/api_cloudwatch.pp @@ -28,10 +28,9 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::heat::api_cloudwatch ( - $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 { diff --git a/manifests/profile/pacemaker/heat/engine.pp b/manifests/profile/pacemaker/heat/engine.pp index 158c138..88744ad 100644 --- a/manifests/profile/pacemaker/heat/engine.pp +++ b/manifests/profile/pacemaker/heat/engine.pp @@ -28,10 +28,9 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::heat::engine ( - $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 { diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp index 1cd5178..db14aea 100644 --- a/manifests/profile/pacemaker/keystone.pp +++ b/manifests/profile/pacemaker/keystone.pp @@ -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::keystone ( $bootstrap_node = hiera('bootstrap_nodeid'), + $enable_load_balancer = hiera('enable_load_balancer', true), $step = hiera('step'), - $enable_load_balancer = hiera('enable_load_balancer', true) ) { - Service <| tag == 'keystone-service' |> { hasrestart => true, restart => '/bin/true', @@ -77,9 +76,6 @@ class tripleo::profile::pacemaker::keystone ( require => [Pacemaker::Resource::Ocf['rabbitmq'], Pacemaker::Resource::Ocf['openstack-core']], } - File['/etc/keystone/ssl/certs/ca.pem'] -> Pacemaker::Resource::Service[$::apache::params::service_name] - File['/etc/keystone/ssl/private/signing_key.pem'] -> Pacemaker::Resource::Service[$::apache::params::service_name] - File['/etc/keystone/ssl/certs/signing_cert.pem'] -> Pacemaker::Resource::Service[$::apache::params::service_name] } } diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp index f3666c2..43ae875 100644 --- a/manifests/profile/pacemaker/manila.pp +++ b/manifests/profile/pacemaker/manila.pp @@ -22,86 +22,85 @@ # (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') +# [*cinder_volume_type*] +# (Optional) +# Defaults to hiera('manila::backend::generic::cinder_volume_type', '') +# +# [*driver_handles_share_servers*] +# (Optional) +# Defaults to hiera('manila::backend::generic::driver_handles_share_servers') # # [*manila_generic_enable*] # (Optional) Enable the generic backend. # Defaults to hiera('manila_generic_enable_backend', 'false') # -# [*driver_handles_share_servers*] +# [*max_time_to_attach*] # (Optional) -# Defaults to hiera('manila::backend::generic::driver_handles_share_servers') +# Defaults to hiera('manila::backend::generic::max_time_to_attach') # -# [*smb_template_config_path*] +# [*max_time_to_create_volume*] # (Optional) -# Defaults to hiera('manila::backend::generic::smb_template_config_path') +# Defaults to hiera('manila::backend::generic::max_time_to_create_volume') # -# [*volume_name_template*] -# (Optional) -# Defaults to hiera('manila::backend::generic::volume_name_template') - -# [*volume_snapshot_name_template*] +# [*service_instance_flavor_id*] # (Optional) -# Defaults to hiera('manila::backend::generic::volume_snapshot_name_template') +# Defaults to hiera('manila::service_instance::service_instance_flavor_id') # -# [*share_mount_path*] +# [*service_instance_password*] # (Optional) -# Defaults to hiera('manila::backend::generic::share_mount_path') +# Defaults to hiera('manila::service_instance::service_instance_password') # -# [*max_time_to_create_volume*] +# [*service_instance_smb_config_path*] # (Optional) -# Defaults to hiera('manila::backend::generic::max_time_to_create_volume') +# Defaults to downcase(hiera('manila::backend::generic::service_instance_smb_config_path')) # -# [*max_time_to_attach*] +# [*service_instance_user*] # (Optional) -# Defaults to hiera('manila::backend::generic::max_time_to_attach') +# Defaults to hiera('manila::service_instance::service_instance_user') # -# [*service_instance_smb_config_path*] +# [*share_mount_path*] # (Optional) -# Defaults to downcase(hiera('manila::backend::generic::service_instance_smb_config_path')) +# Defaults to hiera('manila::backend::generic::share_mount_path') # # [*share_volume_fstype*] # (Optional) # Defaults to hiera('manila::backend::generic::share_volume_fstype') # -# [*cinder_volume_type*] +# [*smb_template_config_path*] # (Optional) -# Defaults to hiera('manila::backend::generic::cinder_volume_type', '') +# Defaults to hiera('manila::backend::generic::smb_template_config_path') # -# [*service_instance_user*] -# (Optional) -# Defaults to hiera('manila::service_instance::service_instance_user') - -# [*service_instance_password*] +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +# [*volume_name_template*] # (Optional) -# Defaults to hiera('manila::service_instance::service_instance_password') - -# [*service_instance_flavor_id*] +# Defaults to hiera('manila::backend::generic::volume_name_template') +# +# [*volume_snapshot_name_template*] # (Optional) -# Defaults to hiera('manila::service_instance::service_instance_flavor_id') +# Defaults to hiera('manila::backend::generic::volume_snapshot_name_template') # class tripleo::profile::pacemaker::manila ( $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), - $manila_generic_enable = hiera('manila_generic_enable_backend', false), + $cinder_volume_type = hiera('manila::backend::generic::cinder_volume_type', ''), $driver_handles_share_servers = hiera('manila::backend::generic::driver_handles_share_servers'), - $smb_template_config_path = hiera('manila::backend::generic::smb_template_config_path'), - $volume_name_template = hiera('manila::backend::generic::volume_name_template'), - $volume_snapshot_name_template = hiera('manila::backend::generic::volume_snapshot_name_template'), - $share_mount_path = hiera('manila::backend::generic::share_mount_path'), - $max_time_to_create_volume = hiera('manila::backend::generic::max_time_to_create_volume'), + $manila_generic_enable = hiera('manila_generic_enable_backend', false), $max_time_to_attach = hiera('manila::backend::generic::max_time_to_attach'), + $max_time_to_create_volume = hiera('manila::backend::generic::max_time_to_create_volume'), + $service_instance_flavor_id = hiera('manila::service_instance::service_instance_flavor_id'), + $service_instance_password = hiera('manila::service_instance::service_instance_password'), $service_instance_smb_config_path = hiera('manila::backend::generic::service_instance_smb_config_path'), - $share_volume_fstype = hiera('manila::backend::generic::share_volume_fstype'), - $cinder_volume_type = hiera('manila::backend::generic::cinder_volume_type', ''), $service_instance_user = hiera('manila::service_instance::service_instance_user'), - $service_instance_password = hiera('manila::service_instance::service_instance_password'), - $service_instance_flavor_id = hiera('manila::service_instance::service_instance_flavor_id'), + $share_mount_path = hiera('manila::backend::generic::share_mount_path'), + $share_volume_fstype = hiera('manila::backend::generic::share_volume_fstype'), + $smb_template_config_path = hiera('manila::backend::generic::smb_template_config_path'), + $step = hiera('step'), + $volume_name_template = hiera('manila::backend::generic::volume_name_template'), + $volume_snapshot_name_template = hiera('manila::backend::generic::volume_snapshot_name_template'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/memcached.pp b/manifests/profile/pacemaker/memcached.pp index 09af5d6..2a6bd4d 100644 --- a/manifests/profile/pacemaker/memcached.pp +++ b/manifests/profile/pacemaker/memcached.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::memcached ( $bootstrap_node = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/neutron.pp b/manifests/profile/pacemaker/neutron.pp index 0298298..6525126 100644 --- a/manifests/profile/pacemaker/neutron.pp +++ b/manifests/profile/pacemaker/neutron.pp @@ -18,22 +18,14 @@ # # === Parameters # -# [*step*] -# (Optional) The step in the deployment -# Defaults to hiera('step') -# -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid', undef) +# [*enable_dhcp*] +# (Optional) Whether to include the Neutron DHCP agent pacemaker profile +# Defaults to hiera('neutron::enable_dhcp_agent', false) # # [*enable_l3*] # (Optional) Whether to include the Neutron L3 agent pacemaker profile # Defaults to hiera('neutron::enable_l3_agent', false) # -# [*enable_dhcp*] -# (Optional) Whether to include the Neutron DHCP agent pacemaker profile -# Defaults to hiera('neutron::enable_dhcp_agent', false) -# # [*enable_metadata*] # (Optional) Whether to include the Neutron Metadata agent pacemaker profile # Defaults to hiera('neutron::enable_metadata_agent', false) @@ -42,16 +34,24 @@ # (Optional) Whether to include the Neutron OVS agent pacemaker profile # Defaults to hiera('neutron::enable_ovs_agent', false) # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid', undef) +# +# [*step*] +# (Optional) The step in the deployment +# Defaults to hiera('step') +# class tripleo::profile::pacemaker::neutron ( - $step = hiera('step'), - $pacemaker_master = hiera('bootstrap_nodeid', undef), # We can drop the hiera defaults once the neutron roles are decomposed - $enable_l3 = hiera('neutron::enable_l3_agent', false), $enable_dhcp = hiera('neutron::enable_dhcp_agent', false), + $enable_l3 = hiera('neutron::enable_l3_agent', false), $enable_metadata = hiera('neutron::enable_metadata_agent', false), $enable_ovs = hiera('neutron::enable_ovs_agent', false), + #Don't drop below this line + $pacemaker_master = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { - Service <| tag == 'neutron-service' |> { diff --git a/manifests/profile/pacemaker/neutron/dhcp.pp b/manifests/profile/pacemaker/neutron/dhcp.pp index d738f21..e76012f 100644 --- a/manifests/profile/pacemaker/neutron/dhcp.pp +++ b/manifests/profile/pacemaker/neutron/dhcp.pp @@ -18,20 +18,19 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid', undef) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid', undef) -# class tripleo::profile::pacemaker::neutron::dhcp ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { - include ::neutron::params include ::tripleo::profile::pacemaker::neutron include ::tripleo::profile::base::neutron::dhcp diff --git a/manifests/profile/pacemaker/neutron/l3.pp b/manifests/profile/pacemaker/neutron/l3.pp index fec4af2..c3ae3b8 100644 --- a/manifests/profile/pacemaker/neutron/l3.pp +++ b/manifests/profile/pacemaker/neutron/l3.pp @@ -18,20 +18,19 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid', undef) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid', undef) -# class tripleo::profile::pacemaker::neutron::l3 ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { - include ::neutron::params include ::tripleo::profile::pacemaker::neutron include ::tripleo::profile::base::neutron::l3 diff --git a/manifests/profile/pacemaker/neutron/metadata.pp b/manifests/profile/pacemaker/neutron/metadata.pp index 4fccea2..f09edba 100644 --- a/manifests/profile/pacemaker/neutron/metadata.pp +++ b/manifests/profile/pacemaker/neutron/metadata.pp @@ -18,20 +18,19 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid', undef) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid', undef) -# class tripleo::profile::pacemaker::neutron::metadata ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { - include ::neutron::params include ::tripleo::profile::pacemaker::neutron include ::tripleo::profile::base::neutron::metadata diff --git a/manifests/profile/pacemaker/neutron/midonet.pp b/manifests/profile/pacemaker/neutron/midonet.pp index 9d380f0..453641a 100644 --- a/manifests/profile/pacemaker/neutron/midonet.pp +++ b/manifests/profile/pacemaker/neutron/midonet.pp @@ -18,18 +18,18 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid', undef) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid', undef) -# class tripleo::profile::pacemaker::neutron::midonet ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { include ::neutron::params include ::tripleo::profile::pacemaker::neutron diff --git a/manifests/profile/pacemaker/neutron/ovs.pp b/manifests/profile/pacemaker/neutron/ovs.pp index a330de1..7e3b15c 100644 --- a/manifests/profile/pacemaker/neutron/ovs.pp +++ b/manifests/profile/pacemaker/neutron/ovs.pp @@ -18,20 +18,19 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid', undef) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid', undef) -# class tripleo::profile::pacemaker::neutron::ovs ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { - include ::neutron::params include ::tripleo::profile::pacemaker::neutron include ::tripleo::profile::base::neutron::ovs diff --git a/manifests/profile/pacemaker/neutron/plugins/ml2.pp b/manifests/profile/pacemaker/neutron/plugins/ml2.pp index e5e13b7..aff682a 100644 --- a/manifests/profile/pacemaker/neutron/plugins/ml2.pp +++ b/manifests/profile/pacemaker/neutron/plugins/ml2.pp @@ -20,10 +20,7 @@ # class tripleo::profile::pacemaker::neutron::plugins::ml2 { - include ::neutron::params include ::tripleo::profile::pacemaker::neutron - include ::tripleo::profile::base::neutron::plugins::ml2 - } diff --git a/manifests/profile/pacemaker/neutron/plugins/nuage.pp b/manifests/profile/pacemaker/neutron/plugins/nuage.pp index de00761..03cdb7e 100644 --- a/manifests/profile/pacemaker/neutron/plugins/nuage.pp +++ b/manifests/profile/pacemaker/neutron/plugins/nuage.pp @@ -20,7 +20,5 @@ # class tripleo::profile::pacemaker::neutron::plugins::nuage { - include ::tripleo::profile::base::neutron::plugins::nuage - } diff --git a/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp index f1568e9..438245a 100644 --- a/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp +++ b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp @@ -20,7 +20,5 @@ # class tripleo::profile::pacemaker::neutron::plugins::opencontrail { - include ::tripleo::profile::base::neutron::plugins::opencontrail - } diff --git a/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp index 7313ef9..38b2179 100644 --- a/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp +++ b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp @@ -20,7 +20,5 @@ # class tripleo::profile::pacemaker::neutron::plugins::plumgrid { - include ::tripleo::profile::base::neutron::plugins::plumgrid - } diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp index acd7993..d817ee7 100644 --- a/manifests/profile/pacemaker/neutron/server.pp +++ b/manifests/profile/pacemaker/neutron/server.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::neutron::server ( $pacemaker_master = hiera('bootstrap_nodeid', undef), $step = hiera('step'), ) { - include ::neutron::params include ::tripleo::profile::pacemaker::neutron diff --git a/manifests/profile/pacemaker/nova.pp b/manifests/profile/pacemaker/nova.pp index 62a8042..222035e 100644 --- a/manifests/profile/pacemaker/nova.pp +++ b/manifests/profile/pacemaker/nova.pp @@ -25,7 +25,6 @@ class tripleo::profile::pacemaker::nova ( $step = hiera('step'), ) { - Service <| tag == 'nova-service' |> { diff --git a/manifests/profile/pacemaker/nova/api.pp b/manifests/profile/pacemaker/nova/api.pp index 5e8f15f..188beda 100644 --- a/manifests/profile/pacemaker/nova/api.pp +++ b/manifests/profile/pacemaker/nova/api.pp @@ -18,18 +18,18 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to downcase(hiera('bootstrap_nodeid')) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to downcase(hiera('bootstrap_nodeid')) -# class tripleo::profile::pacemaker::nova::api ( - $step = hiera('step'), $pacemaker_master = downcase(hiera('bootstrap_nodeid')), + $step = hiera('step'), ) { include ::nova::params diff --git a/manifests/profile/pacemaker/nova/conductor.pp b/manifests/profile/pacemaker/nova/conductor.pp index 3e390e0..f2605cb 100644 --- a/manifests/profile/pacemaker/nova/conductor.pp +++ b/manifests/profile/pacemaker/nova/conductor.pp @@ -18,18 +18,18 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid') -# class tripleo::profile::pacemaker::nova::conductor ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { include ::nova::params diff --git a/manifests/profile/pacemaker/nova/consoleauth.pp b/manifests/profile/pacemaker/nova/consoleauth.pp index ad538c4..6cd8c15 100644 --- a/manifests/profile/pacemaker/nova/consoleauth.pp +++ b/manifests/profile/pacemaker/nova/consoleauth.pp @@ -18,18 +18,18 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid') -# class tripleo::profile::pacemaker::nova::consoleauth ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { include ::nova::params diff --git a/manifests/profile/pacemaker/nova/scheduler.pp b/manifests/profile/pacemaker/nova/scheduler.pp index 9e78c30..8c387d2 100644 --- a/manifests/profile/pacemaker/nova/scheduler.pp +++ b/manifests/profile/pacemaker/nova/scheduler.pp @@ -18,20 +18,19 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid') -# class tripleo::profile::pacemaker::nova::scheduler ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { - include ::nova::params include ::tripleo::profile::pacemaker::nova include ::tripleo::profile::base::nova::scheduler diff --git a/manifests/profile/pacemaker/nova/vncproxy.pp b/manifests/profile/pacemaker/nova/vncproxy.pp index ec71ca7..3652daa 100644 --- a/manifests/profile/pacemaker/nova/vncproxy.pp +++ b/manifests/profile/pacemaker/nova/vncproxy.pp @@ -18,20 +18,19 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid') -# class tripleo::profile::pacemaker::nova::vncproxy ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { - include ::nova::params include ::tripleo::profile::pacemaker::nova include ::tripleo::profile::base::nova::vncproxy diff --git a/manifests/profile/pacemaker/rabbitmq.pp b/manifests/profile/pacemaker/rabbitmq.pp index efb91b5..93edec9 100644 --- a/manifests/profile/pacemaker/rabbitmq.pp +++ b/manifests/profile/pacemaker/rabbitmq.pp @@ -22,21 +22,20 @@ # (Optional) The hostname of the node responsible for bootstrapping tasks # Defaults to hiera('bootstrap_nodeid') # +# [*erlang_cookie*] +# (Optional) Content of erlang cookie. +# Defaults to hiera('rabbitmq::erlang_cookie'). +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*erlang_cookie*] -# (Optional) Content of erlang cookie. -# Defaults to hiera('rabbitmq::erlang_cookie'). -# class tripleo::profile::pacemaker::rabbitmq ( $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), $erlang_cookie = hiera('rabbitmq::erlang_cookie'), + $step = hiera('step'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/sahara.pp b/manifests/profile/pacemaker/sahara.pp index 0627017..07cd882 100644 --- a/manifests/profile/pacemaker/sahara.pp +++ b/manifests/profile/pacemaker/sahara.pp @@ -26,7 +26,6 @@ class tripleo::profile::pacemaker::sahara ( $step = hiera('step'), ) { - Service <| tag == 'sahara-service' |> { hasrestart => true, restart => '/bin/true', diff --git a/manifests/profile/pacemaker/sahara/api.pp b/manifests/profile/pacemaker/sahara/api.pp index eed82dd..0e3d97a 100644 --- a/manifests/profile/pacemaker/sahara/api.pp +++ b/manifests/profile/pacemaker/sahara/api.pp @@ -28,10 +28,9 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::sahara::api ( - $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 { diff --git a/manifests/profile/pacemaker/sahara/engine.pp b/manifests/profile/pacemaker/sahara/engine.pp index 850c645..ada6c06 100644 --- a/manifests/profile/pacemaker/sahara/engine.pp +++ b/manifests/profile/pacemaker/sahara/engine.pp @@ -28,10 +28,9 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::sahara::engine ( - $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 { diff --git a/metadata.json b/metadata.json index 457f86e..8d38b3f 100644 --- a/metadata.json +++ b/metadata.json @@ -23,6 +23,8 @@ } ], "dependencies": [ - { "name": "puppetlabs/stdlib", "version_requirement": ">= 3.2.0 < 5.0.0" } + { "name": "puppetlabs/stdlib", "version_requirement": ">= 3.2.0 < 5.0.0" }, + { "name": "sensu/sensu" }, + { "name": "yelp/uchiwa" } ] } |