Removing "policies" keyword from resources

* From standard workflows
* From functional test resources

Change-Id: I25e0d048222b6b7b1f3ffb3a9cf5029b7e6bcf45
This commit is contained in:
Renat Akhmerov 2015-04-17 16:08:00 +06:00
parent b79f1f277b
commit f2a1a63ced
3 changed files with 9 additions and 15 deletions

View File

@ -7,7 +7,6 @@ wf:
tasks:
hello:
action: std.echo output="Hello"
policies:
wait-before: 1
publish:
result: <% $.hello %>
@ -26,4 +25,3 @@ wf1:
goodbye:
action: std.echo output="<% $.farewell %>, <% $.name %>"
requires: [addressee]

View File

@ -44,7 +44,6 @@ 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
@ -56,7 +55,6 @@ 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
on-success:
- wait_ssh
@ -64,7 +62,6 @@ std.create_instance:
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

View File

@ -13,7 +13,6 @@ std.delete_instance:
delete_vm:
description: Destroy VM.
action: nova.servers_delete server=<% $.instance_id %>
policies:
wait-after: 10
on-success:
- find_given_vm