Skip to content

Commit

Permalink
Timezone support redhat-openstack#344.
Browse files Browse the repository at this point in the history
  • Loading branch information
ioggstream committed May 9, 2017
1 parent 226ddb0 commit 3eb3e3b
Show file tree
Hide file tree
Showing 9 changed files with 63 additions and 0 deletions.
7 changes: 7 additions & 0 deletions bastion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ parameters:
All VMs will be placed in this domain
type: string

timezone:
description: >
The server timezone
type: string
default: 'Etc/UTC'

# Software Subscription information
rhn_username:
description: >
Expand Down Expand Up @@ -267,6 +273,7 @@ resources:
type: OS::Heat::CloudConfig
properties:
cloud_config:
timezone: {get_param: timezone}
hostname: {get_param: hostname}
fqdn:
str_replace:
Expand Down
7 changes: 7 additions & 0 deletions infra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ parameters:
- allowed_pattern: '[a-z0-9\-]*'
description: Hostname must contain only characters [a-z0-9\-].

timezone:
description: >
The server timezone
type: string
default: 'Etc/UTC'

domain_name:
description: >
The DNS domain suffix. All VMs will be placed in this domain
Expand Down Expand Up @@ -316,6 +322,7 @@ resources:
type: OS::Heat::CloudConfig
properties:
cloud_config:
timezone: {get_param: timezone}
hostname: {get_param: hostname}
fqdn:
str_replace:
Expand Down
6 changes: 6 additions & 0 deletions loadbalancer_dedicated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ parameters:
- allowed_pattern: '[a-z0-9\-\.]*'
description: Hostname must contain only characters [a-z0-9\-\.].

timezone:
description: >
The server timezone
type: string
default: 'Etc/UTC'

domain_name:
description: >
All VMs will be placed in this domain
Expand Down
6 changes: 6 additions & 0 deletions loadbalancer_external.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ parameters:
description: Top level stack name.
type: string

timezone:
description: >
The server timezone
type: string
default: 'Etc/UTC'

domain_name:
description: >
All VMs will be placed in this domain
Expand Down
6 changes: 6 additions & 0 deletions loadbalancer_neutron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ parameters:
description: Top level stack name.
type: string

timezone:
description: >
The server timezone
type: string
default: 'Etc/UTC'

domain_name:
description: >
All VMs will be placed in this domain
Expand Down
6 changes: 6 additions & 0 deletions loadbalancer_none.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ parameters:
constraints:
- custom_constraint: nova.flavor

timezone:
description: >
The server timezone
type: string
default: 'Etc/UTC'

hostname:
description: >
The load balancer hostname portion of the FQDN
Expand Down
7 changes: 7 additions & 0 deletions master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ parameters:
- allowed_pattern: '[a-z0-9\-]*'
description: Hostname must contain only characters [a-z0-9\-].

timezone:
description: >
The server timezone
type: string
default: 'Etc/UTC'

domain_name:
description: >
The DNS domain suffix. All VMs will be placed in this domain
Expand Down Expand Up @@ -308,6 +314,7 @@ resources:
type: OS::Heat::CloudConfig
properties:
cloud_config:
timezone: {get_param: timezone}
hostname: {get_param: hostname}
fqdn:
str_replace:
Expand Down
7 changes: 7 additions & 0 deletions node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ parameters:
unique random substring attached
type: string

timezone:
description: >
The server timezone
type: string
default: 'Etc/UTC'

domain_name:
description: >
The DNS domain suffix. All VMs will be placed in this domain
Expand Down Expand Up @@ -419,6 +425,7 @@ resources:
type: OS::Heat::CloudConfig
properties:
cloud_config:
timezone: {get_param: timezone}
hostname:
str_replace:
template: "HOST-SUFFIX"
Expand Down
11 changes: 11 additions & 0 deletions openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,12 @@ parameters:
Number of non-master nodes to create.
default: 1

timezone:
description: >
The server timezone
type: string
default: 'Etc/UTC'

# VM Host naming: root domain and host names
domain_name:
type: string
Expand Down Expand Up @@ -575,6 +581,7 @@ resources:
params:
'%stackname%': {get_param: 'OS::stack_name'}
'%hostname%': {get_param: bastion_hostname}
timezone: {get_param: timezone}
domain_name: {get_param: domain_name}
fixed_network: {get_resource: fixed_network}
fixed_subnet: {get_resource: fixed_subnet}
Expand Down Expand Up @@ -617,6 +624,7 @@ resources:
params:
'%stackname%': {get_param: 'OS::stack_name'}
'%hostname%': {get_param: master_hostname}
timezone: {get_param: timezone}
domain_name: {get_param: domain_name}
ansible_public_key: {get_attr: [ansible_keys, public_key]}
bastion_node: {get_attr: [bastion_host, resource.host]}
Expand Down Expand Up @@ -661,6 +669,7 @@ resources:
params:
'%stackname%': {get_param: 'OS::stack_name'}
'%hostname%': {get_param: infra_hostname}
timezone: {get_param: timezone}
domain_name: {get_param: domain_name}
ansible_public_key: {get_attr: [ansible_keys, public_key]}
bastion_node: {get_attr: [bastion_host, resource.host]}
Expand Down Expand Up @@ -714,6 +723,7 @@ resources:
params:
'%stackname%': {get_param: 'OS::stack_name'}
'%hostname%': {get_param: node_hostname}
timezone: {get_param: timezone}
domain_name: {get_param: domain_name}
app_subdomain: {get_param: app_subdomain}
ansible_public_key: {get_attr: [ansible_keys, public_key]}
Expand Down Expand Up @@ -989,6 +999,7 @@ resources:
rhn_pool: {get_param: rhn_pool}
extra_rhn_pools: {get_param: extra_rhn_pools}
hostname: {get_param: lb_hostname}
timezone: {get_param: timezone}
domain_name: {get_param: domain_name}
app_subdomain: {get_param: app_subdomain}
stack_name: {get_param: 'OS::stack_name'}
Expand Down

0 comments on commit 3eb3e3b

Please sign in to comment.