From 1bab553fd591810b242963b394daad6019e78f2a Mon Sep 17 00:00:00 2001
From: Carlos Camacho <ccamacho@redhat.com>
Date: Fri, 17 Jun 2016 09:22:01 +0200
Subject: Composable roles within services - NTP - ObjectStorage

Add NTP as a composable service for ObjectStorage.

Partially-implements: blueprint composable-services-within-roles

Change-Id: I6315abc7955c9dc1df9f211c1c5b7332b5e01d5a
---
 overcloud.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'overcloud.yaml')

diff --git a/overcloud.yaml b/overcloud.yaml
index c9c46c2b..3b4af2ae 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -658,7 +658,8 @@ parameters:
     description: Optional scheduler hints to pass to nova
     default: {}
   ObjectStorageServices:
-    default: []
+    default:
+      - OS::TripleO::Services::Ntp
     description: A list of service resources (configured in the Heat
                  resource_registry) which represent nested stacks
                  for each service that should get installed on the ObjectStorage nodes.
@@ -1065,7 +1066,6 @@ resources:
           Image: {get_param: SwiftStorageImage}
           Replicas: { get_param: SwiftReplicas}
           TimeZone: {get_param: TimeZone}
-          NtpServer: {get_param: NtpServer}
           UpdateIdentifier: {get_param: UpdateIdentifier}
           ServiceNetMap: {get_param: ServiceNetMap}
           Hostname:
-- 
cgit 1.2.3-korg