Adding missing localtime mounts and volumes

PS adds missing localtime mount to mariadb,rabbitmq,keystone and
memcached. Also it standardize on host-etc-localtime as volume name
and fixes bunch of other inconsistency encountered with logging
enabled.

Partially-Implemets: blueprint centralized-logging

Change-Id: I849d5a3051d630c236e6babb21c846aef8646350

etc/kolla-kubernetes/service_resources.yml

@@ -359,6 +359,11 @@ kolla-kubernetes:
         vars:
           configmap_name: nova-novncproxy-haproxy
           port_name: nova_novncproxy_port
+      - name: nova-novncproxy-logging
+        template: services/common/logging-configmap.yml.j2
+        vars:
+          configmap_name: nova-novncproxy-logging
+          log_format: 'openstack'
       secret:
       - name: nova-libvirt
         template: services/nova/nova-libvirt-secret.yml.j2

services/ceph/ceph-bootstrap-initial-mon.yml.j2

@@ -69,7 +69,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
             - mountPath: /var/lib/ceph
               name: ceph-mon
       volumes:
@@ -81,7 +81,7 @@ spec:
         - name: ceph-mon
           hostPath:
             path: /var/lib/kolla/volumes/ceph-mon
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/ceph/ceph-bootstrap-osd.yml.j2

@@ -87,7 +87,7 @@ spec:
         - mountPath: /var/log/kolla
           name: kolla-logs
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
         - mountPath: /var/lib/ceph
           name: ceph-osd
         - mountPath: {{ container_config_directory }}/ceph.client.admin.keyring
@@ -110,7 +110,7 @@ spec:
     - name: ceph-client-admin-keyring
       secret:
         secretName: ceph-client-admin-keyring
-    - name: etc-localtime
+    - name: host-etc-localtime
       hostPath:
         path: /etc/localtime
     - name: kolla-logs

services/ceph/ceph-mon-pod.yml.j2

@@ -91,7 +91,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
             - mountPath: /var/lib/ceph
               name: ceph-mon
             - mountPath: {{ container_config_directory }}/ceph.client.mon.keyring
@@ -121,7 +121,7 @@ spec:
         - name: ceph-mon
           hostPath:
             path: /var/lib/kolla/volumes/ceph-mon
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/ceph/ceph-osd-pod.yml.j2

@@ -78,7 +78,7 @@ spec:
         - mountPath: /var/log/kolla
           name: kolla-logs
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
         - mountPath: /var/lib/ceph
           name: ceph-osd
         - mountPath: {{ container_config_directory }}/ceph.client.admin.keyring
@@ -101,7 +101,7 @@ spec:
     - name: ceph-client-admin-keyring
       secret:
         secretName: ceph-client-admin-keyring
-    - name: etc-localtime
+    - name: host-etc-localtime
       hostPath:
         path: /etc/localtime
     - name: kolla-logs

services/cinder/cinder-backup-pod.yml.j2

@@ -70,7 +70,7 @@ spec:
             - mountPath: /var/log/kolla/
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: KOLLA_CONFIG_STRATEGY
               value: {{ config_strategy }}
@@ -85,7 +85,7 @@ spec:
         - name: cinder-backup-configmap
           configMap:
             name: cinder-backup
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/cinder/cinder-bootstrap-job-create-db.yml.j2

@@ -73,7 +73,7 @@ spec:
         - name: cinder-api-config
           configMap:
             name: cinder-api
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/cinder/cinder-bootstrap-job-endpoints.yml.j2

@@ -205,7 +205,7 @@ spec:
         - name: cinder-api-config
           configMap:
             name: cinder-api
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/cinder/cinder-bootstrap-job-manage-db.yml.j2

@@ -31,7 +31,7 @@ spec:
         - name: cinder-api-config
           configMap:
             name: cinder-api
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/cinder/cinder-scheduler-pod.yml.j2

@@ -32,7 +32,7 @@ spec:
             - mountPath: /var/log/kolla/
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: KOLLA_CONFIG_STRATEGY
               value: {{ config_strategy }}
@@ -45,7 +45,7 @@ spec:
         - name: cinder-scheduler-configmap
           configMap:
             name: cinder-scheduler
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/cinder/cinder-volume-ceph-pod.yml.j2

@@ -1,4 +1,5 @@
 {%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
+{%- set loggerConfigmapName = "cinder-volume" %}
 {%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
 apiVersion: apps/v1alpha1
 kind: PetSet

services/cinder/cinder-volume-lvm-pod.yml.j2

@@ -1,4 +1,5 @@
 {%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
+{%- set loggerConfigmapName = "cinder-volume" %}
 {%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
 apiVersion: extensions/v1beta1
 kind: DaemonSet

services/common/common-deployment.yml.j2

@@ -125,7 +125,7 @@ spec:
             - mountPath: /var/log/kolla/
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: KOLLA_CONFIG_STRATEGY
               value: {{ config_strategy }}
@@ -153,7 +153,7 @@ spec:
             - mountPath: /var/log/kolla/
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
 {{ extraVolumeMounts | indent(12, True) }}
 {%- if privileged %}
           securityContext:
@@ -177,7 +177,7 @@ spec:
         - name: haproxy-config
           configMap:
             name: {{ resourceName }}-haproxy
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/common/common-kube-logger.yml.j2

@@ -7,7 +7,7 @@
     - mountPath: /var/log/kolla/
       name: kolla-logs
     - mountPath: /etc/localtime
-      name: etc-localtime
+      name: host-etc-localtime
   env:
     - name: KOLLA_CONFIG_STRATEGY
       value: {{ config_strategy }}
@@ -16,5 +16,5 @@
 {% macro kube_logger_volume() %}
 - name: logging-config
   configMap:
-    name: {{ resourceName }}-logging
+    name: {{ loggerConfigmapName | default(resourceName) }}-logging
 {% endmacro %}

services/elasticsearch/elasticsearch-pod.yml.j2

@@ -51,7 +51,7 @@ spec:
             - mountPath: /var/lib/elasticsearch/data
               name: elasticsearch-persistent-storage
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
             - mountPath: /var/log/kolla
               name: kolla-logs
           env:
@@ -64,7 +64,7 @@ spec:
         - name: elasticsearch-config
           configMap:
             name: elasticsearch
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: pod-main-config

services/glance/glance-api-pod.yml.j2

@@ -117,7 +117,7 @@ spec:
             - mountPath: /var/log/kolla/
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: KOLLA_CONFIG_STRATEGY
               value: {{ config_strategy }}
@@ -145,7 +145,7 @@ spec:
             - mountPath: /var/log/kolla/
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: KOLLA_CONFIG_STRATEGY
               value: {{ config_strategy }}
@@ -172,7 +172,7 @@ spec:
           secret:
             secretName: ceph-client-glance-keyring
 {%- endif %}
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/glance/glance-bootstrap-job-create-db.yml.j2

@@ -28,7 +28,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: ANSIBLE_NOCOLOR
               value: "1"
@@ -57,7 +57,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: ANSIBLE_NOCOLOR
               value: "1"
@@ -76,6 +76,6 @@ spec:
       volumes:
         - name: kolla-logs
           emptyDir: {}
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime

services/glance/glance-bootstrap-job-endpoints.yml.j2

@@ -32,7 +32,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: ANSIBLE_NOCOLOR
               value: "1"
@@ -61,7 +61,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: ANSIBLE_NOCOLOR
               value: "1"
@@ -90,7 +90,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: ANSIBLE_NOCOLOR
               value: "1"
@@ -117,7 +117,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: ANSIBLE_NOCOLOR
               value: "1"
@@ -131,6 +131,6 @@ spec:
       volumes:
         - name: kolla-logs
           emptyDir: {}
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime

services/glance/glance-bootstrap-job-manage-db.yml.j2

@@ -47,7 +47,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
       volumes:
         - name: glance-api-config
           configMap:
@@ -61,7 +61,7 @@ spec:
           configMap:
             name: ceph-conf
 {% endif %}
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/horizon/horizon-pod.yml.j2

@@ -51,7 +51,7 @@ spec:
             - mountPath: /var/log/kolla/
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: KOLLA_CONFIG_STRATEGY
               value: {{ config_strategy }}
@@ -71,7 +71,7 @@ spec:
               path: config.json
             - key: local-settings
               path: local_settings
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/keystone/keystone-bootstrap-job-create-db.yml.j2

@@ -25,7 +25,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: ANSIBLE_NOCOLOR
               value: "1"
@@ -54,7 +54,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: ANSIBLE_NOCOLOR
               value: "1"
@@ -71,7 +71,7 @@ spec:
                   name: keystone-database-password
                   key: password
       volumes:
-      - name: etc-localtime
+      - name: host-etc-localtime
         hostPath:
           path: /etc/localtime
       - name: kolla-logs

services/keystone/keystone-bootstrap-job-endpoints.yml.j2

@@ -26,6 +26,9 @@ spec:
             - mountPath: {{ container_config_directory }}
               name: keystone-config
               readOnly: true
+            - mountPath: /etc/localtime
+              name: host-etc-localtime
+              readOnly: true
             - mountPath: /var/log/kolla/keystone
               name: kolla-logs
           env:
@@ -42,7 +45,7 @@ spec:
         - name: keystone-config
           configMap:
             name: keystone
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/keystone/keystone-bootstrap-job-manage-db.yml.j2

@@ -20,7 +20,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: KOLLA_KUBERNETES
               value: ""
@@ -32,7 +32,7 @@ spec:
         - name: keystone-config
           configMap:
             name: keystone
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/keystone/keystone-pod.yml.j2

@@ -1,3 +1,4 @@
+{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
 {%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
 apiVersion: v1
 kind: ReplicationController
@@ -22,6 +23,9 @@ spec:
           volumeMounts:
             - mountPath: {{ container_config_directory }}
               name: keystone-config
+            - mountPath: /etc/localtime
+              name: host-etc-localtime
+              readOnly: true
             - mountPath: /var/log/kolla/keystone
               name: kolla-logs
           env:
@@ -41,6 +45,9 @@ spec:
         - name: keystone-config
           configMap:
             name: keystone
+        - name: host-etc-localtime
+          hostPath:
+            path: /etc/localtime
         - name: kolla-logs
           emptyDir: {}
 {% if enable_kube_logger == "yes" %}

services/mariadb/mariadb-pod.yml.j2

@@ -30,6 +30,9 @@ spec:
               name: mariadb-config
             - mountPath: /var/lib/mysql
               name: mariadb-persistent-storage
+            - mountPath: /etc/localtime
+              name: host-etc-localtime
+              readOnly: true
             - mountPath: /var/log/kolla/
               name: kolla-logs
           env:
@@ -55,6 +58,9 @@ spec:
         - name: mariadb-persistent-storage
           persistentVolumeClaim:
             claimName: {{ resourceName }}
+        - name: host-etc-localtime
+          hostPath:
+            path: /etc/localtime
         - name: kolla-logs
           emptyDir: {}
 {% if enable_kube_logger == "yes" %}

services/memcached/memcached-pod.yml.j2

@@ -20,6 +20,9 @@ spec:
           volumeMounts:
             - mountPath: {{ container_config_directory }}
               name: memcached-config
+            - mountPath: /etc/localtime
+              name: host-etc-localtime
+              readOnly: true
           env:
             - name: KOLLA_CONFIG_STRATEGY
               value: {{ config_strategy }}
@@ -30,6 +33,10 @@ spec:
         - name: memcached-config
           configMap:
             name: memcached
+        - name: host-etc-localtime
+          hostPath:
+            path: /etc/localtime
+
 metadata:
    name: memcached
    namespace: {{ kolla_kubernetes_namespace }}

services/neutron/neutron-bootstrap-job-create-db.yml.j2

@@ -16,7 +16,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           command: ["bash", "-c"]
           args:
             - ansible localhost -m mysql_db -a
@@ -41,7 +41,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           command: ["sh", "-c"]
           args:
             - ansible localhost -m mysql_user -a
@@ -70,7 +70,7 @@ spec:
                   name: neutron-database-password
                   key: password
       volumes:
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/neutron/neutron-bootstrap-job-endpoints.yml.j2

@@ -57,7 +57,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
           env:
             - name: ANSIBLE_NOCOLOR
               value: "1"
@@ -74,7 +74,7 @@ spec:
                   name: keystone-admin-password
                   key: password
       volumes:
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/neutron/neutron-bootstrap-job-manage-db.yml.j2

@@ -24,7 +24,7 @@ spec:
             - mountPath: /var/log/kolla
               name: kolla-logs
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
       volumes:
         - name: neutron-server-config
           configMap:
@@ -40,7 +40,7 @@ spec:
               path: neutron_lbaas.conf
             - key: neutron-vpnaas.conf
               path: neutron_vpnaas.conf
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: kolla-logs

services/neutron/neutron-dhcp-agent-daemonset.yml.j2

@@ -1,3 +1,5 @@
+{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
+{%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
 apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:

services/neutron/neutron-l3-agent-daemonset.yml.j2

@@ -1,3 +1,5 @@
+{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
+{%- set loggerConfigmapName = "neutron-l3-agent" %}
 {%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
 apiVersion: extensions/v1beta1
 kind: DaemonSet

services/neutron/neutron-metadata-agent-daemonset.yml.j2

@@ -1,3 +1,5 @@
+{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
+{%- set loggerConfigmapName = "neutron-metadata-agent" %}
 {%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
 apiVersion: extensions/v1beta1
 kind: DaemonSet

services/neutron/neutron-openvswitch-agent-daemonset.yml.j2

@@ -1,3 +1,5 @@
+{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
+{%- set loggerConfigmapName = "neutron-openvswitch-agent" %}
 {%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
 apiVersion: extensions/v1beta1
 kind: DaemonSet

services/nova/nova-compute-pod.yml.j2

@@ -1,3 +1,4 @@
+{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
 {%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
 apiVersion: extensions/v1beta1
 kind: DaemonSet
@@ -103,7 +104,7 @@ spec:
             - mountPath: /var/lib/nova
               name: nova-compute-persistent-storage
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
             - mountPath: /lib/modules
               name: lib-modules
             - mountPath: /var/run
@@ -134,7 +135,7 @@ spec:
         - name: nova-compute-persistent-storage
           hostPath:
             path: /var/lib/nova
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: lib-modules

services/nova/nova-control-bootstrap-job-create-nova-api-db.yml.j2

@@ -15,7 +15,7 @@ spec:
             - mountPath: {{ container_config_directory }}
               name: nova-api-config
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
             - mountPath: /lib/modules
               name: lib-modules
             - mountPath: /var/log/kolla
@@ -29,7 +29,7 @@ spec:
         - name: nova-api-config
           configMap:
             name: nova-api
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: lib-modules

services/nova/nova-control-bootstrap-job-create-nova-db.yml.j2

@@ -72,7 +72,7 @@ spec:
         - name: nova-api-config
           configMap:
             name: nova-api
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: lib-modules

services/nova/nova-control-bootstrap-job-create-nova-endpoints.yml.j2

@@ -74,7 +74,7 @@ spec:
         - name: nova-api-config
           configMap:
             name: nova-api
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: lib-modules

services/nova/nova-control-conductor-pod.yml.j2

@@ -1,3 +1,4 @@
+{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
 {%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
 apiVersion: apps/v1alpha1
 kind: PetSet
@@ -44,7 +45,7 @@ spec:
             - mountPath: {{ container_config_directory }}
               name: nova-config
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
             - mountPath: /nova
               name: nova-config
             - mountPath: /var/log/kolla
@@ -59,7 +60,7 @@ spec:
         - name: nova-conductor-config
           configMap:
             name: nova-conductor
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: lib-modules

services/nova/nova-control-consoleauth-pod.yml.j2

@@ -48,7 +48,7 @@ spec:
             - mountPath: {{ container_config_directory }}
               name: nova-config
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
             - mountPath: /var/log/kolla
               name: kolla-logs
           env:
@@ -58,7 +58,7 @@ spec:
         - name: nova-consoleauth-config
           configMap:
             name: nova-consoleauth
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: nova-config

services/nova/nova-control-scheduler-pod.yml.j2

@@ -1,3 +1,4 @@
+{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
 {%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
 apiVersion: apps/v1alpha1
 kind: PetSet
@@ -44,7 +45,7 @@ spec:
             - mountPath: {{ container_config_directory }}
               name: nova-config
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
             - mountPath: /nova
               name: nova-config
             - mountPath: /var/log/kolla
@@ -61,7 +62,7 @@ spec:
         - name: nova-scheduler-config
           configMap:
             name: nova-scheduler
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: lib-modules

services/nova/nova-libvirt-pod.yml.j2

@@ -1,3 +1,4 @@
+{%- set resourceName = kolla_kubernetes.cli.args.resource_name %}
 {%- import "services/common/common-kube-logger.yml.j2" as kube_logger with context %}
 apiVersion: extensions/v1beta1
 kind: DaemonSet
@@ -80,7 +81,7 @@ spec:
             - mountPath: /var/lib/nova
               name: nova-compute-persistent-storage
             - mountPath: /etc/localtime
-              name: etc-localtime
+              name: host-etc-localtime
             - mountPath: /lib/modules
               name: lib-modules
             - mountPath: /var/run
@@ -109,7 +110,7 @@ spec:
         - name: nova-libvirt-persistent-storage
           hostPath:
             path: /var/lib/libvirt
-        - name: etc-localtime
+        - name: host-etc-localtime
           hostPath:
             path: /etc/localtime
         - name: lib-modules

services/rabbitmq/rabbitmq-pod.yml.j2

@@ -47,6 +47,9 @@ spec:
               name: pod-main-config
             - mountPath: /var/lib/rabbitmq
               name: rabbitmq-persistent-storage
+            - mountPath: /etc/localtime
+              name: host-etc-localtime
+              readOnly: true
             - mountPath: /var/log/kolla
               name: kolla-logs
           env:
@@ -69,6 +72,9 @@ spec:
         - name: rabbitmq-persistent-storage
           persistentVolumeClaim:
             claimName: {{ resourceName }}
+        - name: host-etc-localtime
+          hostPath:
+            path: /etc/localtime
         - name: kolla-logs
           emptyDir: {}
 {% if enable_kube_logger == "yes" %}

services/swift/swift-account-pod.yml.j2

@@ -19,7 +19,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -35,7 +35,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -51,7 +51,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -67,7 +67,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -83,7 +83,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -109,7 +109,7 @@ spec:
     - name: swift-devices
       hostPath:
         path: {{ swift_devices_mount_point }}
-    - name: etc-localtime
+    - name: host-etc-localtime
       hostPath:
         path: /etc/localtime
     - name: kolla-logs

services/swift/swift-container-pod.yml.j2

@@ -19,7 +19,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -35,7 +35,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -51,7 +51,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -67,7 +67,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -83,7 +83,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -111,7 +111,7 @@ spec:
     - name: swift-devices
       hostPath:
         path: {{ swift_devices_mount_point }}
-    - name: etc-localtime
+    - name: host-etc-localtime
       hostPath:
         path: /etc/localtime
     - name: kolla-logs

services/swift/swift-object-pod.yml.j2

@@ -19,7 +19,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -35,7 +35,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -51,7 +51,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -67,7 +67,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -83,7 +83,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -99,7 +99,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -129,7 +129,7 @@ spec:
     - name: swift-devices
       hostPath:
         path: {{ swift_devices_mount_point }}
-    - name: etc-localtime
+    - name: host-etc-localtime
       hostPath:
         path: /etc/localtime
     - name: kolla-logs

services/swift/swift-proxy-pod.yml.j2

@@ -22,7 +22,7 @@ spec:
         - mountPath: {{ swift_devices_mount_point }}
           name: swift-devices
         - mountPath: /etc/localtime
-          name: etc-localtime
+          name: host-etc-localtime
           readOnly: true
         - mountPath: /var/log/kolla/
           name: kolla-logs
@@ -37,7 +37,7 @@ spec:
     - name: swift-devices
       hostPath:
         path: {{ swift_devices_mount_point }}
-    - name: etc-localtime
+    - name: host-etc-localtime
       hostPath:
         path: /etc/localtime
     - name: kolla-logs