From 6f4bd7a6f8c5196759f746e53cc8b55be162dd29 Mon Sep 17 00:00:00 2001 From: Dirk Wallerstorfer Date: Thu, 8 Dec 2016 01:32:01 +0100 Subject: [PATCH 1/2] added reexecute on deploy changes to deplyoment tasks; restricted node roles even more --- deployment_tasks.yaml | 6 ++++++ node_roles.yaml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index 5fcb135..a6fe9db 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -8,6 +8,8 @@ puppet_manifest: puppet/manifests/dynatrace-oneagent.pp puppet_modules: puppet/modules:/etc/puppet/modules timeout: 360 + reexecute_on: + - deploy_changes - id: dynatrace-sg-base type: group @@ -25,6 +27,8 @@ parameters: strategy: type: one_by_one + reexecute_on: + - deploy_changes - id: dynatrace-security-gateway role: [dynatrace-security-gateway] @@ -37,3 +41,5 @@ puppet_manifest: puppet/manifests/dynatrace-security-gateway.pp puppet_modules: puppet/modules:/etc/puppet/modules timeout: 360 + reexecute_on: + - deploy_changes diff --git a/node_roles.yaml b/node_roles.yaml index 89dbfe3..e247525 100644 --- a/node_roles.yaml +++ b/node_roles.yaml @@ -17,6 +17,7 @@ dynatrace-oneagent: - cinder - base-os - compute-vmware + - virtual dynatrace-security-gateway: # Role name @@ -32,9 +33,11 @@ dynatrace-security-gateway: # roles on the Fuel web UI weight: 1001 conflicts: + - controller - compute - ceph-osd - cinder - base-os - compute-vmware - dynatrace-oneagent + - virtual From d72fbc96ea14be70e17c0e2d7e63fe0363683829 Mon Sep 17 00:00:00 2001 From: Dirk Wallerstorfer Date: Thu, 8 Dec 2016 01:52:53 +0100 Subject: [PATCH 2/2] added uninstall.sh --- uninstall.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 uninstall.sh diff --git a/uninstall.sh b/uninstall.sh new file mode 100644 index 0000000..d807766 --- /dev/null +++ b/uninstall.sh @@ -0,0 +1,3 @@ +#!/bin/bash +set -eux +echo uninstall > /tmp/fuel-plugin-dynatrace_uninstall