diff --git a/components.yaml b/components.yaml index 702832e..a520a50 100644 --- a/components.yaml +++ b/components.yaml @@ -4,6 +4,6 @@ # - https://blueprints.launchpad.net/fuel/+spec/component-registry # - https://specs.openstack.org/openstack/fuel-specs/specs/8.0/component-registry.html -- name: additional_service:fuel-plugin-dynatrace +- name: additional_service:dynatrace label: "Install Dynatrace" description: "Installs Dynatrace in your OpenStack cluster" diff --git a/deployment_scripts/puppet/manifests/dynatrace-agent.pp b/deployment_scripts/puppet/manifests/dynatrace-agent.pp index 0228852..c94a839 100644 --- a/deployment_scripts/puppet/manifests/dynatrace-agent.pp +++ b/deployment_scripts/puppet/manifests/dynatrace-agent.pp @@ -14,6 +14,10 @@ else { $url = "https://${tenant}.live.dynatrace.com/installer/agent/unix/latest/${token}" } +file { '/etc/hiera/plugins/dynatrace.yaml': + ensure => file, +} -> + download {'Download Dynatrace OneAgent': uri => $url, dest => $file diff --git a/deployment_scripts/puppet/manifests/dynatrace-security-gateway.pp b/deployment_scripts/puppet/manifests/dynatrace-security-gateway.pp index 4ec3313..5ad1365 100644 --- a/deployment_scripts/puppet/manifests/dynatrace-security-gateway.pp +++ b/deployment_scripts/puppet/manifests/dynatrace-security-gateway.pp @@ -14,6 +14,10 @@ else { $url = "https://${tenant}.live.dynatrace.com/installer/sg/unix/latest/${token}" } +file { '/etc/hiera/plugins/dynatrace.yaml': + ensure -> file, +} -> + download {'Download Dynatrace Security Gateway': uri => $url, dest => $file diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index 622ad07..c4c19f1 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -1,5 +1,4 @@ -# can specify new tasks for any roles, even built-in ones. -- id: dynatace-agent +- id: dynatrace-agent role: ['dynatrace-agent'] type: puppet version: 2.0.0 diff --git a/environment_config.yaml b/environment_config.yaml index 4070752..6524945 100644 --- a/environment_config.yaml +++ b/environment_config.yaml @@ -34,5 +34,5 @@ attributes: source: '\S' error: "IP/Domain must not be empty" restrictions: - - condition: "settings:fuel-plugin-dynatrace.dynatrace_managed.value == false" + - condition: "settings:dynatrace.dynatrace_managed.value == false" action: "hide" diff --git a/metadata.yaml b/metadata.yaml index cb26fe0..d7751c3 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -1,5 +1,5 @@ # Plugin name -name: fuel-plugin-dynatrace +name: dynatrace # Human-readable name for your plugin title: Dynatrace # Plugin version @@ -26,9 +26,8 @@ is_hotpluggable: true releases: - os: ubuntu version: mitaka-9.0 - mode: ['ha'] + mode: ['ha', 'multinode'] deployment_scripts_path: deployment_scripts/ repository_path: repositories/ubuntu # Version of plugin package package_version: '4.0.0' -