diff options
| -rw-r--r-- | manifests/profile/base/aodh.pp | 53 | ||||
| -rw-r--r-- | manifests/profile/base/aodh/api.pp | 47 | ||||
| -rw-r--r-- | manifests/profile/base/aodh/evaluator.pp | 48 | ||||
| -rw-r--r-- | manifests/profile/base/aodh/listener.pp | 48 | ||||
| -rw-r--r-- | manifests/profile/base/aodh/notifier.pp | 48 | ||||
| -rw-r--r-- | manifests/profile/base/ceph/osd.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/keystone.pp | 28 | ||||
| -rw-r--r-- | manifests/profile/base/mistral.pp | 26 | ||||
| -rw-r--r-- | manifests/profile/base/mistral/api.pp | 13 | ||||
| -rw-r--r-- | manifests/profile/base/mistral/engine.pp | 23 | ||||
| -rw-r--r-- | manifests/profile/base/mistral/executor.pp | 14 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/keystone.pp | 3 |
12 files changed, 301 insertions, 52 deletions
diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp new file mode 100644 index 0000000..28156a0 --- /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 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..3aa436d --- /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 and $sync_db { + 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..46d1d14 --- /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 and $sync_db { + 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..93f37fa --- /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 and $sync_db { + 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..0686012 --- /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 and $sync_db { + include ::aodh::notifier + } + +} + diff --git a/manifests/profile/base/ceph/osd.pp b/manifests/profile/base/ceph/osd.pp index a9224d3..9736656 100644 --- a/manifests/profile/base/ceph/osd.pp +++ b/manifests/profile/base/ceph/osd.pp @@ -34,7 +34,7 @@ class tripleo::profile::base::ceph::osd ( 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/keystone.pp b/manifests/profile/base/keystone.pp index 9617c11..bba98f8 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -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/mistral.pp b/manifests/profile/base/mistral.pp index 42507b9..c0b0538 100644 --- a/manifests/profile/base/mistral.pp +++ b/manifests/profile/base/mistral.pp @@ -18,22 +18,34 @@ # # === Parameters # -# [*sync_db*] -# (Optional) Whether to run db sync -# Defaults to true -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks +# Defaults to hiera('bootstrap_nodeid') +# class tripleo::profile::base::mistral ( - $sync_db = true, - $step = hiera('step'), + $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), ) { - if $step >= 3 { + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } + + if $step >= 3 and $sync_db { + include ::mistral::db::mysql + } + + if $step >= 4 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..38e1e61 100644 --- a/manifests/profile/base/mistral/api.pp +++ b/manifests/profile/base/mistral/api.pp @@ -23,13 +23,24 @@ # for more details. # Defaults to hiera('step') # +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks +# Defaults to hiera('bootstrap_nodeid') +# class tripleo::profile::base::mistral::api ( $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), ) { + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } + include ::tripleo::profile::base::mistral - if $step >= 4 { + if $step >= 4 and $sync_db { include ::mistral::api } } diff --git a/manifests/profile/base/mistral/engine.pp b/manifests/profile/base/mistral/engine.pp index 141cbad..dfcbc2c 100644 --- a/manifests/profile/base/mistral/engine.pp +++ b/manifests/profile/base/mistral/engine.pp @@ -18,28 +18,29 @@ # # === Parameters # -# [*sync_db*] -# (Optional) Whether to run db sync -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks +# Defaults to hiera('bootstrap_nodeid') +# class tripleo::profile::base::mistral::engine ( - $sync_db = true, $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), ) { - include ::tripleo::profile::base::mistral - - if $step >= 3 and $sync_db { - include ::mistral::db::mysql - include ::mistral::db::sync + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false } - if $step >= 4 { + include ::tripleo::profile::base::mistral + + if $step >= 4 and $sync_db { include ::mistral::engine } diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp index d7b5776..6f101c8 100644 --- a/manifests/profile/base/mistral/executor.pp +++ b/manifests/profile/base/mistral/executor.pp @@ -23,13 +23,25 @@ # for more details. # Defaults to hiera('step') # +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks +# Defaults to hiera('bootstrap_nodeid') +# class tripleo::profile::base::mistral::executor ( $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), + ) { + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } + include ::tripleo::profile::base::mistral - if $step >= 4 { + if $step >= 4 and $sync_db { include ::mistral::executor } diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp index 1cd5178..f48193a 100644 --- a/manifests/profile/pacemaker/keystone.pp +++ b/manifests/profile/pacemaker/keystone.pp @@ -77,9 +77,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] } } |