From f2a1a63cedc96b1dfb517894ad1a0830a931e441 Mon Sep 17 00:00:00 2001
From: Renat Akhmerov <rakhmerov@mirantis.com>
Date: Fri, 17 Apr 2015 16:08:00 +0600
Subject: [PATCH] Removing "policies" keyword from resources

* From standard workflows
* From functional test resources

Change-Id: I25e0d048222b6b7b1f3ffb3a9cf5029b7e6bcf45
---
 mistral/tests/resources/wf_v2.yaml       |  4 +---
 resources/workflows/create_instance.yaml | 17 +++++++----------
 resources/workflows/delete_instance.yaml |  3 +--
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/mistral/tests/resources/wf_v2.yaml b/mistral/tests/resources/wf_v2.yaml
index a884fb77..998360f5 100644
--- a/mistral/tests/resources/wf_v2.yaml
+++ b/mistral/tests/resources/wf_v2.yaml
@@ -7,8 +7,7 @@ wf:
   tasks:
     hello:
       action: std.echo output="Hello"
-      policies:
-        wait-before: 1
+      wait-before: 1
       publish:
         result: <% $.hello %>
 
@@ -26,4 +25,3 @@ wf1:
     goodbye:
       action: std.echo output="<% $.farewell %>, <% $.name %>"
       requires: [addressee]
-
diff --git a/resources/workflows/create_instance.yaml b/resources/workflows/create_instance.yaml
index 5681f06b..3be44820 100644
--- a/resources/workflows/create_instance.yaml
+++ b/resources/workflows/create_instance.yaml
@@ -44,10 +44,9 @@ std.create_instance:
     wait_vm_active:
       description: Waits till VM is ACTIVE.
       action: nova.servers_find id=<% $.vm_id %> status="ACTIVE"
-      policies:
-        retry:
-          count: 10
-          delay: 10
+      retry:
+        count: 10
+        delay: 10
       publish:
         status: <% $.wait_vm_active.status %>
       on-success:
@@ -56,18 +55,16 @@ std.create_instance:
     associate_ip:
       description: Associate server with one of floating IPs.
       action: nova.servers_add_floating_ip server=<% $.vm_id %> address=<% $.vm_ip %>
-      policies:
-        wait-after: 5
+      wait-after: 5
       on-success:
         - wait_ssh
 
     wait_ssh:
       description: Wait till operating system on the VM is up (SSH command).
       action: std.wait_ssh username=<% $.ssh_username %> password=<% $.ssh_password %> host=<% $.vm_ip %>
-      policies:
-        retry:
-          count: 10
-          delay: 10
+      retry:
+        count: 10
+        delay: 10
 
     delete_vm:
       description: Destroy VM.
diff --git a/resources/workflows/delete_instance.yaml b/resources/workflows/delete_instance.yaml
index 0da1503e..b8eda7d6 100644
--- a/resources/workflows/delete_instance.yaml
+++ b/resources/workflows/delete_instance.yaml
@@ -13,8 +13,7 @@ std.delete_instance:
     delete_vm:
       description: Destroy VM.
       action: nova.servers_delete server=<% $.instance_id %>
-      policies:
-        wait-after: 10
+      wait-after: 10
       on-success:
         - find_given_vm