x
/
fuel-plugin-lma-collector
Code Issues Proposed changes

Rename openstack.py to collectd_openstack.py 

This change renames openstack.py Python module for collectd to
collectd_openstack.py because MOS 9 also ships an openstack
Python module. As a consequence, the collectd plugins using
openstack.py fail to initialize.

Change-Id: I10b3270d0b4b06439390d7da09b90ccf22ab38b5
Closes-Bug: #1551622
This commit is contained in:
Guillaume Thouvenin 2016-03-02 09:34:07 +01:00
parent 8d4c33d0ab
commit 12be7cf781
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/check_openstack_api.py
View File

@ -17,7 +17,7 @@
import collectd
import base
import openstack
import collectd_openstack as openstack
from urlparse import urlparse

0
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack.py → deployment_scripts/puppet/modules/lma_collector/files/collectd/collectd_openstack.py
View File

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/hypervisor_stats.py
View File

@ -17,7 +17,7 @@
import collectd
import base
import openstack
import collectd_openstack as openstack
PLUGIN_NAME = 'hypervisor_stats'
INTERVAL = openstack.INTERVAL

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py
View File

@ -17,7 +17,7 @@
import collectd
import base
import openstack
import collectd_openstack as openstack
PLUGIN_NAME = 'cinder'
INTERVAL = openstack.INTERVAL

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_glance.py
View File

@ -17,7 +17,7 @@
import collectd
import base
import openstack
import collectd_openstack as openstack
PLUGIN_NAME = 'glance'
INTERVAL = openstack.INTERVAL

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_keystone.py
View File

@ -17,7 +17,7 @@
import collectd
import base
import openstack
import collectd_openstack as openstack
PLUGIN_NAME = 'keystone'
INTERVAL = openstack.INTERVAL

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron.py
View File

@ -17,7 +17,7 @@
import collectd
import base
import openstack
import collectd_openstack as openstack
PLUGIN_NAME = 'neutron'
INTERVAL = openstack.INTERVAL

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova.py
View File

@ -17,7 +17,7 @@
import collectd
import base
import openstack
import collectd_openstack as openstack
PLUGIN_NAME = 'nova'
INTERVAL = openstack.INTERVAL

4
deployment_scripts/puppet/modules/lma_collector/manifests/collectd/python_openstack_base.pp
View File

@ -27,11 +27,11 @@ class lma_collector::collectd::python_openstack_base {
file { 'openstack.script':
ensure => 'present',
path => "${modulepath}/openstack.py",
path => "${modulepath}/collectd_openstack.py",
owner => 'root',
group => $collectd::params::root_group,
mode => '0640',
source => 'puppet:///modules/lma_collector/collectd/openstack.py',
source => 'puppet:///modules/lma_collector/collectd/collectd_openstack.py',
require => Class['lma_collector::collectd::python_base'],
notify => Service['collectd'],
}

2
deployment_scripts/puppet/modules/lma_collector/spec/classes/lma_collector_collectd_python_openstack_base_spec.rb
View File

@ -22,7 +22,7 @@ describe 'lma_collector::collectd::python_openstack_base' do
describe 'with defaults' do
it { is_expected.to contain_file('openstack.script').with({
:ensure => 'present',
:path => '/usr/lib/collectd/openstack.py',
:path => '/usr/lib/collectd/collectd_openstack.py',
:owner => 'root',
:group => 'root',
:mode => '0640',