diff options
| -rw-r--r-- | manifests/profile/base/ceph/osd.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/ironic.pp | 13 | ||||
| -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/base/nova/compute/ironic.pp (renamed from manifests/certmonger.pp) | 29 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/cinder/scheduler.pp | 16 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/cinder/volume.pp | 18 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/sahara.pp | 13 |
10 files changed, 96 insertions, 71 deletions
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/ironic.pp b/manifests/profile/base/ironic.pp index dd30dd7..ca4f366 100644 --- a/manifests/profile/base/ironic.pp +++ b/manifests/profile/base/ironic.pp @@ -30,19 +30,20 @@ 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/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/certmonger.pp b/manifests/profile/base/nova/compute/ironic.pp index e5f5e04..a01e90f 100644 --- a/manifests/certmonger.pp +++ b/manifests/profile/base/nova/compute/ironic.pp @@ -12,26 +12,25 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: tripleo::certmonger +# == Class: tripleo::profile::base::nova::compute::ironic # -# Sets some default defaults necessary for the global certmonger setup. +# Nova Compute Ironic 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::nova::compute::ironic ( + $step = hiera('step'), +) { - Certmonger_certificate { - ca => $global_ca, - ensure => 'present', - certbackend => 'FILE', - keybackend => 'FILE', - wait => true, - require => Class['::certmonger'], + if $step >= 4 { + include ::tripleo::profile::base::nova::compute + include ::nova::compute::ironic + include ::nova::network::neutron } + } diff --git a/manifests/profile/pacemaker/cinder/scheduler.pp b/manifests/profile/pacemaker/cinder/scheduler.pp index 9b79903..00b0696 100644 --- a/manifests/profile/pacemaker/cinder/scheduler.pp +++ b/manifests/profile/pacemaker/cinder/scheduler.pp @@ -67,6 +67,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..d909831 100644 --- a/manifests/profile/pacemaker/cinder/volume.pp +++ b/manifests/profile/pacemaker/cinder/volume.pp @@ -32,7 +32,7 @@ class tripleo::profile::pacemaker::cinder::volume ( $step = hiera('step'), ) { - Service <| tag == 'cinder-service' |> { + Service <| tag == 'cinder::volume' |> { hasrestart => true, restart => '/bin/true', start => '/bin/true', @@ -49,22 +49,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/sahara.pp b/manifests/profile/pacemaker/sahara.pp index e6e5117..0627017 100644 --- a/manifests/profile/pacemaker/sahara.pp +++ b/manifests/profile/pacemaker/sahara.pp @@ -18,18 +18,13 @@ # # === 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::sahara ( - $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), + $step = hiera('step'), ) { Service <| tag == 'sahara-service' |> { @@ -39,11 +34,5 @@ class tripleo::profile::pacemaker::sahara ( stop => '/bin/true', } - if $::hostname == downcase($bootstrap_node) { - $pacemaker_master = true - } else { - $pacemaker_master = false - } - include ::tripleo::profile::base::sahara } |