From ca26f55d5c2b833e96760aab8b499286d15288ae Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Wed, 28 Sep 2016 23:49:34 +0800
Subject: [PATCH] Mount host localtime for ceilometer

Change-Id: Ia4a9e132683a8328cb2ff6d7e28e3560f2a8614e
Closes-Bug: #1628584
---
 ansible/roles/ceilometer/tasks/bootstrap_service.yml | 1 +
 ansible/roles/ceilometer/tasks/start.yml             | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/ceilometer/tasks/bootstrap_service.yml b/ansible/roles/ceilometer/tasks/bootstrap_service.yml
index 6174fdcd96..904fa15bae 100644
--- a/ansible/roles/ceilometer/tasks/bootstrap_service.yml
+++ b/ansible/roles/ceilometer/tasks/bootstrap_service.yml
@@ -14,6 +14,7 @@
     restart_policy: "never"
     volumes:
       - "{{ node_config_directory }}/ceilometer-api/:{{ container_config_directory }}/:ro"
+      - "/etc/localtime:/etc/localtime:ro"
       - "ceilometer:/var/lib/ceilometer/"
       - "kolla_logs:/var/log/kolla/"
   run_once: True
diff --git a/ansible/roles/ceilometer/tasks/start.yml b/ansible/roles/ceilometer/tasks/start.yml
index 575ba54857..0d87ae6071 100644
--- a/ansible/roles/ceilometer/tasks/start.yml
+++ b/ansible/roles/ceilometer/tasks/start.yml
@@ -7,6 +7,7 @@
     name: "ceilometer_notification"
     volumes:
       - "{{ node_config_directory }}/ceilometer-notification/:{{ container_config_directory }}/:ro"
+      - "/etc/localtime:/etc/localtime:ro"
       - "kolla_logs:/var/log/kolla/"
   when: inventory_hostname in groups['ceilometer-notification']
 
@@ -18,6 +19,7 @@
     name: "ceilometer_api"
     volumes:
       - "{{ node_config_directory }}/ceilometer-api/:{{ container_config_directory }}/:ro"
+      - "/etc/localtime:/etc/localtime:ro"
       - "ceilometer:/var/lib/ceilometer/"
       - "kolla_logs:/var/log/kolla/"
   when: inventory_hostname in groups['ceilometer-api']
@@ -30,6 +32,7 @@
     name: "ceilometer_central"
     volumes:
       - "{{ node_config_directory }}/ceilometer-central/:{{ container_config_directory }}/:ro"
+      - "/etc/localtime:/etc/localtime:ro"
       - "ceilometer:/var/lib/ceilometer/"
       - "kolla_logs:/var/log/kolla/"
   when: inventory_hostname in groups['ceilometer-central']
@@ -42,6 +45,7 @@
     name: "ceilometer_collector"
     volumes:
       - "{{ node_config_directory }}/ceilometer-collector/:{{ container_config_directory }}/:ro"
+      - "/etc/localtime:/etc/localtime:ro"
       - "ceilometer:/var/lib/ceilometer/"
       - "kolla_logs:/var/log/kolla/"
   when: inventory_hostname in groups['ceilometer-collector']
@@ -55,8 +59,9 @@
     privileged: True
     volumes:
       - "{{ node_config_directory }}/ceilometer-compute/:{{ container_config_directory }}/:ro"
+      - "/etc/localtime:/etc/localtime:ro"
+      - "/run/:/run/"
       - "ceilometer:/var/lib/ceilometer/"
       - "kolla_logs:/var/log/kolla/"
-      - "/run/:/run/"
       - "nova_libvirt:/var/lib/libvirt"
   when: inventory_hostname in groups['ceilometer-compute']