Merge "Manage system timezone with ansible"

deployment/deprecated/time/timezone-baremetal-puppet.yaml

@@ -2,6 +2,7 @@ heat_template_version: rocky
 
 description: >
   Composable Timezone service
+  This puppet version is deprecated, please use the ansible version.
 
 parameters:
   ServiceData:

deployment/time/timezone-baremetal-ansible.yaml

@@ -0,0 +1,58 @@
+heat_template_version: rocky
+
+description: >
+  Composable Timezone service
+
+parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+  EndpointMap:
+    default: {}
+    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 the overcloud.
+    type: string
+
+outputs:
+  role_data:
+    description: Timezone role using composable services.
+    value:
+      service_name: timezone
+      host_prep_tasks:
+        - name: Set timezone fact
+          set_fact:
+            timezone: {get_param: TimeZone}
+        - name: "Set timezone to {{ timezone | default('UTC') }}"
+          timezone:
+            name: "{{ timezone }}"
+          register: timezone_result
+        - name: Reload services
+          service:
+            name: "{{ item }}"
+            state: reloaded
+          with_items:
+            - rsyslogd
+            - crond
+          when: timezone_result.changed

overcloud-resource-registry-puppet.j2.yaml

@@ -213,7 +213,7 @@ resource_registry:
   OS::TripleO::Services::SwiftRingBuilder: deployment/swift/swift-ringbuilder-container-puppet.yaml
   OS::TripleO::Services::Snmp: deployment/snmp/snmp-baremetal-puppet.yaml
   OS::TripleO::Services::Tacker: OS::Heat::None
-  OS::TripleO::Services::Timezone: deployment/time/timezone-baremetal-puppet.yaml
+  OS::TripleO::Services::Timezone: deployment/time/timezone-baremetal-ansible.yaml
   OS::TripleO::Services::CeilometerAgentCentral: deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
   OS::TripleO::Services::CeilometerAgentIpmi: deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
   OS::TripleO::Services::CeilometerAgentNotification: deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml

releasenotes/notes/timezone-ansible-c7ffcd118f881b82.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Using Ansible timezone module to manage the system timezone for the deployed
+    systems.
+deprecations:
+  - |
+    Managing timezone via puppet is now deprecated.