aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsrc/fuel-plugin/deployment_scripts/install.sh4
-rw-r--r--src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp5
-rw-r--r--src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_restart.pp4
-rw-r--r--src/fuel-plugin/deployment_tasks.yaml24
-rw-r--r--src/fuel-plugin/metadata.yaml2
5 files changed, 6 insertions, 33 deletions
diff --git a/src/fuel-plugin/deployment_scripts/install.sh b/src/fuel-plugin/deployment_scripts/install.sh
index 8f4edef0..bc430bee 100755
--- a/src/fuel-plugin/deployment_scripts/install.sh
+++ b/src/fuel-plugin/deployment_scripts/install.sh
@@ -11,6 +11,8 @@ OS_PASSWORD=$4
CEILOMETER_URL_TYPE=${CEILOMETER_URL_TYPE:-internalURL}
CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000}
+apt-get install -y collectd
+
rm -rf $INSTALL_HOME; mkdir -p $INSTALL_HOME
cd $INSTALL_HOME
curl http://$HOST:8080/plugins/fuel-plugin-collectd-ceilometer-0.9/repositories/ubuntu/collectd-ceilometer.tgz | tar xzvf -
@@ -52,3 +54,5 @@ cat << EOF > /etc/collectd/collectd.conf.d/collectd-ceilometer-plugin.conf
</Module>
</Plugin>
EOF
+
+service collectd restart
diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp
deleted file mode 100644
index ffe3d6d9..00000000
--- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-if $operatingsystem == 'Ubuntu' {
- package { 'collectd':
- ensure => installed,
- }
-}
diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_restart.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_restart.pp
deleted file mode 100644
index 59f5151b..00000000
--- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_restart.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-exec { "restart collectd":
- command => "service collectd restart",
- path => "/usr/bin:/usr/sbin:/bin:/sbin";
-}
diff --git a/src/fuel-plugin/deployment_tasks.yaml b/src/fuel-plugin/deployment_tasks.yaml
index 7412ccfb..e73783e0 100644
--- a/src/fuel-plugin/deployment_tasks.yaml
+++ b/src/fuel-plugin/deployment_tasks.yaml
@@ -1,32 +1,10 @@
-- id: collectd_install
- type: puppet
- version: 2.0.0
- groups: [compute]
- required_for: [deployment_end]
- requires: [setup_repositories]
- parameters:
- puppet_manifest: puppet/manifests/collectd_install.pp
- puppet_modules: puppet/modules:/etc/puppet/modules
- timeout: 720
-
- id: collectd-ceilometer_install
type: puppet
version: 2.0.0
groups: [compute]
- required_for: [deployment_end]
- requires: [collectd_install]
- parameters:
- puppet_manifest: puppet/manifests/collectd-ceilometer_install.pp
- puppet_modules: puppet/modules:/etc/puppet/modules
- timeout: 720
-
-- id: collectd_restart
- type: puppet
- version: 2.0.0
- groups: [compute]
required_for: [post_deployment_end]
requires: [post_deployment_start]
parameters:
- puppet_manifest: puppet/manifests/collectd_restart.pp
+ puppet_manifest: puppet/manifests/collectd-ceilometer_install.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720
diff --git a/src/fuel-plugin/metadata.yaml b/src/fuel-plugin/metadata.yaml
index 382eec5e..ce92022e 100644
--- a/src/fuel-plugin/metadata.yaml
+++ b/src/fuel-plugin/metadata.yaml
@@ -18,7 +18,7 @@ homepage: 'https://gerrit.opnfv.org/gerrit/fastpathmetrics'
# network, storage, storage::cinder, storage::glance, hypervisor
groups: ['network']
-is_hotpluggable: false
+is_hotpluggable: true
# The plugin is compatible with releases in the list
releases: