openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Allow a user to specify a comma separated list of ntp servers"

Browse Source
This commit is contained in:
Jenkins 2015-11-11 10:44:05 +00:00 committed by Gerrit Code Review
commit 7961f61a41
6 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
overcloud-without-mergepy.yaml
View File

@ -231,8 +231,9 @@ parameters:
type: string
hidden: true
NtpServer:
type: string
default: ''
description: Comma-separated list of ntp servers
type: comma_delimited_list
MongoDbNoJournal:
default: false
description: Should MongoDb journaling be disabled

9
puppet/ceph-storage.yaml
View File

@ -22,8 +22,9 @@ parameters:
constraints:
- custom_constraint: nova.keypair
NtpServer:
type: string
default: ''
description: Comma-separated list of ntp servers
type: comma_delimited_list
EnablePackageInstall:
default: 'false'
description: Set to true to enable package installation via Puppet
@ -133,11 +134,7 @@ resources:
config: {get_resource: CephStorageConfig}
server: {get_resource: CephStorage}
input_values:
ntp_servers:
str_replace:
template: '["server"]'
params:
server: {get_param: NtpServer}
ntp_servers: {get_param: NtpServer}
enable_package_install: {get_param: EnablePackageInstall}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
ceph_cluster_network: {get_attr: [NetIpSubnetMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}

9
puppet/cinder-storage.yaml
View File

@ -83,8 +83,9 @@ parameters:
type: string
hidden: true
NtpServer:
type: string
default: ''
description: Comma-separated list of ntp servers
type: comma_delimited_list
EnablePackageInstall:
default: 'false'
description: Set to true to enable package installation via Puppet
@ -212,11 +213,7 @@ resources:
rabbit_password: {get_param: RabbitPassword}
rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
rabbit_client_port: {get_param: RabbitClientPort}
ntp_servers:
str_replace:
template: '["server"]'
params:
server: {get_param: NtpServer}
ntp_servers: {get_param: NtpServer}
enable_package_install: {get_param: EnablePackageInstall}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}

9
puppet/compute.yaml
View File

@ -219,8 +219,9 @@ parameters:
type: string
default: '' # Has to be here because of the ignored empty value bug
NtpServer:
type: string
default: ''
description: Comma-separated list of ntp servers
type: comma_delimited_list
RabbitHost:
type: string
default: '' # Has to be here because of the ignored empty value bug
@ -547,11 +548,7 @@ resources:
rabbit_password: {get_param: RabbitPassword}
rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
rabbit_client_port: {get_param: RabbitClientPort}
ntp_servers:
str_replace:
template: '["server"]'
params:
server: {get_param: NtpServer}
ntp_servers: {get_param: NtpServer}
enable_package_install: {get_param: EnablePackageInstall}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}

9
puppet/controller.yaml
View File

@ -458,8 +458,9 @@ parameters:
description: Should MongoDb journaling be disabled
type: boolean
NtpServer:
type: string
default: ''
description: Comma-separated list of ntp servers
type: comma_delimited_list
PcsdPassword:
type: string
description: The password for the 'pcsd' user.
@ -967,11 +968,7 @@ resources:
template: "'LIMIT'"
params:
LIMIT: {get_param: RabbitFDLimit}
ntp_servers:
str_replace:
template: '["server"]'
params:
server: {get_param: NtpServer}
ntp_servers: {get_param: NtpServer}
control_virtual_interface: {get_param: ControlVirtualInterface}
public_virtual_interface: {get_param: PublicVirtualInterface}
swift_hash_suffix: {get_param: SwiftHashSuffix}

9
puppet/swift-storage.yaml
View File

@ -45,8 +45,9 @@ parameters:
type: string
hidden: true
NtpServer:
type: string
default: ''
description: Comma-separated list of ntp servers
type: comma_delimited_list
EnablePackageInstall:
default: 'false'
description: Set to true to enable package installation via Puppet
@ -207,11 +208,7 @@ resources:
swift_min_part_hours: {get_param: MinPartHours}
swift_part_power: {get_param: PartPower}
swift_replicas: { get_param: Replicas}
ntp_servers:
str_replace:
template: '["server"]'
params:
server: {get_param: NtpServer}
ntp_servers: {get_param: NtpServer}
enable_package_install: {get_param: EnablePackageInstall}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}