From 941026320111520da14c996b25acf6d92da6d76b Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Wed, 8 Jan 2014 20:43:36 +0000 Subject: [PATCH] remove unnecessary pacemaker service resources Services are just a particular type of Pacemaker primitive resource, so they are already covered by the primitive LWRP. --- providers/service.rb | 68 -------------------------------------------- recipes/services.rb | 34 ---------------------- resources/service.rb | 26 ----------------- 3 files changed, 128 deletions(-) delete mode 100644 providers/service.rb delete mode 100644 recipes/services.rb delete mode 100644 resources/service.rb diff --git a/providers/service.rb b/providers/service.rb deleted file mode 100644 index b63b67c..0000000 --- a/providers/service.rb +++ /dev/null @@ -1,68 +0,0 @@ -# -# Author:: Matt Ray () -# Cookbook Name:: pacemaker -# Provider:: service -# -# Copyright:: 2011, Opscode, 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. -# - -# actions :create, :remove - -# attribute :service, :kind_of => String, :name_attribute => true -# attribute :vip, :kind_of => String -# attribute :active, :default => false -# attribute :path, :kind_of => String - -action :create do - service = new_resource.service - vip = new_resource.vip - active = new_resource.active - path = new_resource.path - Chef::Log.info "pacemaker_service #{service} #{vip} #{active} #{path}" - oldservice = node['pacemaker']['services'][service] - newservice = {} - newservice['vip'] = vip - if active - newservice['active'] = node.name - else - #search for active? - #newservice['active'] = - if oldservice - newservice['active'] = oldservice['active'] - newservice['passive'] = oldservice['passive'] - newservice['passive'].push(node.name) - newservice['passive'].uniq!.sort! - else - newservice['passive'] = [node.name] - end - end - #compare with previous state - if newservice != oldservice - #put the service into the attributes of the node - node['pacemaker']['services'][service] = newservice - #figure out how pacemaker handles services - new_resource.updated_by_last_action(true) - end -end - -action :remove do - service = new_resource.service - if node['pacemaker']['services'][service] - #remove the parameters into the attributes of the node - node['pacemaker']['services'].delete(service) - #figure out how to restore services from pacemaker control - new_resource.updated_by_last_action(true) - end -end diff --git a/recipes/services.rb b/recipes/services.rb deleted file mode 100644 index 34fe4ae..0000000 --- a/recipes/services.rb +++ /dev/null @@ -1,34 +0,0 @@ -# -# Author:: Matt Ray () -# Cookbook Name:: pacemaker -# Recipe:: services -# -# Copyright 2011, Opscode, 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. -# - -node['pacemaker']['services'].keys.each do |svc| - Chef::Log.debug "Pacemaker::services #{svc}" - Chef::Log.debug node['pacemaker']['services'][svc] - isactive = false - if node['pacemaker']['services'][svc]['active'].eql?(node.name) - isactive = true - end - pacemaker_service svc do - vip node['pacemaker']['services'][svc]['vip'] - active isactive - path node['pacemaker']['services'][svc]['path'] - action :create - end -end diff --git a/resources/service.rb b/resources/service.rb deleted file mode 100644 index 354919d..0000000 --- a/resources/service.rb +++ /dev/null @@ -1,26 +0,0 @@ -# -# Author:: Matt Ray () -# Cookbook Name:: pacemaker -# Resource:: service -# -# Copyright:: 2011, Opscode, 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. -# - -actions :create, :remove - -attribute :service, :kind_of => String, :name_attribute => true -attribute :vip, :kind_of => String -attribute :active, :default => false -attribute :path, :kind_of => String