Fixes in monitoring service VM
Change-Id: I6f5fa2512777dc603792758c36de1456e1ac6b11
diff --git a/xos/synchronizer/ceilometer/ceilometer_service_custom_image/mitaka-v2/os_ceilometer_mitaka.yml b/xos/synchronizer/ceilometer/ceilometer_service_custom_image/mitaka-v2/os_ceilometer_mitaka.yml
index 4ed2da2..95b8778 100644
--- a/xos/synchronizer/ceilometer/ceilometer_service_custom_image/mitaka-v2/os_ceilometer_mitaka.yml
+++ b/xos/synchronizer/ceilometer/ceilometer_service_custom_image/mitaka-v2/os_ceilometer_mitaka.yml
@@ -159,7 +159,7 @@
apt: name={{ item }} state=installed update_cache=yes
with_items:
- ceilometer-api
- - ceilometer-collector
+# - ceilometer-collector ---> This service is not needed as ceilometer support direct publishing to database
- ceilometer-agent-central
- ceilometer-agent-notification
- python-ceilometerclient
@@ -176,5 +176,5 @@
- name: Restarting Celometer API
service: name=ceilometer-api state=restarted
- - name: Restarting ceilometer-collector
- service: name=ceilometer-collector state=restarted
+# - name: Restarting ceilometer-collector
+# service: name=ceilometer-collector state=restarted
diff --git a/xos/synchronizer/ceilometer/ceilometer_service_custom_image/mitaka-v2/templates/ceilometer.conf.j2 b/xos/synchronizer/ceilometer/ceilometer_service_custom_image/mitaka-v2/templates/ceilometer.conf.j2
index 6deb9a4..98727ab 100644
--- a/xos/synchronizer/ceilometer/ceilometer_service_custom_image/mitaka-v2/templates/ceilometer.conf.j2
+++ b/xos/synchronizer/ceilometer/ceilometer_service_custom_image/mitaka-v2/templates/ceilometer.conf.j2
@@ -1,7 +1,7 @@
[DEFAULT]
rpc_backend = rabbit
auth_strategy = keystone
-debug = True
+debug = False
#
# From oslo.log
diff --git a/xos/synchronizer/steps/sync_ceilometerservice.yaml b/xos/synchronizer/steps/sync_ceilometerservice.yaml
index 8ef9c96..f532e79 100644
--- a/xos/synchronizer/steps/sync_ceilometerservice.yaml
+++ b/xos/synchronizer/steps/sync_ceilometerservice.yaml
@@ -40,11 +40,12 @@
notify:
- restart ceilometer-agent-notification service
- - name: Apply ceilometer kafka publisher patch until monitoring service is migrated to Newton release or later
- become: yes
- template: src=/opt/xos/synchronizers/monitoring/templates/kafka_broker.py dest=/usr/lib/python2.7/dist-packages/ceilometer/publisher/kafka_broker.py owner=root group=root mode=0777
- notify:
- - restart ceilometer-agent-notification service
+# No need of this step as this patch is directly applied inside monitoring service custom image
+# - name: Apply ceilometer kafka publisher patch until monitoring service is migrated to Newton release or later
+# become: yes
+# template: src=/opt/xos/synchronizers/monitoring/templates/kafka_broker.py dest=/usr/lib/python2.7/dist-packages/ceilometer/publisher/kafka_broker.py owner=root group=root mode=0777
+# notify:
+# - restart ceilometer-agent-notification service
handlers:
- name: restart ceilometer-agent-notification service