From 5b5ee3fdcf92b70173db168c8f65b1117c89e966 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Wed, 6 Oct 2021 12:03:02 +0200 Subject: [PATCH] Drop non-bundle manila Just like we did via Id1340c45679d720cdf5ed9b5b15347d73cffc445 (Drop all non bundle implementations), let's also drop the non-bundle implementation of manila Depends-On: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/812654 Change-Id: I2097c9e578713ac43e7360566e786dd92b4ebec0 --- manifests/profile/pacemaker/manila.pp | 87 --------------------------- 1 file changed, 87 deletions(-) delete mode 100644 manifests/profile/pacemaker/manila.pp diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp deleted file mode 100644 index 4ba98df61..000000000 --- a/manifests/profile/pacemaker/manila.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::manila -# -# Manila Pacemaker HA profile for tripleo -# -# === Parameters -# -# [*bootstrap_node*] -# (Optional) The hostname of the node responsible for bootstrapping tasks -# Defaults to hiera('manila_share_short_bootstrap_node_name') -# -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# -# [*pcs_tries*] -# (Optional) The number of times pcs commands should be retried. -# Defaults to hiera('pcs_tries', 20) -# -class tripleo::profile::pacemaker::manila ( - $bootstrap_node = hiera('manila_share_short_bootstrap_node_name'), - $step = Integer(hiera('step')), - $pcs_tries = hiera('pcs_tries', 20), -) { - if $bootstrap_node and $::hostname == downcase($bootstrap_node) { - $pacemaker_master = true - } else { - $pacemaker_master = false - } - - # make it so puppet can't restart the manila-share service, since that is - # the only pacemaker managed one - Service <| tag == 'manila-share' |> { - hasrestart => true, - restart => '/bin/true', - start => '/bin/true', - stop => '/bin/true', - } - - include tripleo::profile::base::manila::share - - if $step >= 2 { - pacemaker::property { 'manila-share-role-node-property': - property => 'manila-share-role', - value => true, - tries => $pcs_tries, - node => $::hostname, - } - } - - if $step >= 4 { - if $pacemaker_master and hiera('stack_action') == 'UPDATE' { - Manila_api_paste_ini<||> ~> Tripleo::Pacemaker::Resource_restart_flag["${::manila::params::share_service}"] - Manila_config<||> ~> Tripleo::Pacemaker::Resource_restart_flag["${::manila::params::share_service}"] - tripleo::pacemaker::resource_restart_flag { "${::manila::params::share_service}": } - } - } - - if $step >= 5 and $pacemaker_master { - - # only manila-share is pacemaker managed, and in a/p - pacemaker::resource::service { $::manila::params::share_service : - op_params => 'start timeout=200s stop timeout=200s', - tries => $pcs_tries, - location_rule => { - resource_discovery => 'exclusive', - score => 0, - expression => ['manila-share-role eq true'], - }, - } - - } -}