From cfec2bd933f334b6562ab137c8871b220495c612 Mon Sep 17 00:00:00 2001 From: wangqi Date: Thu, 11 Oct 2018 10:21:16 +0000 Subject: [PATCH] Use Timesync service instead of Ntp At the moment the 'OS::TripleO::Services::Timesync' service is synonymous to 'OS::TripleO::Services::Ntp'. Let's use the more generic Timesync service to pick up the new default in the event the value for 'OS::TripleO::Services::Timesync' changes. This better aligns with the rest of the roles Change-Id: Ib6b54c003a82df32be87da2877d70374445b025d --- doc/source/install/advanced_deployment/custom_roles.rst | 2 +- .../advanced_deployment/routed_spine_leaf_network.rst | 6 +++--- .../install/developer/tht_walkthrough/changes-tht.rst | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/source/install/advanced_deployment/custom_roles.rst b/doc/source/install/advanced_deployment/custom_roles.rst index 5d6f3396..ca70b161 100644 --- a/doc/source/install/advanced_deployment/custom_roles.rst +++ b/doc/source/install/advanced_deployment/custom_roles.rst @@ -92,7 +92,7 @@ cluster:: ServicesDefault: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Timezone - - OS::TripleO::Services::Ntp + - OS::TripleO::Services::Timesync - OS::TripleO::Services::Snmp - OS::TripleO::Services::Kernel - OS::TripleO::Services::Pacemaker diff --git a/doc/source/install/advanced_deployment/routed_spine_leaf_network.rst b/doc/source/install/advanced_deployment/routed_spine_leaf_network.rst index ab9e9f32..48db6725 100644 --- a/doc/source/install/advanced_deployment/routed_spine_leaf_network.rst +++ b/doc/source/install/advanced_deployment/routed_spine_leaf_network.rst @@ -408,7 +408,7 @@ Example ``roles_data``:: - OS::TripleO::Services::NovaPlacement - OS::TripleO::Services::NovaScheduler - OS::TripleO::Services::NovaVncProxy - - OS::TripleO::Services::Ntp + - OS::TripleO::Services::Timesync - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OctaviaApi - OS::TripleO::Services::OctaviaHealthManager @@ -481,7 +481,7 @@ Example ``roles_data``:: - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaMigrationTarget - - OS::TripleO::Services::Ntp + - OS::TripleO::Services::Timesync - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Rhsm @@ -536,7 +536,7 @@ Example ``roles_data``:: - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaMigrationTarget - - OS::TripleO::Services::Ntp + - OS::TripleO::Services::Timesync - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::Rhsm diff --git a/doc/source/install/developer/tht_walkthrough/changes-tht.rst b/doc/source/install/developer/tht_walkthrough/changes-tht.rst index 096f23ce..9cf1799d 100644 --- a/doc/source/install/developer/tht_walkthrough/changes-tht.rst +++ b/doc/source/install/developer/tht_walkthrough/changes-tht.rst @@ -81,7 +81,7 @@ The updated .pp files for the NTP example were: Step 2 - overcloud-resource-registry-puppet.j2.yaml resource registry changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The resource ``OS::TripleO::Services::Ntp`` must be defined in the resource +The resource ``OS::TripleO::Services::Timesync`` must be defined in the resource registry (``overcloud-resource-registry-puppet.j2.yaml``) Create a new resource type alias which references the per-service @@ -89,7 +89,7 @@ heat template file, as described above. By updating the resource registry we are forcing to use a nested template to configure our resources. In the example case the created resource -(OS::TripleO::Services::Ntp), will point to the corresponding service yaml file +(OS::TripleO::Services::Timesync), will point to the corresponding service yaml file (puppet/services/time/ntp.yaml). @@ -114,7 +114,7 @@ From ``roles_data.yaml`` find:: - OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GlanceRegistry ... - - OS::TripleO::Services::Ntp ---> New service deployed in the controller overcloud + - OS::TripleO::Services::Timesync ---> New service deployed in the controller overcloud Update this section with your new service to be deployed to the controllers in