Merge "Mount host localtime for containers"

This commit is contained in:
Jenkins 2016-10-13 14:06:20 +00:00 committed by Gerrit Code Review
commit 2abef796d6
9 changed files with 17 additions and 2 deletions

View File

@ -14,8 +14,8 @@
restart_policy: "never" restart_policy: "never"
volumes: volumes:
- "{{ node_config_directory }}/aodh-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/aodh-api/:{{ container_config_directory }}/:ro"
- "aodh:/var/lib/aodh/"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "aodh:/var/lib/aodh/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
run_once: True run_once: True
delegate_to: "{{ groups['aodh-api'][0] }}" delegate_to: "{{ groups['aodh-api'][0] }}"

View File

@ -7,6 +7,7 @@
name: "aodh_api" name: "aodh_api"
volumes: volumes:
- "{{ node_config_directory }}/aodh-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/aodh-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "aodh:/var/lib/aodh/" - "aodh:/var/lib/aodh/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['aodh-api'] when: inventory_hostname in groups['aodh-api']
@ -19,6 +20,7 @@
name: "aodh_evaluator" name: "aodh_evaluator"
volumes: volumes:
- "{{ node_config_directory }}/aodh-evaluator/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/aodh-evaluator/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['aodh-evaluator'] when: inventory_hostname in groups['aodh-evaluator']
@ -30,6 +32,7 @@
name: "aodh_listener" name: "aodh_listener"
volumes: volumes:
- "{{ node_config_directory }}/aodh-listener/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/aodh-listener/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['aodh-listener'] when: inventory_hostname in groups['aodh-listener']
@ -41,5 +44,6 @@
name: "aodh_notifier" name: "aodh_notifier"
volumes: volumes:
- "{{ node_config_directory }}/aodh-notifier/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/aodh-notifier/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['aodh-notifier'] when: inventory_hostname in groups['aodh-notifier']

View File

@ -14,8 +14,8 @@
restart_policy: "never" restart_policy: "never"
volumes: volumes:
- "{{ node_config_directory }}/barbican-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/barbican-api/:{{ container_config_directory }}/:ro"
- "barbican:/var/lib/barbican/"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "barbican:/var/lib/barbican/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
run_once: True run_once: True
delegate_to: "{{ groups['barbican-api'][0] }}" delegate_to: "{{ groups['barbican-api'][0] }}"

View File

@ -7,6 +7,7 @@
name: "barbican_api" name: "barbican_api"
volumes: volumes:
- "{{ node_config_directory }}/barbican-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/barbican-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "barbican:/var/lib/barbican/" - "barbican:/var/lib/barbican/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['barbican-api'] when: inventory_hostname in groups['barbican-api']
@ -19,6 +20,7 @@
name: "barbican_keystone_listener" name: "barbican_keystone_listener"
volumes: volumes:
- "{{ node_config_directory }}/barbican-keystone-listener/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/barbican-keystone-listener/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['barbican-keystone-listener'] when: inventory_hostname in groups['barbican-keystone-listener']
@ -30,5 +32,6 @@
name: "barbican_worker" name: "barbican_worker"
volumes: volumes:
- "{{ node_config_directory }}/barbican-worker/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/barbican-worker/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['barbican-worker'] when: inventory_hostname in groups['barbican-worker']

View File

@ -14,5 +14,6 @@
restart_policy: "never" restart_policy: "never"
volumes: volumes:
- "{{ node_config_directory }}/etcd/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/etcd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_etcd:/var/lib/etcd/" - "kolla_etcd:/var/lib/etcd/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"

View File

@ -7,6 +7,7 @@
name: "gnocchi_api" name: "gnocchi_api"
volumes: volumes:
- "{{ node_config_directory }}/gnocchi-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/gnocchi-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "gnocchi:/var/lib/gnocchi/" - "gnocchi:/var/lib/gnocchi/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['gnocchi-api'] when: inventory_hostname in groups['gnocchi-api']
@ -19,6 +20,7 @@
name: "gnocchi_metricd" name: "gnocchi_metricd"
volumes: volumes:
- "{{ node_config_directory }}/gnocchi-metricd/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/gnocchi-metricd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "gnocchi:/var/lib/gnocchi/" - "gnocchi:/var/lib/gnocchi/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['gnocchi-metricd'] when: inventory_hostname in groups['gnocchi-metricd']
@ -31,6 +33,7 @@
name: "gnocchi_statsd" name: "gnocchi_statsd"
volumes: volumes:
- "{{ node_config_directory }}/gnocchi-statsd/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/gnocchi-statsd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "gnocchi:/var/lib/gnocchi/" - "gnocchi:/var/lib/gnocchi/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['gnocchi-statsd'] when: inventory_hostname in groups['gnocchi-statsd']

View File

@ -14,5 +14,6 @@
restart_policy: "never" restart_policy: "never"
volumes: volumes:
- "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/run:/run" - "/run:/run"
- "/usr/lib/docker:/usr/lib/docker" - "/usr/lib/docker:/usr/lib/docker"

View File

@ -13,6 +13,7 @@
privileged: True privileged: True
volumes: volumes:
- "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/run:/run" - "/run:/run"
- "/usr/lib/docker:/usr/lib/docker" - "/usr/lib/docker:/usr/lib/docker"
when: inventory_hostname in groups['compute'] when: inventory_hostname in groups['compute']

View File

@ -7,6 +7,7 @@
name: "sahara_api" name: "sahara_api"
volumes: volumes:
- "{{ node_config_directory }}/sahara-api/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/sahara-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "sahara:/var/lib/sahara/" - "sahara:/var/lib/sahara/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['sahara-api'] when: inventory_hostname in groups['sahara-api']
@ -19,6 +20,7 @@
name: "sahara_engine" name: "sahara_engine"
volumes: volumes:
- "{{ node_config_directory }}/sahara-engine/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/sahara-engine/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "sahara:/var/lib/sahara/" - "sahara:/var/lib/sahara/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['sahara-engine'] when: inventory_hostname in groups['sahara-engine']