diff --git a/config/environments/rdocloud-ci.yml.example b/config/environments/rdocloud-ci.yml.example index 22de5ce72..98e95b03d 100644 --- a/config/environments/rdocloud-ci.yml.example +++ b/config/environments/rdocloud-ci.yml.example @@ -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' diff --git a/roles/undercloud-deploy/defaults/main.yml b/roles/undercloud-deploy/defaults/main.yml index e8f88c37f..2288e1bf3 100644 --- a/roles/undercloud-deploy/defaults/main.yml +++ b/roles/undercloud-deploy/defaults/main.yml @@ -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 diff --git a/roles/undercloud-deploy/templates/undercloud.conf.j2 b/roles/undercloud-deploy/templates/undercloud.conf.j2 index d89995812..6508031cf 100644 --- a/roles/undercloud-deploy/templates/undercloud.conf.j2 +++ b/roles/undercloud-deploy/templates/undercloud.conf.j2 @@ -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 = +{% endif %} + # DNS domain name to use when deploying the overcloud. The overcloud # parameter "CloudDomain" must be set to a matching value. (string # value)