Composable Timezone service - CephStorage
Add timezone as a composable service Change-Id: I1569b2ebdca8e67c0e92a5c0e3fadd12006cc02a Partially-implements: blueprint composable-services-within-roles
This commit is contained in:
parent
2cc01b9d98
commit
c5ea6e699c
|
@ -677,6 +677,7 @@ parameters:
|
|||
CephStorageServices:
|
||||
default:
|
||||
- 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 CephStorage nodes.
|
||||
|
@ -1056,7 +1057,6 @@ resources:
|
|||
KeyName: {get_param: KeyName}
|
||||
Flavor: {get_param: OvercloudCephStorageFlavor}
|
||||
ServiceNetMap: {get_param: ServiceNetMap}
|
||||
TimeZone: {get_param: TimeZone}
|
||||
UpdateIdentifier: {get_param: UpdateIdentifier}
|
||||
Hostname:
|
||||
str_replace:
|
||||
|
|
|
@ -30,10 +30,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 Ceph nodes.
|
||||
type: string
|
||||
UpdateIdentifier:
|
||||
default: ''
|
||||
type: string
|
||||
|
@ -228,7 +224,6 @@ resources:
|
|||
config: {get_resource: CephStorageConfig}
|
||||
server: {get_resource: CephStorage}
|
||||
input_values:
|
||||
timezone: {get_param: TimeZone}
|
||||
enable_package_install: {get_param: EnablePackageInstall}
|
||||
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
|
||||
ceph_cluster_network: {get_attr: [NetIpMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
|
||||
|
@ -269,7 +264,6 @@ resources:
|
|||
ceph:
|
||||
raw_data: {get_file: hieradata/ceph.yaml}
|
||||
mapped_data:
|
||||
timezone::timezone: {get_input: timezone}
|
||||
tripleo::packages::enable_install: {get_input: enable_package_install}
|
||||
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
|
||||
ceph::profile::params::cluster_network: {get_input: ceph_cluster_network}
|
||||
|
|
|
@ -22,8 +22,6 @@ if hiera('step') >= 1 {
|
|||
create_resources(sysctl::value, hiera('sysctl_settings'), {})
|
||||
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
|
||||
|
||||
include ::timezone
|
||||
|
||||
}
|
||||
|
||||
if hiera('step') >= 3 {
|
||||
|
|
Loading…
Reference in New Issue