diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-12-04 01:49:09 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-12-04 01:49:09 +0000 |
commit | 77c1ca1243fbc38210e9f6264c5c36b546d1a95a (patch) | |
tree | c1481aa4cb604182af584c60ef8837407a33c1f9 /manifests/profile/pacemaker/nova | |
parent | c6ad1436284ff379eacfb3715cf2a609785b9e6c (diff) | |
parent | c7d5821212411f9eae42954f6fb4a20f02170395 (diff) |
Merge "Remove unused pacemaker profiles"
Diffstat (limited to 'manifests/profile/pacemaker/nova')
-rw-r--r-- | manifests/profile/pacemaker/nova/api.pp | 88 | ||||
-rw-r--r-- | manifests/profile/pacemaker/nova/conductor.pp | 77 | ||||
-rw-r--r-- | manifests/profile/pacemaker/nova/consoleauth.pp | 87 | ||||
-rw-r--r-- | manifests/profile/pacemaker/nova/scheduler.pp | 52 | ||||
-rw-r--r-- | manifests/profile/pacemaker/nova/vncproxy.pp | 52 |
5 files changed, 0 insertions, 356 deletions
diff --git a/manifests/profile/pacemaker/nova/api.pp b/manifests/profile/pacemaker/nova/api.pp deleted file mode 100644 index 6724b4d..0000000 --- a/manifests/profile/pacemaker/nova/api.pp +++ /dev/null @@ -1,88 +0,0 @@ -# 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::nova::api -# -# Nova API with Pacemaker profile for tripleo -# -# === 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') -# -class tripleo::profile::pacemaker::nova::api ( - $pacemaker_master = downcase(hiera('bootstrap_nodeid')), - $step = hiera('step'), -) { - - include ::nova::params - include ::tripleo::profile::pacemaker::nova - - Service<| title == 'nova-api' |> { - hasrestart => true, - restart => '/bin/true', - start => '/bin/true', - stop => '/bin/true', - } - - include ::tripleo::profile::base::nova::api - - if $step >= 5 and downcase($::hostname) == $pacemaker_master { - pacemaker::resource::service { $::nova::params::api_service_name: - op_params => 'start timeout=200s stop timeout=200s', - clone_params => 'interleave=true', - } - - pacemaker::constraint::base { 'nova-vncproxy-then-nova-api-constraint': - constraint_type => 'order', - first_resource => "${::nova::params::vncproxy_service_name}-clone", - second_resource => "${::nova::params::api_service_name}-clone", - first_action => 'start', - second_action => 'start', - require => [Pacemaker::Resource::Service[$::nova::params::vncproxy_service_name], - Pacemaker::Resource::Service[$::nova::params::api_service_name]], - } - pacemaker::constraint::colocation { 'nova-api-with-nova-vncproxy-colocation': - source => "${::nova::params::api_service_name}-clone", - target => "${::nova::params::vncproxy_service_name}-clone", - score => 'INFINITY', - require => [Pacemaker::Resource::Service[$::nova::params::vncproxy_service_name], - Pacemaker::Resource::Service[$::nova::params::api_service_name]], - } - pacemaker::constraint::base { 'nova-api-then-nova-scheduler-constraint': - constraint_type => 'order', - first_resource => "${::nova::params::api_service_name}-clone", - second_resource => "${::nova::params::scheduler_service_name}-clone", - first_action => 'start', - second_action => 'start', - require => [Pacemaker::Resource::Service[$::nova::params::api_service_name], - Pacemaker::Resource::Service[$::nova::params::scheduler_service_name]], - } - pacemaker::constraint::colocation { 'nova-scheduler-with-nova-api-colocation': - source => "${::nova::params::scheduler_service_name}-clone", - target => "${::nova::params::api_service_name}-clone", - score => 'INFINITY', - require => [Pacemaker::Resource::Service[$::nova::params::api_service_name], - Pacemaker::Resource::Service[$::nova::params::scheduler_service_name]], - } - - } - -} diff --git a/manifests/profile/pacemaker/nova/conductor.pp b/manifests/profile/pacemaker/nova/conductor.pp deleted file mode 100644 index b7ffe0c..0000000 --- a/manifests/profile/pacemaker/nova/conductor.pp +++ /dev/null @@ -1,77 +0,0 @@ -# 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::nova::conductor -# -# Nova Conductor with Pacemaker profile for tripleo -# -# === 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') -# -class tripleo::profile::pacemaker::nova::conductor ( - $pacemaker_master = hiera('bootstrap_nodeid'), - $step = hiera('step'), -) { - - include ::nova::params - include ::tripleo::profile::pacemaker::nova - include ::tripleo::profile::base::nova::conductor - - Service<| title == 'nova-conductor' |> { - hasrestart => true, - restart => '/bin/true', - start => '/bin/true', - stop => '/bin/true', - } - - if $step >= 5 and downcase($::hostname) == $pacemaker_master { - pacemaker::resource::service { $::nova::params::conductor_service_name: - op_params => 'start timeout=200s stop timeout=200s', - clone_params => 'interleave=true', - } - - pacemaker::constraint::base { 'nova-scheduler-then-nova-conductor-constraint': - constraint_type => 'order', - first_resource => "${::nova::params::scheduler_service_name}-clone", - second_resource => "${::nova::params::conductor_service_name}-clone", - first_action => 'start', - second_action => 'start', - require => [Pacemaker::Resource::Service[$::nova::params::scheduler_service_name], - Pacemaker::Resource::Service[$::nova::params::conductor_service_name]], - } - pacemaker::constraint::colocation { 'nova-conductor-with-nova-scheduler-colocation': - source => "${::nova::params::conductor_service_name}-clone", - target => "${::nova::params::scheduler_service_name}-clone", - score => 'INFINITY', - require => [Pacemaker::Resource::Service[$::nova::params::scheduler_service_name], - Pacemaker::Resource::Service[$::nova::params::conductor_service_name]], - } - - - # If Service['nova-compute'] is in catalog, make sure we start it after - # nova-conductor pcmk resource. - # Also make sure to restart nova-compute if nova-conductor pcmk resource changed - # the state, since nova-compute is deployed at a previous step. - Pacemaker::Resource::Service[$::nova::params::conductor_service_name] ~> Service<| title == 'nova-compute' |> - } - -} diff --git a/manifests/profile/pacemaker/nova/consoleauth.pp b/manifests/profile/pacemaker/nova/consoleauth.pp deleted file mode 100644 index aeec6b4..0000000 --- a/manifests/profile/pacemaker/nova/consoleauth.pp +++ /dev/null @@ -1,87 +0,0 @@ -# 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::nova::consoleauth -# -# Nova Consoleauth with Pacemaker profile for tripleo -# -# === 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') -# -class tripleo::profile::pacemaker::nova::consoleauth ( - $pacemaker_master = hiera('bootstrap_nodeid'), - $step = hiera('step'), -) { - - include ::nova::params - include ::tripleo::profile::pacemaker::nova - include ::tripleo::profile::base::nova::consoleauth - - Service<| title == 'nova-consoleauth' |> { - hasrestart => true, - restart => '/bin/true', - start => '/bin/true', - stop => '/bin/true', - } - - if $step >= 5 and downcase($::hostname) == $pacemaker_master { - pacemaker::resource::service { $::nova::params::consoleauth_service_name: - op_params => 'start timeout=200s stop timeout=200s', - clone_params => 'interleave=true', - } - - pacemaker::constraint::base { 'keystone-then-nova-consoleauth-constraint': - constraint_type => 'order', - first_resource => 'openstack-core-clone', - second_resource => "${::nova::params::consoleauth_service_name}-clone", - first_action => 'start', - second_action => 'start', - require => [Pacemaker::Resource::Service[$::nova::params::consoleauth_service_name], - Pacemaker::Resource::Ocf['openstack-core']], - } - pacemaker::constraint::colocation { 'nova-consoleauth-with-openstack-core': - source => "${::nova::params::consoleauth_service_name}-clone", - target => 'openstack-core-clone', - score => 'INFINITY', - require => [Pacemaker::Resource::Service[$::nova::params::consoleauth_service_name], - Pacemaker::Resource::Ocf['openstack-core']], - } - pacemaker::constraint::base { 'nova-consoleauth-then-nova-vncproxy-constraint': - constraint_type => 'order', - first_resource => "${::nova::params::consoleauth_service_name}-clone", - second_resource => "${::nova::params::vncproxy_service_name}-clone", - first_action => 'start', - second_action => 'start', - require => [Pacemaker::Resource::Service[$::nova::params::consoleauth_service_name], - Pacemaker::Resource::Service[$::nova::params::vncproxy_service_name]], - } - pacemaker::constraint::colocation { 'nova-vncproxy-with-nova-consoleauth-colocation': - source => "${::nova::params::vncproxy_service_name}-clone", - target => "${::nova::params::consoleauth_service_name}-clone", - score => 'INFINITY', - require => [Pacemaker::Resource::Service[$::nova::params::consoleauth_service_name], - Pacemaker::Resource::Service[$::nova::params::vncproxy_service_name]], - } - - } - -} diff --git a/manifests/profile/pacemaker/nova/scheduler.pp b/manifests/profile/pacemaker/nova/scheduler.pp deleted file mode 100644 index d4d3dab..0000000 --- a/manifests/profile/pacemaker/nova/scheduler.pp +++ /dev/null @@ -1,52 +0,0 @@ -# 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::nova::scheduler -# -# Nova Scheduler with Pacemaker profile for tripleo -# -# === 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') -# -class tripleo::profile::pacemaker::nova::scheduler ( - $pacemaker_master = hiera('bootstrap_nodeid'), - $step = hiera('step'), -) { - include ::nova::params - include ::tripleo::profile::pacemaker::nova - include ::tripleo::profile::base::nova::scheduler - - Service<| title == 'nova-scheduler' |> { - hasrestart => true, - restart => '/bin/true', - start => '/bin/true', - stop => '/bin/true', - } - - if $step >= 5 and downcase($::hostname) == $pacemaker_master { - pacemaker::resource::service { $::nova::params::scheduler_service_name: - op_params => 'start timeout=200s stop timeout=200s', - clone_params => 'interleave=true', - } - } - -} diff --git a/manifests/profile/pacemaker/nova/vncproxy.pp b/manifests/profile/pacemaker/nova/vncproxy.pp deleted file mode 100644 index e9a1124..0000000 --- a/manifests/profile/pacemaker/nova/vncproxy.pp +++ /dev/null @@ -1,52 +0,0 @@ -# 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::nova::vncproxy -# -# Nova vncproxy with Pacemaker profile for tripleo -# -# === 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') -# -class tripleo::profile::pacemaker::nova::vncproxy ( - $pacemaker_master = hiera('bootstrap_nodeid'), - $step = hiera('step'), -) { - include ::nova::params - include ::tripleo::profile::pacemaker::nova - include ::tripleo::profile::base::nova::vncproxy - - Service<| title == 'nova-vncproxy' |> { - hasrestart => true, - restart => '/bin/true', - start => '/bin/true', - stop => '/bin/true', - } - - if $step >= 5 and downcase($::hostname) == $pacemaker_master { - pacemaker::resource::service { $::nova::params::vncproxy_service_name: - op_params => 'start timeout=200s stop timeout=200s', - clone_params => 'interleave=true', - } - } - -} |