Add ceilometer-api support for Newton
Change-Id: I2b1a5d7ca529d8ab13be283afc89a04eb5fc1699
diff --git a/ceilometer/files/ocata/ceilometer-api.apache2.conf.Debian b/ceilometer/files/newton/ceilometer.apache2.conf.Debian
similarity index 100%
copy from ceilometer/files/ocata/ceilometer-api.apache2.conf.Debian
copy to ceilometer/files/newton/ceilometer.apache2.conf.Debian
diff --git a/ceilometer/files/ocata/ceilometer-api.apache2.conf.Debian b/ceilometer/files/ocata/ceilometer.apache2.conf.Debian
similarity index 100%
rename from ceilometer/files/ocata/ceilometer-api.apache2.conf.Debian
rename to ceilometer/files/ocata/ceilometer.apache2.conf.Debian
diff --git a/ceilometer/map.jinja b/ceilometer/map.jinja
index 9dd00c2..6f40616 100644
--- a/ceilometer/map.jinja
+++ b/ceilometer/map.jinja
@@ -47,15 +47,15 @@
# 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.
-{%- if salt['pillar.get']('ceilometer:server:version', 'mitaka') in ['liberty', 'juno', 'kilo'] or salt['pillar.get']('ceilometer:server:version', 'ocata') in ['liberty', 'juno', 'kilo'] %}
+{%- 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}) %}
{%- else %}
{%- do server.update({'pkgs': pkgs.basic + pkgs.db_drivers}) %}
-{%- if salt['pillar.get']('ceilometer:server:version', 'ocata') in ['mitaka', 'newton'] %}
+{%- if salt['pillar.get']('ceilometer:server:version', 'ocata') in ['mitaka'] %}
{%- do server.update({'services': services.basic + services.webserved}) %}
{%- else %}
-# Ocata version of ceilometer api is served by webserver
+# Newton and Ocata versions of ceilometer api are served by webserver
{%- do server.update({'services': services.basic}) %}
{%- endif %}
{%- endif %}
diff --git a/ceilometer/server.sls b/ceilometer/server.sls
index 9f81738..1d9131c 100644
--- a/ceilometer/server.sls
+++ b/ceilometer/server.sls
@@ -86,20 +86,20 @@
{%- endif %}
-# for Ocata and newer
-{%- if server.version not in ['liberty', 'juno', 'kilo', 'mitaka', 'newton'] %}
+# for Newton and newer
+{%- if server.version not in ['liberty', 'juno', 'kilo', 'mitaka'] %}
-/etc/apache2/sites-available/ceilometer-api.conf:
+/etc/apache2/sites-available/ceilometer.conf:
file.managed:
- - source: salt://ceilometer/files/{{ server.version }}/ceilometer-api.apache2.conf.Debian
+ - source: salt://ceilometer/files/{{ server.version }}/ceilometer.apache2.conf.Debian
- template: jinja
- require:
- pkg: ceilometer_server_packages
ceilometer_api_config:
file.symlink:
- - name: /etc/apache2/sites-enabled/ceilometer-api.conf
- - target: /etc/apache2/sites-available/ceilometer-api.conf
+ - name: /etc/apache2/sites-enabled/ceilometer.conf
+ - target: /etc/apache2/sites-available/ceilometer.conf
ceilometer_apache_restart:
service.running:
@@ -107,7 +107,7 @@
- name: apache2
- watch:
- file: /etc/ceilometer/ceilometer.conf
- - file: /etc/apache2/sites-available/ceilometer-api.conf
+ - file: /etc/apache2/sites-available/ceilometer.conf
- file: /etc/ceilometer/event_definitions.yaml
- file: /etc/ceilometer/event_pipeline.yaml
- file: /etc/ceilometer/gabbi_pipeline.yaml
@@ -115,7 +115,6 @@
{%- endif %}
-
ceilometer_server_services:
service.running:
- names: {{ server.services }}