From 4064fc0e839c26c38a38ee71e63673ed59d8547b Mon Sep 17 00:00:00 2001
From: Billy O'Mahony <billy.o.mahony@intel.com>
Date: Fri, 5 Feb 2016 11:41:41 +0000
Subject: [PATCH] fuel-plugin: Remove use of plugin-defined role

The use of a fuel plugin-defined role not working since rebase
to Fuel8 so work around this by removing dependecy on this feature
for imminent Rel/B.

Change-Id: Icd1ee1c8f05a1c26e8da7f80d2d7206374099a93
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Michal Skalski <mskalski@mirantis.com>
Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Mark D. Gray <mark.d.gray@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
---
 fuel-plugin-vsperf/deployment_tasks.yaml | 24 +-----------------------
 fuel-plugin-vsperf/tasks.yaml            |  7 +++++++
 2 files changed, 8 insertions(+), 23 deletions(-)
 create mode 100644 fuel-plugin-vsperf/tasks.yaml

diff --git a/fuel-plugin-vsperf/deployment_tasks.yaml b/fuel-plugin-vsperf/deployment_tasks.yaml
index 6ce01267..fe51488c 100644
--- a/fuel-plugin-vsperf/deployment_tasks.yaml
+++ b/fuel-plugin-vsperf/deployment_tasks.yaml
@@ -1,23 +1 @@
-# These tasks will be merged into deployment graph. Here you
-# can specify new tasks for any roles, even built-in ones.
-
-- id: vsperf
-  type: group
-  role: [vsperf]
-  requires: [deploy_start]
-  required_for: [deploy_end]
-  tasks: [fuel_pkgs, hiera, globals, tools, logging, netconfig,
-        hosts, firewall, deploy_start, vsperf_install]
-  parameters:
-    strategy:
-      type: parallel
-
-- id: vsperf_install
-  type: puppet
-  groups: [vsperf]
-  requires: [deploy_start]
-  required_for: [deploy_end]
-  parameters:
-    puppet_manifest: puppet/manifests/vsperf-install.pp
-    puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 3600
+[]
diff --git a/fuel-plugin-vsperf/tasks.yaml b/fuel-plugin-vsperf/tasks.yaml
new file mode 100644
index 00000000..0cc003ef
--- /dev/null
+++ b/fuel-plugin-vsperf/tasks.yaml
@@ -0,0 +1,7 @@
+- role: ['compute']
+  stage: post_deployment/8998
+  type: puppet
+  parameters:
+    puppet_manifest: puppet/manifests/vsperf-install.pp
+    puppet_modules: puppet/modules:/etc/puppet/modules
+    timeout: 720
-- 
2.16.6