openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Use timezone UTC on undercloud

Browse Source 
Previously no timezone was defined in undercloud config [1][2],
so TripleO kept using the local timezone on the undercloud [3].
This patch changes the timezone on the undercloud to UTC in order
to match the overcloud [4][5] and simplify debugging of ci issues.

Ref.:
[1] https://opendev.org/openstack/tripleo-quickstart/src/branch/master/config/general_config
[2] https://github.com/openstack/tripleo-quickstart-extras/blob/master/roles/undercloud-deploy/templates/undercloud.conf.j2
[3] 8edbcca6bf/tripleoclient/v1/undercloud_config.py (L503)
[4] https://opendev.org/openstack/tripleo-ansible/src/branch/master/tripleo_ansible/roles/tripleo_timezone/defaults/main.yml
[5] https://opendev.org/openstack/tripleo-heat-templates/src/branch/master/deployment/time

Signed-off-by: Jakob Meng <code@jakobmeng.de>
Change-Id: I522d9719fcbd061b9c927a07722a4c39319cffad
This commit is contained in:
Jakob Meng 2022-05-17 21:34:19 +02:00
parent 0c2be73411
commit 554075ecc7
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/environments/rdocloud-ci.yml.example
View File

@ -20,6 +20,7 @@ nameserver_from_virthost: false
custom_nameserver:
- 38.145.33.91
undercloud_undercloud_nameservers: "{{ custom_nameserver }}"
undercloud_undercloud_timezone: 'UTC'
external_net: '38.145.32.0/22'
overcloud_dns_servers: "{{ custom_nameserver }}"
ntp_server: 'pool.ntp.org'

1
roles/undercloud-deploy/defaults/main.yml
View File

@ -55,6 +55,7 @@ undercloud_ipxe_deploy: true
undercloud_enable_swift_encryption: false
undercloud_undercloud_debug: true
undercloud_undercloud_timezone: 'UTC'
# Path to tripleo-heat-templates to be cloned from given repo/branch/refscpec
undercloud_templates_path: /usr/share/openstack-tripleo-heat-templates

7
roles/undercloud-deploy/templates/undercloud.conf.j2
View File

@ -105,6 +105,13 @@ undercloud_ntp_servers = {{ undercloud_undercloud_ntp_servers|join(',') }}
#undercloud_ntp_servers =
{% endif %}
# Timezone for the Undercloud node. (string value)
{% if undercloud_undercloud_timezone is string %}
undercloud_timezone = {{ undercloud_undercloud_timezone }}
{% else %}
# undercloud_timezone = <None>
{% endif %}
# DNS domain name to use when deploying the overcloud. The overcloud
# parameter "CloudDomain" must be set to a matching value. (string
# value)