Add more checks for heat services

 * add 5 retries with 10 sec intervals for haproxy->heat* svc checks
   this should prevent deployment from failing while haproxy is poling
   for backends
 * changed old command from depricated 'heat resource-type-list' to
   current one 'openstack orchestration resource type list'

Change-Id: Iadb91ddef687dab9d00a7cb3f3f9e9aca80a5e72
Reviewed-on: https://review.gerrithub.io/362191
Reviewed-by: Tatyanka Leontovich <tleontovich@mirantis.com>
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>
diff --git a/tcp_tests/templates/virtual-mcp-ocata-ovs/openstack.yaml b/tcp_tests/templates/virtual-mcp-ocata-ovs/openstack.yaml
index 5e31e7d..50746c0 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ovs/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ovs/openstack.yaml
@@ -126,9 +126,9 @@
 
 - description: Check heat service
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@keystone:server' cmd.run '. /root/keystonerc; heat resource-type-list'
+    -C 'I@keystone:server' cmd.run '. /root/keystonerc; openstack orchestration resource type list'
   node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
+  retry: {count: 5, delay: 10}
   skip_fail: false