Composable Timezone service - Compute

Add timezone as a composable service

Change-Id: I6e0e9cef3703cd186eab15d76e611d00c1da4a4e
Partially-implements: blueprint composable-services-within-roles

diff --git a/overcloud.yaml b/overcloud.yaml
index 62dfb94..10a3cf0 100644 (file)
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -576,6 +576,7 @@ parameters:
 
   ComputeServices:
     default:
+      - OS::TripleO::Services::Timezone
       - OS::TripleO::Services::NovaCompute
       - OS::TripleO::Services::Ntp
       - OS::TripleO::Services::Snmp
@@ -950,7 +951,6 @@ resources:
           RabbitClientUseSSL: {get_param: RabbitClientUseSSL}
           RabbitClientPort: {get_param: RabbitClientPort}
           ServiceNetMap: {get_param: ServiceNetMap}
-          TimeZone: {get_param: TimeZone}
           EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
           UpdateIdentifier: {get_param: UpdateIdentifier}
           Hostname:

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 1bc0e0f..3730faf 100644 (file)
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -272,10 +272,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  TimeZone:
-    default: 'UTC'
-    description: The timezone to be set on compute nodes.
-    type: string
   UpdateIdentifier:
     default: ''
     type: string
@@ -565,7 +561,6 @@ resources:
                 neutron::plugins::ml2::mechanism_drivers: {get_input: neutron_mechanism_drivers}
                 keystone_public_api_virtual_ip: {get_input: keystone_vip}
                 admin_password: {get_input: admin_password}
-                timezone::timezone: {get_input: timezone}
                 tripleo::packages::enable_install: {get_input: enable_package_install}
                 tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
 
@@ -680,7 +675,6 @@ resources:
         rabbit_password: {get_param: RabbitPassword}
         rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
         rabbit_client_port: {get_param: RabbitClientPort}
-        timezone: {get_param: TimeZone}
         enable_package_install: {get_param: EnablePackageInstall}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
 

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index bb9af46..af04d65 100644 (file)
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -20,8 +20,6 @@ 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 {
 
   file { ['/etc/libvirt/qemu/networks/autostart/default.xml',