Split ceilometer-api apache conf files for Newton and Ocata
Change-Id: I96496dd9221ad7a57242ac0b97fb29902afb0559
diff --git a/ceilometer/server.sls b/ceilometer/server.sls
index 1d9131c..d0f1fc6 100644
--- a/ceilometer/server.sls
+++ b/ceilometer/server.sls
@@ -89,8 +89,13 @@
# for Newton and newer
{%- if server.version not in ['liberty', 'juno', 'kilo', 'mitaka'] %}
-/etc/apache2/sites-available/ceilometer.conf:
+ceilometer_api_apache_config:
file.managed:
+ {%- if server.version == 'newton' %}
+ - name: /etc/apache2/sites-available/ceilometer.conf
+ {%- else %}
+ - name: /etc/apache2/sites-available/ceilometer-api.conf
+ {%- endif %}
- source: salt://ceilometer/files/{{ server.version }}/ceilometer.apache2.conf.Debian
- template: jinja
- require:
@@ -98,8 +103,13 @@
ceilometer_api_config:
file.symlink:
+ {%- if server.version == 'newton' %}
- name: /etc/apache2/sites-enabled/ceilometer.conf
- target: /etc/apache2/sites-available/ceilometer.conf
+ {%- else %}
+ - name: /etc/apache2/sites-enabled/ceilometer-api.conf
+ - target: /etc/apache2/sites-available/ceilometer-api.conf
+ {%- endif %}
ceilometer_apache_restart:
service.running:
@@ -107,7 +117,7 @@
- name: apache2
- watch:
- file: /etc/ceilometer/ceilometer.conf
- - file: /etc/apache2/sites-available/ceilometer.conf
+ - file: ceilometer_api_apache_config
- file: /etc/ceilometer/event_definitions.yaml
- file: /etc/ceilometer/event_pipeline.yaml
- file: /etc/ceilometer/gabbi_pipeline.yaml