diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-09-29 00:14:05 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-10-13 11:35:03 +0000 |
| commit | 16a1f9f006286f684a056b45577e27389ab7009e (patch) | |
| tree | f3797a16cebb113aa88740af0613495761c72046 | |
| parent | 5fbdee9bbf2d682abc310355cd828a86966319f6 (diff) | |
| download | kolla-16a1f9f006286f684a056b45577e27389ab7009e.tar.gz kolla-16a1f9f006286f684a056b45577e27389ab7009e.zip | |
Mount host localtime for containers
Add /etc/localtime:/etc/localtime:ro to volume for aodh, barbican, etcd,
gnocchi, kuryr and sahara.
All the containers are added in Netwon cycle, so no need to backport
Closes-Bug: #1633049
Change-Id: I9cdba54cf730af44fb1a9ff6f2c936d23dadbe9a
| -rw-r--r-- | ansible/roles/aodh/tasks/bootstrap_service.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/aodh/tasks/start.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/barbican/tasks/bootstrap_service.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/barbican/tasks/start.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/etcd/tasks/bootstrap.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/gnocchi/tasks/start.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/kuryr/tasks/bootstrap.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/kuryr/tasks/start.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/sahara/tasks/start.yml | 2 |
9 files changed, 17 insertions, 2 deletions
diff --git a/ansible/roles/aodh/tasks/bootstrap_service.yml b/ansible/roles/aodh/tasks/bootstrap_service.yml index 84ed6ec98..5b3f0585c 100644 --- a/ansible/roles/aodh/tasks/bootstrap_service.yml +++ b/ansible/roles/aodh/tasks/bootstrap_service.yml @@ -14,8 +14,8 @@ restart_policy: "never" volumes: - "{{ node_config_directory }}/aodh-api/:{{ container_config_directory }}/:ro" - - "aodh:/var/lib/aodh/" - "/etc/localtime:/etc/localtime:ro" + - "aodh:/var/lib/aodh/" - "kolla_logs:/var/log/kolla/" run_once: True delegate_to: "{{ groups['aodh-api'][0] }}" diff --git a/ansible/roles/aodh/tasks/start.yml b/ansible/roles/aodh/tasks/start.yml index 5db52b65e..408479919 100644 --- a/ansible/roles/aodh/tasks/start.yml +++ b/ansible/roles/aodh/tasks/start.yml @@ -7,6 +7,7 @@ name: "aodh_api" volumes: - "{{ node_config_directory }}/aodh-api/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "aodh:/var/lib/aodh/" - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['aodh-api'] @@ -19,6 +20,7 @@ name: "aodh_evaluator" volumes: - "{{ node_config_directory }}/aodh-evaluator/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['aodh-evaluator'] @@ -30,6 +32,7 @@ name: "aodh_listener" volumes: - "{{ node_config_directory }}/aodh-listener/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['aodh-listener'] @@ -41,5 +44,6 @@ name: "aodh_notifier" volumes: - "{{ node_config_directory }}/aodh-notifier/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['aodh-notifier'] diff --git a/ansible/roles/barbican/tasks/bootstrap_service.yml b/ansible/roles/barbican/tasks/bootstrap_service.yml index fc575a0ac..04ece90fd 100644 --- a/ansible/roles/barbican/tasks/bootstrap_service.yml +++ b/ansible/roles/barbican/tasks/bootstrap_service.yml @@ -14,8 +14,8 @@ restart_policy: "never" volumes: - "{{ node_config_directory }}/barbican-api/:{{ container_config_directory }}/:ro" - - "barbican:/var/lib/barbican/" - "/etc/localtime:/etc/localtime:ro" + - "barbican:/var/lib/barbican/" - "kolla_logs:/var/log/kolla/" run_once: True delegate_to: "{{ groups['barbican-api'][0] }}" diff --git a/ansible/roles/barbican/tasks/start.yml b/ansible/roles/barbican/tasks/start.yml index e1891f656..c862beaaf 100644 --- a/ansible/roles/barbican/tasks/start.yml +++ b/ansible/roles/barbican/tasks/start.yml @@ -7,6 +7,7 @@ name: "barbican_api" volumes: - "{{ node_config_directory }}/barbican-api/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "barbican:/var/lib/barbican/" - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['barbican-api'] @@ -19,6 +20,7 @@ name: "barbican_keystone_listener" volumes: - "{{ node_config_directory }}/barbican-keystone-listener/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['barbican-keystone-listener'] @@ -30,5 +32,6 @@ name: "barbican_worker" volumes: - "{{ node_config_directory }}/barbican-worker/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['barbican-worker'] diff --git a/ansible/roles/etcd/tasks/bootstrap.yml b/ansible/roles/etcd/tasks/bootstrap.yml index bea1cb7ec..d098ff99b 100644 --- a/ansible/roles/etcd/tasks/bootstrap.yml +++ b/ansible/roles/etcd/tasks/bootstrap.yml @@ -14,5 +14,6 @@ restart_policy: "never" volumes: - "{{ node_config_directory }}/etcd/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "kolla_etcd:/var/lib/etcd/" - "kolla_logs:/var/log/kolla/" diff --git a/ansible/roles/gnocchi/tasks/start.yml b/ansible/roles/gnocchi/tasks/start.yml index d53ab979b..5d0231fe4 100644 --- a/ansible/roles/gnocchi/tasks/start.yml +++ b/ansible/roles/gnocchi/tasks/start.yml @@ -7,6 +7,7 @@ name: "gnocchi_api" volumes: - "{{ node_config_directory }}/gnocchi-api/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "gnocchi:/var/lib/gnocchi/" - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['gnocchi-api'] @@ -19,6 +20,7 @@ name: "gnocchi_metricd" volumes: - "{{ node_config_directory }}/gnocchi-metricd/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "gnocchi:/var/lib/gnocchi/" - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['gnocchi-metricd'] @@ -31,6 +33,7 @@ name: "gnocchi_statsd" volumes: - "{{ node_config_directory }}/gnocchi-statsd/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "gnocchi:/var/lib/gnocchi/" - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['gnocchi-statsd'] diff --git a/ansible/roles/kuryr/tasks/bootstrap.yml b/ansible/roles/kuryr/tasks/bootstrap.yml index fff80d223..72a30a5b4 100644 --- a/ansible/roles/kuryr/tasks/bootstrap.yml +++ b/ansible/roles/kuryr/tasks/bootstrap.yml @@ -14,5 +14,6 @@ restart_policy: "never" volumes: - "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "/run:/run" - "/usr/lib/docker:/usr/lib/docker" diff --git a/ansible/roles/kuryr/tasks/start.yml b/ansible/roles/kuryr/tasks/start.yml index f48865550..d5a4896a6 100644 --- a/ansible/roles/kuryr/tasks/start.yml +++ b/ansible/roles/kuryr/tasks/start.yml @@ -13,6 +13,7 @@ privileged: True volumes: - "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "/run:/run" - "/usr/lib/docker:/usr/lib/docker" when: inventory_hostname in groups['compute'] diff --git a/ansible/roles/sahara/tasks/start.yml b/ansible/roles/sahara/tasks/start.yml index 5b521ebc6..bb7b22d6b 100644 --- a/ansible/roles/sahara/tasks/start.yml +++ b/ansible/roles/sahara/tasks/start.yml @@ -7,6 +7,7 @@ name: "sahara_api" volumes: - "{{ node_config_directory }}/sahara-api/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "sahara:/var/lib/sahara/" - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['sahara-api'] @@ -19,6 +20,7 @@ name: "sahara_engine" volumes: - "{{ node_config_directory }}/sahara-engine/:{{ container_config_directory }}/:ro" + - "/etc/localtime:/etc/localtime:ro" - "sahara:/var/lib/sahara/" - "kolla_logs:/var/log/kolla/" when: inventory_hostname in groups['sahara-engine'] |
