diff --git a/libraries/pacemaker/mixins/resource_meta.rb b/libraries/pacemaker/mixins/resource_meta.rb index f8c00b4..1c632d1 100644 --- a/libraries/pacemaker/mixins/resource_meta.rb +++ b/libraries/pacemaker/mixins/resource_meta.rb @@ -2,25 +2,27 @@ # (priority, target-role, is-managed) module Pacemaker - class Resource - module Meta - def self.included(base) - base.extend ClassMethods - end + module Mixins + module Resource + module Meta + def self.included(base) + base.extend ClassMethods + end - attr_accessor :meta + attr_accessor :meta - def meta_string - self.class.meta_string(meta) - end + def meta_string + self.class.meta_string(meta) + end - module ClassMethods - def meta_string(meta) - return "" if ! meta or meta.empty? - "meta " + - meta.sort.map do |key, value| - %'#{key}="#{value}"' - end.join(' ') + module ClassMethods + def meta_string(meta) + return "" if ! meta or meta.empty? + "meta " + + meta.sort.map do |key, value| + %'#{key}="#{value}"' + end.join(' ') + end end end end diff --git a/libraries/pacemaker/resource/group.rb b/libraries/pacemaker/resource/group.rb index c658ff2..bc9fbb6 100644 --- a/libraries/pacemaker/resource/group.rb +++ b/libraries/pacemaker/resource/group.rb @@ -5,7 +5,7 @@ class Pacemaker::Resource::Group < Pacemaker::Resource TYPE = 'group' register_type TYPE - include Pacemaker::Resource::Meta + include Pacemaker::Mixins::Resource::Meta attr_accessor :members diff --git a/libraries/pacemaker/resource/primitive.rb b/libraries/pacemaker/resource/primitive.rb index e2d673e..f462990 100644 --- a/libraries/pacemaker/resource/primitive.rb +++ b/libraries/pacemaker/resource/primitive.rb @@ -6,7 +6,7 @@ class Pacemaker::Resource::Primitive < Pacemaker::Resource TYPE = 'primitive' register_type TYPE - include Pacemaker::Resource::Meta + include Pacemaker::Mixins::Resource::Meta attr_accessor :agent, :params, :op