openstack/salt-formula-ceilometer
Code Issues Proposed changes

[WIP] Add installation of python-influxdb package from source

Browse Source 
Change-Id: Iedb95e7e8c4bc7a366b527dba05d7b793ed33ab8
This commit is contained in:
Ilya Tyaptin 2016-12-06 19:39:25 +04:00
parent 297b599318
commit 7765651f4e
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometer/map.jinja
View File

@ -16,13 +16,14 @@
'alarm': ['ceilometer-alarm-evaluator', 'ceilometer-alarm-notifier'], 'alarm': ['ceilometer-alarm-evaluator', 'ceilometer-alarm-notifier'],
'collector': ['ceilometer-collector'], 'collector': ['ceilometer-collector'],
'basic': ['ceilometer-api', 'ceilometer-agent-central', 'python-ceilometerclient', 'ceilometer-agent-notification'], 'basic': ['ceilometer-api', 'ceilometer-agent-central', 'python-ceilometerclient', 'ceilometer-agent-notification'],
'db_drivers': ['python-elasticsearch', 'python-influxdb'], 'db_drivers': ['python-elasticsearch'],
'additional_sources': [{'python-influxdb': 'http://archive.ubuntu.com/ubuntu/pool/universe/i/influxdb-python/python-influxdb_3.0.0-1_all.deb'}],
}, },
'RedHat': { 'RedHat': {
'alarm': ['openstack-ceilometer-alarm-evaluator', 'openstack-ceilometer-alarm-notifier'], 'alarm': ['openstack-ceilometer-alarm-evaluator', 'openstack-ceilometer-alarm-notifier'],
'basic':[ 'openstack-ceilometer-api', 'openstack-ceilometer-central', 'python-ceilometerclient'], 'basic':[ 'openstack-ceilometer-api', 'openstack-ceilometer-central', 'python-ceilometerclient'],
'collector':['openstack-ceilometer-collector'], 'collector':['openstack-ceilometer-collector'],
'db_drivers': ['python-elasticsearch', 'python-influxdb'], 'db_drivers': ['python-elasticsearch'],
}, },
}) %} }) %}
@ -51,4 +52,5 @@
{%- else %} {%- else %}
{%- do server.update({'pkgs': pkgs.basic + pkgs.db_drivers}) %} {%- do server.update({'pkgs': pkgs.basic + pkgs.db_drivers}) %}
{%- do server.update({'services': services.basic}) %} {%- do server.update({'services': services.basic}) %}
{%- do server.update({'additional_sources': pkgs.additional_sources}) %})}
{%- endif %} {%- endif %}

7
ceilometer/server.sls
View File

@ -5,6 +5,13 @@ ceilometer_server_packages:
pkg.installed: pkg.installed:
- names: {{ server.pkgs }} - names: {{ server.pkgs }}
{%- if server.additional_sources is defined %}
ceilometer_additional_pkgs:
pkg.installed:
- sources: {{ server.additional_sources }}
{%- endif %}
/etc/ceilometer/ceilometer.conf: /etc/ceilometer/ceilometer.conf:
file.managed: file.managed:
- source: salt://ceilometer/files/{{ server.version }}/ceilometer-server.conf.{{ grains.os_family }} - source: salt://ceilometer/files/{{ server.version }}/ceilometer-server.conf.{{ grains.os_family }}