Remove ceilometer-api from Pike and newer
In upstream ceilometer-api is deprecated since Ocata, aodh-api
gnocchi-api and panko-api should be used instead, also old
database backends are deprecated, so no need to install them
in Pike.
Change-Id: Ibd9322eb2f4e069bbdb1759096ca580b171d68d0
Related-Prod: https://mirantis.jira.com/browse/PROD-21464
diff --git a/ceilometer/files/pike/ceilometer.apache2.conf.Debian b/ceilometer/files/pike/ceilometer.apache2.conf.Debian
deleted file mode 100644
index 44cea9b..0000000
--- a/ceilometer/files/pike/ceilometer.apache2.conf.Debian
+++ /dev/null
@@ -1,14 +0,0 @@
-{%- from "ceilometer/map.jinja" import server with context -%}
-Listen {{ server.bind.host }}:{{ server.bind.port }}
-
-<VirtualHost *:{{ server.bind.port }}>
- WSGIDaemonProcess ceilometer-api processes=2 threads=10 user=ceilometer group=ceilometer display-name=%{GROUP}
- WSGIProcessGroup ceilometer-api
- WSGIScriptAlias / /usr/share/ceilometer/app.wsgi
- WSGIApplicationGroup %{GLOBAL}
- <IfVersion >= 2.4>
- ErrorLogFormat "%{cu}t %M"
- </IfVersion>
- ErrorLog /var/log/apache2/ceilometer_error.log
- CustomLog /var/log/apache2/ceilometer_access.log "%v:%p %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\""
-</VirtualHost>
diff --git a/ceilometer/map.jinja b/ceilometer/map.jinja
index d522bd0..776aaf1 100644
--- a/ceilometer/map.jinja
+++ b/ceilometer/map.jinja
@@ -45,12 +45,14 @@
'Debian': {
'alarm': ['ceilometer-alarm-evaluator', 'ceilometer-alarm-notifier'],
'collector': ['ceilometer-collector'],
- 'basic': ['ceilometer-api', 'ceilometer-agent-central', 'python-ceilometerclient', 'ceilometer-agent-notification'],
+ 'basic': ['ceilometer-agent-central', 'python-ceilometerclient', 'ceilometer-agent-notification'],
+ 'api': ['ceilometer-api'],
'db_drivers': ['python-elasticsearch', 'python-influxdb', 'python-pymongo'],
},
'RedHat': {
'alarm': ['openstack-ceilometer-alarm-evaluator', 'openstack-ceilometer-alarm-notifier'],
- 'basic':[ 'openstack-ceilometer-api', 'openstack-ceilometer-central', 'python-ceilometerclient'],
+ 'basic':[ 'openstack-ceilometer-central', 'python-ceilometerclient'],
+ 'api': ['openstack-ceilometer-api'],
'collector':['openstack-ceilometer-collector'],
'db_drivers': ['python-elasticsearch', 'python-influxdb', 'python-pymongo'],
},
@@ -91,16 +93,20 @@
# Mitaka and newer OpenStack releases don't need collector and alarm
# packages/services, because alarming is implemented by Aodh and collector
# stuff is implemented by the ceilometer_collector service.
-# The ceilometer api for Ocata and newer is served by webserver.
+# The ceilometer api for Ocata and Newton is served by webserver.
+# The ceilometer api and db drivers for Pike and newer are deprecated.
{%- if salt['pillar.get']('ceilometer:server:version', 'mitaka') in ['liberty', 'juno', 'kilo'] %}
-{%- do server.update({'pkgs': pkgs.basic + pkgs.collector + pkgs.alarm}) %}
-{%- do server.update({'services': services.basic + services.collector + services.alarm + services.webserved}) %}
+{%- do server.update({'pkgs': pkgs.api + pkgs.basic + pkgs.collector + pkgs.alarm}) %}
+{%- elif salt['pillar.get']('ceilometer:server:version', 'mitaka') in ['mitaka', 'newton', 'ocata'] %}
+{%- do server.update({'pkgs': pkgs.api + pkgs.basic + pkgs.db_drivers}) %}
{%- else %}
-{%- do server.update({'pkgs': pkgs.basic + pkgs.db_drivers}) %}
-{%- if salt['pillar.get']('ceilometer:server:version', 'ocata') in ['mitaka'] %}
-{%- do server.update({'services': services.basic + services.webserved}) %}
-{%- else %}
-# Newton and Ocata versions of ceilometer api are served by webserver
-{%- do server.update({'services': services.basic}) %}
+{%- do server.update({'pkgs': pkgs.basic}) %}
{%- endif %}
+
+{%- if salt['pillar.get']('ceilometer:server:version', 'mitaka') in ['liberty', 'juno', 'kilo'] %}
+{%- do server.update({'services': services.basic + services.collector + services.alarm + services.webserved}) %}
+{%- elif salt['pillar.get']('ceilometer:server:version', 'ocata') == 'mitaka' %}
+{%- do server.update({'services': services.basic + services.webserved}) %}
+{%- else %}
+{%- do server.update({'services': services.basic}) %}
{%- endif %}
diff --git a/ceilometer/server.sls b/ceilometer/server.sls
index c827ae4..fbf50a5 100644
--- a/ceilometer/server.sls
+++ b/ceilometer/server.sls
@@ -52,7 +52,7 @@
values: {{ server }}
- watch_in:
- service: ceilometer_server_services
-{%- if server.version in ['newton', 'ocata', 'pike'] %}
+{%- if server.version in ['newton', 'ocata'] %}
- service: ceilometer_apache_restart
{%- endif %}
@@ -62,7 +62,7 @@
- group: ceilometer
- watch_in:
- service: ceilometer_server_services
-{%- if server.version in ['newton', 'ocata', 'pike'] %}
+{%- if server.version in ['newton', 'ocata'] %}
- service: ceilometer_apache_restart
{%- endif %}
@@ -201,7 +201,7 @@
{%- endif %}
# for Newton and newer
-{%- if server.version in ['newton', 'ocata', 'pike'] %}
+{%- if server.version in ['newton', 'ocata'] %}
ceilometer_api_apache_config:
file.managed: