From fad153eb5e54fd92e1944bb3e6f221efc9188ec8 Mon Sep 17 00:00:00 2001
From: dirk <dirk@fueldev.dynatrace.vmta>
Date: Wed, 13 Jul 2016 10:34:37 +0200
Subject: [PATCH] refactored deployment script so that necessary modules are
 included in puppet/modules directory, as instructed by documentation,
 therefore deploy.sh is obsolete and deployment_tasks.yaml became easier

---
 deployment_scripts/deploy.sh                  |  3 ---
 deployment_scripts/puppet/manifests/deploy.pp |  4 ++--
 deployment_tasks.yaml                         | 16 +---------------
 metadata.yaml                                 |  2 +-
 4 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100755 deployment_scripts/deploy.sh

diff --git a/deployment_scripts/deploy.sh b/deployment_scripts/deploy.sh
deleted file mode 100755
index 1ec504e..0000000
--- a/deployment_scripts/deploy.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-logger "installing ruxit-ruxit_agent puppet module"
-puppet module install ruxit-ruxit_agent
diff --git a/deployment_scripts/puppet/manifests/deploy.pp b/deployment_scripts/puppet/manifests/deploy.pp
index 4acb072..8265861 100644
--- a/deployment_scripts/puppet/manifests/deploy.pp
+++ b/deployment_scripts/puppet/manifests/deploy.pp
@@ -1,8 +1,8 @@
 $dynatrace = hiera('fuel-plugin-dynatrace')
 
 class { 'ruxit_agent':
-  user          => 'root',
-  group         => 'root',
+  user          => 'fueladmin',
+  group         => 'fueladmin',
   ruxit_tenant  => $dynatrace['dynatrace_tenant'],
   ruxit_token   => $dynatrace['dynatrace_token'],
 }
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 95222f0..08c0c96 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -1,21 +1,7 @@
 # These tasks will be merged into deployment graph. Here you
 # can specify new tasks for any roles, even built-in ones.
 
-#- id: fuel-plugin-dynatrace_role
-#  type: group
-#  role: [fuel-plugin-dynatrace_role]
-#  parameters:
-#    strategy:
-#      type: parallel
-
-- id: puppet-module-install
-  type: shell
-  role: '*'
-  parameters:
-    cmd: bash deploy.sh
-    timeout: 60
-
-- id: dynatrace
+- id: fuel-plugin-dynatrace
   type: puppet
   role: '*'
   requires: [post_deployment_start]
diff --git a/metadata.yaml b/metadata.yaml
index 840d494..c89534d 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,7 +5,7 @@ title: Dynatrace
 # Plugin version
 version: '1.0.0'
 # Description
-description: Installs the Dynatrace agent on all hosts
+description: Installs the Dynatrace agent on hosts
 # Required fuel version
 fuel_version: ['9.0']
 # Specify license of your plugin