Skip to content
Snippets Groups Projects
Commit 0fcee875 authored by Jeffrey Zhang's avatar Jeffrey Zhang
Browse files

map the host localtime to the container

Closes-Bug: #1577148
Change-Id: I636cefc63cf532434a41af3898b63dffa711e280
parent 86a99c46
No related branches found
No related tags found
No related merge requests found
Showing
with 40 additions and 4 deletions
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
restart_policy: "never" restart_policy: "never"
volumes: volumes:
- "{{ node_config_directory }}/ceph-osd/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ceph-osd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
with_indexed_items: osds_bootstrap|default([]) with_indexed_items: osds_bootstrap|default([])
...@@ -79,5 +80,6 @@ ...@@ -79,5 +80,6 @@
restart_policy: "never" restart_policy: "never"
volumes: volumes:
- "{{ node_config_directory }}/ceph-osd/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ceph-osd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
with_indexed_items: osds_cache_bootstrap|default([]) with_indexed_items: osds_cache_bootstrap|default([])
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
restart_policy: "never" restart_policy: "never"
volumes: volumes:
- "{{ node_config_directory }}/ceph-mon/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ceph-mon/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "ceph_mon:/var/lib/ceph" - "ceph_mon:/var/lib/ceph"
- "ceph_mon_config:/etc/ceph" - "ceph_mon_config:/etc/ceph"
......
...@@ -10,5 +10,6 @@ ...@@ -10,5 +10,6 @@
name: "ceph_mon" name: "ceph_mon"
volumes: volumes:
- "{{ node_config_directory }}/ceph-mon/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ceph-mon/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "ceph_mon:/var/lib/ceph" - "ceph_mon:/var/lib/ceph"
- "ceph_mon_config:/etc/ceph" - "ceph_mon_config:/etc/ceph"
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
privileged: True privileged: True
volumes: volumes:
- "{{ node_config_directory }}/ceph-osd/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ceph-osd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
- "/var/lib/ceph/osd/{{ item.1['fs_uuid'] }}:/var/lib/ceph/osd/ceph-{{ item.0.stdout }}" - "/var/lib/ceph/osd/{{ item.1['fs_uuid'] }}:/var/lib/ceph/osd/ceph-{{ item.0.stdout }}"
with_together: with_together:
......
...@@ -5,4 +5,6 @@ ...@@ -5,4 +5,6 @@
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
image: "{{ ceph_rgw_image_full }}" image: "{{ ceph_rgw_image_full }}"
name: "ceph_rgw" name: "ceph_rgw"
volumes: "{{ node_config_directory }}/ceph-rgw/:{{ container_config_directory }}/:ro" volumes:
- "{{ node_config_directory }}/ceph-rgw/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
restart_policy: "never" restart_policy: "never"
volumes: volumes:
- "{{ node_config_directory }}/cinder-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/cinder-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
run_once: True run_once: True
delegate_to: "{{ groups['cinder-api'][0] }}" delegate_to: "{{ groups['cinder-api'][0] }}"
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
image: "{{ cinder_api_image_full }}" image: "{{ cinder_api_image_full }}"
volumes: volumes:
- "{{ node_config_directory }}/cinder-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/cinder-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['cinder-api'] when: inventory_hostname in groups['cinder-api']
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
image: "{{ cinder_scheduler_image_full }}" image: "{{ cinder_scheduler_image_full }}"
volumes: volumes:
- "{{ node_config_directory }}/cinder-scheduler/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/cinder-scheduler/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['cinder-scheduler'] when: inventory_hostname in groups['cinder-scheduler']
...@@ -25,6 +27,7 @@ ...@@ -25,6 +27,7 @@
set_fact: set_fact:
mounts: mounts:
- "{{ node_config_directory }}/cinder-volume/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/cinder-volume/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
- "/run/:/run/" - "/run/:/run/"
- "{% if enable_iscsi | bool %}cinder:/var/lib/cinder{% endif %}" - "{% if enable_iscsi | bool %}cinder:/var/lib/cinder{% endif %}"
...@@ -51,6 +54,7 @@ ...@@ -51,6 +54,7 @@
privileged: True privileged: True
volumes: volumes:
- "{{ node_config_directory }}/cinder-backup/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/cinder-backup/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/dev/mapper/:/dev/mapper/" - "/dev/mapper/:/dev/mapper/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['cinder-backup'] when: inventory_hostname in groups['cinder-backup']
...@@ -21,5 +21,6 @@ ...@@ -21,5 +21,6 @@
restart_policy: "never" restart_policy: "never"
volumes: volumes:
- "{{ node_config_directory }}/heka/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/heka/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: kolla_logs_volume.changed when: kolla_logs_volume.changed
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
name: "heka" name: "heka"
volumes: volumes:
- "{{ node_config_directory }}/heka/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/heka/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "heka:/var/cache/hekad" - "heka:/var/cache/hekad"
- "heka_socket:/var/lib/kolla/heka/" - "heka_socket:/var/lib/kolla/heka/"
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
name: "kolla_toolbox" name: "kolla_toolbox"
privileged: True privileged: True
volumes: volumes:
- "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
- "/run/:/run/" - "/run/:/run/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
...@@ -37,5 +39,6 @@ ...@@ -37,5 +39,6 @@
name: "cron" name: "cron"
volumes: volumes:
- "{{ node_config_directory }}/cron/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/cron/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "heka_socket:/var/lib/kolla/heka/" - "heka_socket:/var/lib/kolla/heka/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
...@@ -7,4 +7,5 @@ ...@@ -7,4 +7,5 @@
name: "elasticsearch" name: "elasticsearch"
volumes: volumes:
- "{{ node_config_directory }}/elasticsearch/:{{ container_config_directory }}/" - "{{ node_config_directory }}/elasticsearch/:{{ container_config_directory }}/"
- "/etc/localtime:/etc/localtime:ro"
- "elasticsearch:/var/lib/elasticsearch/data" - "elasticsearch:/var/lib/elasticsearch/data"
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
restart_policy: "never" restart_policy: "never"
volumes: volumes:
- "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "glance:/var/lib/glance/" - "glance:/var/lib/glance/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
run_once: True run_once: True
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
name: "glance_registry" name: "glance_registry"
volumes: volumes:
- "{{ node_config_directory }}/glance-registry/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/glance-registry/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['glance-registry'] when: inventory_hostname in groups['glance-registry']
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
name: "glance_api" name: "glance_api"
volumes: volumes:
- "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "glance:/var/lib/glance/" - "glance:/var/lib/glance/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['glance-api'] when: inventory_hostname in groups['glance-api']
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
privileged: True privileged: True
volumes: volumes:
- "{{ node_config_directory }}/haproxy/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/haproxy/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "haproxy_socket:/var/lib/kolla/haproxy/" - "haproxy_socket:/var/lib/kolla/haproxy/"
- "heka_socket:/var/lib/kolla/heka/" - "heka_socket:/var/lib/kolla/heka/"
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
privileged: True privileged: True
volumes: volumes:
- "{{ node_config_directory }}/keepalived/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/keepalived/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "haproxy_socket:/var/lib/kolla/haproxy/" - "haproxy_socket:/var/lib/kolla/haproxy/"
- "heka_socket:/var/lib/kolla/heka/" - "heka_socket:/var/lib/kolla/heka/"
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
restart_policy: "never" restart_policy: "never"
volumes: volumes:
- "{{ node_config_directory }}/heat-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/heat-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
run_once: True run_once: True
delegate_to: "{{ groups['heat-api'][0] }}" delegate_to: "{{ groups['heat-api'][0] }}"
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
name: "heat_api" name: "heat_api"
volumes: volumes:
- "{{ node_config_directory }}/heat-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/heat-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['heat-api'] when: inventory_hostname in groups['heat-api']
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
name: "heat_api_cfn" name: "heat_api_cfn"
volumes: volumes:
- "{{ node_config_directory }}/heat-api-cfn/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/heat-api-cfn/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['heat-api-cfn'] when: inventory_hostname in groups['heat-api-cfn']
...@@ -29,5 +31,6 @@ ...@@ -29,5 +31,6 @@
name: "heat_engine" name: "heat_engine"
volumes: volumes:
- "{{ node_config_directory }}/heat-engine/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/heat-engine/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['heat-engine'] when: inventory_hostname in groups['heat-engine']
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
image: "{{ horizon_image_full }}" image: "{{ horizon_image_full }}"
name: "horizon" name: "horizon"
volumes: volumes:
- "{{ node_config_directory }}/horizon/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/horizon/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['horizon'] when: inventory_hostname in groups['horizon']
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
restart_policy: "never" restart_policy: "never"
volumes: volumes:
- "{{ node_config_directory }}/ironic-pxe/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ironic-pxe/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "ironic_pxe:/tftpboot/" - "ironic_pxe:/tftpboot/"
run_once: True run_once: True
delegate_to: "{{ groups['ironic-pxe'][0] }}" delegate_to: "{{ groups['ironic-pxe'][0] }}"
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
BOOTSTRAP: BOOTSTRAP:
name: "bootstrap_ironic" name: "bootstrap_ironic"
restart_policy: "never" restart_policy: "never"
volumes: "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro" volumes:
- "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
run_once: True run_once: True
delegate_to: "{{ groups['ironic-api'][0] }}" delegate_to: "{{ groups['ironic-api'][0] }}"
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
image: "{{ ironic_pxe_image_full }}" image: "{{ ironic_pxe_image_full }}"
volumes: volumes:
- "{{ node_config_directory }}/ironic-pxe/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ironic-pxe/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "ironic_pxe:/tftpboot/" - "ironic_pxe:/tftpboot/"
when: inventory_hostname in groups['ironic-pxe'] when: inventory_hostname in groups['ironic-pxe']
...@@ -27,6 +28,7 @@ ...@@ -27,6 +28,7 @@
name: "ironic_conductor" name: "ironic_conductor"
volumes: volumes:
- "{{ node_config_directory }}/ironic-conductor/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ironic-conductor/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "ironic_pxe:/tftpboot/" - "ironic_pxe:/tftpboot/"
when: inventory_hostname in groups['ironic-conductor'] when: inventory_hostname in groups['ironic-conductor']
...@@ -37,5 +39,7 @@ ...@@ -37,5 +39,7 @@
image: "{{ ironic_inspector_image_full }}" image: "{{ ironic_inspector_image_full }}"
name: "ironic_inspector" name: "ironic_inspector"
privileged: True privileged: True
volumes: "{{ node_config_directory }}/ironic-inspector/:{{ container_config_directory }}/:ro" volumes:
- "{{ node_config_directory }}/ironic-inspector/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
when: inventory_hostname in groups['ironic-inspector'] when: inventory_hostname in groups['ironic-inspector']
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
volumes: volumes:
- "{{ node_config_directory }}/iscsid/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/iscsid/:{{ container_config_directory }}/:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
- "/run/:/run/" - "/run/:/run/"
- "/sys/fs/cgroup:/sys/fs/cgroup:ro" - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
volumes: volumes:
- "{{ node_config_directory }}/tgtd/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/tgtd/:{{ container_config_directory }}/:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
- "/run/:/run/" - "/run/:/run/"
- "/sys/fs/cgroup:/sys/fs/cgroup:ro" - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment