From 241ac022710fd2c5bcb3fe908b8c8cc71b8668fe Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Wed, 22 Jan 2014 19:09:00 +0000 Subject: [PATCH] primitives can have more than one op --- libraries/cib_objects.rb | 3 ++- spec/helpers/keystone_config.rb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/cib_objects.rb b/libraries/cib_objects.rb index 212d703..05c8003 100644 --- a/libraries/cib_objects.rb +++ b/libraries/cib_objects.rb @@ -69,7 +69,8 @@ module Chef::Libraries # primitive keystone ocf:openstack:keystone \ # params os_username="crowbar" os_password="crowbar" os_tenant_name="openstack" \ # 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. def extract_hash(name, obj_definition, data_type) diff --git a/spec/helpers/keystone_config.rb b/spec/helpers/keystone_config.rb index fb74135..ecae9fc 100644 --- a/spec/helpers/keystone_config.rb +++ b/spec/helpers/keystone_config.rb @@ -18,7 +18,8 @@ module Chef::RSpec [ "is-managed", "true" ] ], :op => [ - [ "monitor", { "interval" => "10s" } ] + [ "monitor", { "timeout" => "60", "interval" => "10s" } ], + [ "start", { "timeout" => "240", "interval" => "10s" } ] ], } RA[:params_string] = resource_params_string(RA[:params])