Wire NTP and Timezone services into BlockStorage nodes
Change-Id: Ia70688cfc333dc6536b5372cdb2eedb987ab61f8
This commit is contained in:
parent
6fab74a693
commit
30a11c81b1
|
@ -217,11 +217,6 @@ parameters:
|
|||
description: The password for the nova service account, used by nova-api.
|
||||
type: string
|
||||
hidden: true
|
||||
#TODO(ccamacho): Remove after landing Ntp in all roles
|
||||
NtpServer:
|
||||
default: ''
|
||||
description: Comma-separated list of ntp servers
|
||||
type: comma_delimited_list
|
||||
PublicVirtualFixedIPs:
|
||||
default: []
|
||||
description: >
|
||||
|
@ -266,11 +261,6 @@ parameters:
|
|||
Control the IP allocation for the StorageMgmgVirtualInterface port. E.g.
|
||||
[{'ip_address':'1.2.3.4'}]
|
||||
type: json
|
||||
#TODO(ccamacho):Remove after landing composable timezone for all nodes
|
||||
TimeZone:
|
||||
default: 'UTC'
|
||||
description: The timezone to be set on nodes.
|
||||
type: string
|
||||
CloudDomain:
|
||||
default: 'localdomain'
|
||||
type: string
|
||||
|
@ -611,6 +601,8 @@ parameters:
|
|||
BlockStorageServices:
|
||||
default:
|
||||
- OS::TripleO::Services::CinderVolume
|
||||
- OS::TripleO::Services::Ntp
|
||||
- OS::TripleO::Services::Timezone
|
||||
description: A list of service resources (configured in the Heat
|
||||
resource_registry) which represent nested stacks
|
||||
for each service that should get installed on the BlockStorage nodes.
|
||||
|
@ -984,8 +976,6 @@ resources:
|
|||
Image: {get_param: BlockStorageImage}
|
||||
KeyName: {get_param: KeyName}
|
||||
Flavor: {get_param: OvercloudBlockStorageFlavor}
|
||||
TimeZone: {get_param: TimeZone}
|
||||
NtpServer: {get_param: NtpServer}
|
||||
UpdateIdentifier: {get_param: UpdateIdentifier}
|
||||
Hostname:
|
||||
str_replace:
|
||||
|
|
|
@ -35,10 +35,6 @@ parameters:
|
|||
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
|
||||
type: string
|
||||
hidden: true
|
||||
NtpServer:
|
||||
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
|
||||
|
@ -61,10 +57,6 @@ parameters:
|
|||
description: Mapping of service_name -> network name. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
TimeZone:
|
||||
default: 'UTC'
|
||||
description: The timezone to be set on Cinder nodes.
|
||||
type: string
|
||||
NetworkDeploymentActions:
|
||||
type: comma_delimited_list
|
||||
description: >
|
||||
|
@ -239,8 +231,6 @@ resources:
|
|||
template: "'IP'"
|
||||
params:
|
||||
IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
|
||||
ntp_servers: {get_param: NtpServer}
|
||||
timezone: {get_param: TimeZone}
|
||||
enable_package_install: {get_param: EnablePackageInstall}
|
||||
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
|
||||
|
||||
|
@ -282,8 +272,6 @@ resources:
|
|||
mapped_data:
|
||||
# Cinder
|
||||
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_ip_address: {get_input: cinder_iscsi_ip_address}
|
||||
ntp::servers: {get_input: ntp_servers}
|
||||
timezone::timezone: {get_input: timezone}
|
||||
tripleo::packages::enable_install: {get_input: enable_package_install}
|
||||
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
|
||||
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
|
||||
|
|
|
@ -22,12 +22,6 @@ if hiera('step') >= 1 {
|
|||
create_resources(sysctl::value, hiera('sysctl_settings'), {})
|
||||
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
|
||||
|
||||
include ::timezone
|
||||
|
||||
if count(hiera('ntp::servers')) > 0 {
|
||||
include ::ntp
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if hiera('step') >= 4 {
|
||||
|
|
Loading…
Reference in New Issue