diff options
| author |   Carlos Camacho <ccamacho@redhat.com> | 2016-06-20 09:26:03 +0200 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-06-30 22:54:07 +0000 |
| commit | c5ea6e699ca4ace0673ea30a23cb57d48849ccc6 (patch) | |
| tree | c5ce3c59f7e4acf25dedbd9557d8fc2fcdbba24d /puppet | |
| parent | 2cc01b9d985a8a5518dc6364307d205f804e350e (diff) | |
Composable Timezone service - CephStorage
Add timezone as a composable service
Change-Id: I1569b2ebdca8e67c0e92a5c0e3fadd12006cc02a
Partially-implements: blueprint composable-services-within-roles
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/ceph-storage.yaml | 6 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_cephstorage.pp | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index 7a71ea80..28493964 100644 --- a/puppet/ceph-storage.yaml +++ b/puppet/ceph-storage.yaml @@ -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} diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp index 31d14e7d..2169002e 100644 --- a/puppet/manifests/overcloud_cephstorage.pp +++ b/puppet/manifests/overcloud_cephstorage.pp @@ -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 { |