From e596879cd30578369323e5e87af93183da8c2872 Mon Sep 17 00:00:00 2001
From: root <root@fuel.dirk.at>
Date: Thu, 10 Nov 2016 10:11:37 +0100
Subject: [PATCH] reworked deployment tasks and node roles

---
 deployment_tasks.yaml | 45 +++++++++++++++++++++++--------------------
 node_roles.yaml       |  2 +-
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index a087012..ea11745 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -1,37 +1,40 @@
-- id: dynatrace-agent
+- id: dynatrace-base
   type: group
-  role: ['dynatrace-agent']
-  tasks: [hiera, globals, hosts]
+  role: [dynatrace-agent]
+  required_for: [dynatrace-agent, dynatrace-security-gateway]
+  tasks:
+    - fuel_pkgs
+    - hiera
+    - globals
+    - tools
+    - logging
+    - netconfig
+    - connectivity_tests
+    - hosts
   parameters:
     strategy:
-      type: parallel
+      type: one-by-one
 
-- id: dynatrace-agent-install
-  role: ['dynatrace-agent']
+- id: dynatrace-agent
+  role: [dynatrace-agent]
   type: puppet
-  version: 2.0.0
-  requires: [post_deployment_start]
+  groups: [dynatrace-base]
+  version: 2.1.0
   required_for: [post_deployment_end]
+  requires: [hiera, globals]
   parameters:
     puppet_manifest: puppet/manifests/dynatrace-agent.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 720
+    timeout: 360
 
 - id: dynatrace-security-gateway
-  type: group
-  role: ['dynatrace-security-gateway']
-  tasks: [hiera, globals, hosts]
-  parameters:
-    strategy:
-      type: parallel
-
-- id: dynatrace-security-gateway-install
-  role: ['dynatrace-security-gateway']
+  role: [dynatrace-security-gateway]
   type: puppet
-  version: 2.0.0
-  requires: [post_deployment_start]
+  groups: [dynatrace-base]
+  version: 2.1.0
   required_for: [post_deployment_end]
+  requires: [hiera, globals]
   parameters:
     puppet_manifest: puppet/manifests/dynatrace-security-gateway.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 720
+    timeout: 360
diff --git a/node_roles.yaml b/node_roles.yaml
index 4937d65..ba72918 100644
--- a/node_roles.yaml
+++ b/node_roles.yaml
@@ -30,7 +30,7 @@ dynatrace-security-gateway:
   public_ip_required: false
   # Weight that will be used to sort out the
   # roles on the Fuel web UI
-  weight: 1000
+  weight: 1001
   conflicts:
     - compute
     - ceph-osd