Composable Timezone service - ObjectStorage
Add timezone as a composable service Change-Id: I5bed49e1f8b803fb6d9d0b06165a38f61b132431 Partially-implements: blueprint composable-services-within-roles
This commit is contained in:
parent
c5ea6e699c
commit
6fab74a693
|
@ -644,6 +644,7 @@ parameters:
|
|||
- OS::TripleO::Services::Ntp
|
||||
- OS::TripleO::Services::SwiftStorage
|
||||
- OS::TripleO::Services::Snmp
|
||||
- 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 ObjectStorage nodes.
|
||||
|
@ -1022,7 +1023,6 @@ resources:
|
|||
PartPower: {get_param: SwiftPartPower}
|
||||
Image: {get_param: SwiftStorageImage}
|
||||
Replicas: { get_param: SwiftReplicas}
|
||||
TimeZone: {get_param: TimeZone}
|
||||
UpdateIdentifier: {get_param: UpdateIdentifier}
|
||||
ServiceNetMap: {get_param: ServiceNetMap}
|
||||
Hostname:
|
||||
|
|
|
@ -20,9 +20,6 @@ if hiera('step') >= 1 {
|
|||
create_resources(kmod::load, hiera('kernel_modules'), {})
|
||||
create_resources(sysctl::value, hiera('sysctl_settings'), {})
|
||||
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
|
||||
|
||||
include ::timezone
|
||||
|
||||
}
|
||||
|
||||
if hiera('step') >= 4 {
|
||||
|
|
|
@ -57,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 Ceph nodes.
|
||||
type: string
|
||||
Hostname:
|
||||
type: string
|
||||
default: '' # Defaults to Heat created hostname
|
||||
|
@ -283,7 +279,6 @@ resources:
|
|||
tripleo::ringbuilder::replicas: {get_input: swift_replicas }
|
||||
swift::storage::all::storage_local_net_ip: {get_input: swift_management_network}
|
||||
tripleo::ringbuilder::min_part_hours: { get_input: swift_min_part_hours }
|
||||
timezone::timezone: {get_input: timezone}
|
||||
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
|
||||
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
|
||||
tripleo::packages::enable_install: {get_input: enable_package_install}
|
||||
|
@ -306,7 +301,6 @@ resources:
|
|||
swift_ring_build: {get_param: RingBuild}
|
||||
swift_part_power: {get_param: PartPower}
|
||||
swift_replicas: { get_param: Replicas}
|
||||
timezone: {get_param: TimeZone}
|
||||
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]}]}
|
||||
|
|
Loading…
Reference in New Issue