simplified puppet scripts

components.yaml

@@ -8,5 +8,5 @@
   compatible: []
   requires: []
   incompatible: []
-  label: "Plugin label, that will be shown on UI"
-  description: "Component description (optional)"
+  label: "Dynatrace Ruxit Agent"
+  description: "This plugin installs the Dynatrace Ruxit agent on all nodes."

deployment_scripts/deploy.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# It's a script which deploys your plugin
-echo fuel-plugin-dynatrace > /tmp/fuel-plugin-dynatrace
-
-
-

deployment_tasks.yaml

@@ -1,51 +1,20 @@
 # 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: fuel-plugin-dynatrace_role
+#  type: group
+#  role: [fuel-plugin-dynatrace_role]
+#  parameters:
+#    strategy:
+#      type: parallel
 
-- id: fuel-plugin-dynatrace-deployment-puppet
+- id: dynatrace
   type: puppet
-  role: [fuel-plugin-dynatrace_role]
-  requires: [deploy_start]
-  required_for: [deploy_end]
-
-
-#  version: 2.0.0              # tasks v2.0.0 is supporting task-based deployment
-#   cross-depends:
-#     - name: deploy_start
-#   cross-depended-by:
-#     - name: deploy_end
-
+  role: '*'
+  requires: [post_deployment_start]
+  required_for: [post_deployment_end]
   parameters:
-    puppet_manifest: "deploy.pp"
-    puppet_modules: "."
+    puppet_manifest: puppet/manifests/deploy.pp
+    puppet_modules: puppet/modules
     timeout: 3600
 
-#- id: fuel-plugin-dynatrace-post-deployment-sh
-#  version: 2.0.0
-#  type: shell
-#  role: [fuel-plugin-dynatrace_role]
-#  requires: [post_deployment_start]
-#  required_for: [post_deployment_end]
-#  parameters:
-#    cmd: echo post_deployment_task_executed > /tmp/post_deployment
-#    retries: 3
-#    interval: 20
-#    timeout: 180
-
-#- id: fuel-plugin-dynatrace-pre-deployment-sh
-#  version: 2.0.0
-#  type: shell
-#  role: [fuel-plugin-dynatrace_role]
-#  requires: [pre_deployment_start]
-#  required_for: [pre_deployment_end]
-#  parameters:
-#    cmd: echo pre_deployment_task_executed > /tmp/pre_deployment
-#    retries: 3
-#    interval: 20
-#    timeout: 180

environment_config.yaml

@@ -1,17 +1,17 @@
 attributes:
-  metadata:
+  #metadata:
     # Settings group can be one of "general", "security", "compute", "network",
     # "storage", "logging", "openstack_services" and "other".
-    group: 'other'
+    #group: 'other'
 
-  fuel-plugin-dynatrace_checkbox:
+  enabled:
     type: "checkbox"
     weight: 10
     value: false
     label: "Install Dynatrace Ruxit agent"
     description: "Dynatrace Ruxit agent will be installed on all nodes"
 
-  fuel-plugin-dynatrace_tenant:
+  ruxit_tenant:
     type: "text"
     weight: 20
     value: ""
@@ -24,7 +24,7 @@ attributes:
       source: '\S'
       error: "Dynatrace Ruxit Tenant ID must not be empty"
 
-  fuel-plugin-dynatrace_token:
+  ruxit_token:
     type: "text"
     weight: 30
     value: ""

metadata.yaml

@@ -1,5 +1,5 @@
 # Plugin name
-name: fuel-plugin-dynatrace
+name: dynatrace
 # Human-readable name for your plugin
 title: Title for fuel-plugin-dynatrace plugin
 # Plugin version
@@ -17,7 +17,7 @@ homepage: 'https://github.com/openstack/fuel-plugins'
 # Specify a group which your plugin implements, possible options:
 # network, storage, storage::cinder, storage::glance, hypervisor,
 # equipment
-groups: []
+groups: ['monitoring']
 # Change `false` to `true` if the plugin can be installed in the environment
 # after the deployment.
 is_hotpluggable: true

node_roles.yaml

@@ -1,8 +1,8 @@
 fuel-plugin-dynatrace_role:
   # Role name
-  name: "Set here the name for the role. This name will be displayed in the Fuel web UI"
+  name: "dynatrace"
   # Role description
-  description: "Write description for your role"
+  description: "Role for the Dynatrace agent"
   # If primary then during orchestration this role will be
   # separated into primary-role and role
   has_primary: false

tasks.yaml

@@ -7,17 +7,18 @@
 # cinder and compute nodes
 - role: '*'
   stage: post_deployment/8000
-  type: shell
+  type: puppet
   parameters:
-    cmd: bash deploy.sh
-    timeout: 42
+    puppet_manifest: puppet/manifests/deploy.pp
+    puppet_modules: puppet/modules
+    timeout: 420
 # Task is applied for all roles
-- role: '*'
-  stage: pre_deployment
-  type: shell
-  parameters:
-    cmd: echo all > /tmp/plugin.all
-    timeout: 42
+#- role: '*'
+#  stage: pre_deployment
+#  type: shell
+#  parameters:
+#    cmd: echo all > /tmp/plugin.all
+#    timeout: 42
 # "reboot" task reboots the nodes and waits until they get back online
 # - role: '*'
 #   stage: pre_deployment