diff options
| author |   Carlos Camacho <ccamacho@redhat.com> | 2016-06-20 09:31:08 +0200 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-06-30 22:54:13 +0000 |
| commit | 6fab74a693b6068c3c4ccc1ff4477e60dff4a0fe (patch) | |
| tree | 3dce0520c300b38d9b4355502326903a62ede8ca /puppet | |
| parent | c5ea6e699ca4ace0673ea30a23cb57d48849ccc6 (diff) | |
Composable Timezone service - ObjectStorage
Add timezone as a composable service
Change-Id: I5bed49e1f8b803fb6d9d0b06165a38f61b132431
Partially-implements: blueprint composable-services-within-roles
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/manifests/overcloud_object.pp | 3 | ||||
| -rw-r--r-- | puppet/swift-storage.yaml | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/puppet/manifests/overcloud_object.pp b/puppet/manifests/overcloud_object.pp index c6b3108b..418c56e6 100644 --- a/puppet/manifests/overcloud_object.pp +++ b/puppet/manifests/overcloud_object.pp @@ -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 { diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml index dc3d2c54..22e2b4a3 100644 --- a/puppet/swift-storage.yaml +++ b/puppet/swift-storage.yaml @@ -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]}]} |