stackforge/cookbook-pacemaker
Code Issues Proposed changes

primitives can have more than one op

Browse Source
This commit is contained in:
Adam Spiers
2014-01-22 19:09:00 +00:00
parent bdd1e046d3
commit 241ac02271
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/cib_objects.rb
View File

@@ -69,7 +69,8 @@ module Chef::Libraries
# primitive keystone ocf:openstack:keystone \ # primitive keystone ocf:openstack:keystone \
# params os_username="crowbar" os_password="crowbar" os_tenant_name="openstack" \ # params os_username="crowbar" os_password="crowbar" os_tenant_name="openstack" \
# meta target-role="Started" is-managed="true" \ # meta target-role="Started" is-managed="true" \
# op monitor interval="10s" # op monitor interval="10" timeout=30s \
# op start interval="10s" timeout="240" \
# #
# This method extracts a Hash from one of the params / meta / op lines. # This method extracts a Hash from one of the params / meta / op lines.
def extract_hash(name, obj_definition, data_type) def extract_hash(name, obj_definition, data_type)

3
spec/helpers/keystone_config.rb
View File

@@ -18,7 +18,8 @@ module Chef::RSpec
[ "is-managed", "true" ] [ "is-managed", "true" ]
], ],
:op => [ :op => [
[ "monitor", { "interval" => "10s" } ] [ "monitor", { "timeout" => "60", "interval" => "10s" } ],
[ "start", { "timeout" => "240", "interval" => "10s" } ]
], ],
} }
RA[:params_string] = resource_params_string(RA[:params]) RA[:params_string] = resource_params_string(RA[:params])