summaryrefslogtreecommitdiffstats
path: root/src/fuel-plugin/deployment_scripts
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2017-06-22 08:45:04 -0700
committerGuo Ruijing <ruijing.guo@intel.com>2017-06-22 08:45:23 -0700
commit7dcda31fe01f5fe910033a0ff97eb1ba795ee680 (patch)
tree58d4406453c84fdf6c02e4bcbc18f57449dffd3e /src/fuel-plugin/deployment_scripts
parente81d42edd4199d13d779753d1969f23ba74c98da (diff)
cleanup: remove fuel plugin since fuel@opnfv uses mcp
Change-Id: I1c745106c1db5e69ba698d9076ae6c707dbc37b7 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'src/fuel-plugin/deployment_scripts')
-rwxr-xr-xsrc/fuel-plugin/deployment_scripts/install.sh105
-rw-r--r--src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp29
-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
4 files changed, 0 insertions, 143 deletions
diff --git a/src/fuel-plugin/deployment_scripts/install.sh b/src/fuel-plugin/deployment_scripts/install.sh
deleted file mode 100755
index 4c6da70b..00000000
--- a/src/fuel-plugin/deployment_scripts/install.sh
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/bash
-set -eux
-
-INSTALL_HOME=/opt/collectd-ceilometer
-
-HOST=$1
-OS_AUTH_URL=$2
-OS_USERNAME=$3
-OS_PASSWORD=$4
-enable_mcelog=$5
-enable_hugepages=$6
-enable_ovs_events=$7
-
-CEILOMETER_URL_TYPE=${CEILOMETER_URL_TYPE:-internalURL}
-CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000}
-
-MCELOG_SOCKET="socket-path = /var/run/mcelog-client"
-MCELOG_CONF="/etc/mcelog/mcelog.conf"
-
-rm -rf $INSTALL_HOME; mkdir -p $INSTALL_HOME
-cd $INSTALL_HOME
-curl http://$HOST:8080/plugins/fuel-plugin-collectd-ceilometer-1.0/repositories/ubuntu/collectd-ceilometer.tgz | tar xzvf -
-
-apt-get install -y --allow-unauthenticated collectd python-dev libpython2.7 mcelog
-
-cat << EOF > /etc/collectd/collectd.conf.d/collectd-ceilometer-plugin.conf
-<LoadPlugin python>
- Globals true
-</LoadPlugin>
-
-<Plugin python>
- ModulePath "$INSTALL_HOME/collectd-ceilometer-plugin"
- LogTraces true
- Interactive false
- Import "collectd_ceilometer.plugin"
-
- <Module "collectd_ceilometer.plugin">
-
- # Verbosity 1|0
- #VERBOSE 0
-
- # Batch size
- BATCH_SIZE 3
-
- # Service endpoint addresses
- OS_AUTH_URL "$OS_AUTH_URL"
-
- # Ceilometer address
- #CEILOMETER_ENDPOINT
- CEILOMETER_URL_TYPE "$CEILOMETER_URL_TYPE"
-
- # Ceilometer timeout in ms
- CEILOMETER_TIMEOUT "$CEILOMETER_TIMEOUT"
-
- # # Ceilometer user creds
- OS_USERNAME "$OS_USERNAME"
- OS_PASSWORD "$OS_PASSWORD"
- OS_TENANT_NAME "services"
-
- </Module>
-</Plugin>
-EOF
-
-if [ $enable_hugepages = 'true' ]
-then
- cat << EOF > /etc/collectd/collectd.conf.d/hugepages.conf
-LoadPlugin hugepages
-
-<Plugin hugepages>
- ReportPerNodeHP true
- ReportRootHP true
- ValuesPages true
- ValuesBytes false
- ValuesPercentage false
-</Plugin>
-EOF
-fi
-
-if [ $enable_mcelog = 'true' ]
-then
- echo $MCELOG_SOCKET | sudo tee -a $MCELOG_CONF;
- cat << EOF > /etc/collectd/collectd.conf.d/mcelog.conf
-<LoadPlugin mcelog>
- Interval 1
-</LoadPlugin>
-<Plugin "mcelog">
- McelogClientSocket "/var/run/mcelog-client"
-</Plugin>
-EOF
-fi
-
-if [ $enable_ovs_events = 'true' ]
-then
- ovs-vsctl set-manager ptcp:6640
- cat << EOF > /etc/collectd/collectd.conf.d/ovs.conf
-<LoadPlugin ovs_events>
- Interval 1
-</LoadPlugin>
-<Plugin "ovs_events">
- SendNotification true
-</Plugin>
-EOF
-fi
-
-service collectd restart
diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp
deleted file mode 100644
index 4da567d6..00000000
--- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-$master_ip = hiera('master_ip')
-$use_ceilometer = hiera('use_ceilometer', false)
-
-$management_vip = hiera('management_vip')
-$service_endpoint = hiera('service_endpoint', $management_vip)
-$ssl_hash = hiera_hash('use_ssl', {})
-$auth_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'protocol', 'http')
-$auth_endpoint = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'hostname', [$service_endpoint])
-$auth_uri = "${auth_protocol}://${auth_endpoint}:5000/v2.0"
-
-$ceilometer_hash = hiera_hash('ceilometer', {'user'=>'ceilometer'})
-$auth_user = 'ceilometer'
-$auth_password = $ceilometer_hash['user_password']
-
-
-$collectd_settings = hiera('fuel-plugin-collectd-ceilometer')
-$enable_mcelog = $collectd_settings['enable_mcelog']
-$enable_hugepages = $collectd_settings['enable_hugepages']
-$enable_ovs_events = $collectd_settings['enable_ovs_events']
-
-$exe_url = "http://${master_ip}:8080/plugins/fuel-plugin-collectd-ceilometer-1.0/deployment_scripts/install.sh"
-
-if ($use_ceilometer) {
-
- exec { "install collectd-ceilometer":
- command => "curl ${exe_url} | bash -s ${master_ip} ${auth_uri} ${auth_user} ${auth_password} ${enable_mcelog} ${enable_hugepages} ${enable_ovs_events}",
- path => "/usr/bin:/usr/sbin:/bin:/sbin";
- }
-}
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";
-}