Composable roles within services - NTP - CephStorage

Add NTP as a composable service for CephStorage.

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

Change-Id: Iee89b261b3c45f596ad84549e25d47b8ca1cfbdb

diff --git a/overcloud.yaml b/overcloud.yaml
index c9c46c2..0db7498 100644 (file)
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -690,7 +690,8 @@ parameters:
     description: Optional scheduler hints to pass to nova
     default: {}
   CephStorageServices:
-    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 CephStorage nodes.
@@ -1099,7 +1100,6 @@ resources:
           Image: {get_param: CephStorageImage}
           KeyName: {get_param: KeyName}
           Flavor: {get_param: OvercloudCephStorageFlavor}
-          NtpServer: {get_param: NtpServer}
           ServiceNetMap: {get_param: ServiceNetMap}
           TimeZone: {get_param: TimeZone}
           UpdateIdentifier: {get_param: UpdateIdentifier}

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index eedb35e..7a71ea8 100644 (file)
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -21,10 +21,6 @@ parameters:
     default: default
     constraints:
       - custom_constraint: nova.keypair
-  NtpServer:
-    default: ''
-    description: Comma-separated list of ntp servers
-    type: comma_delimited_list
   EnablePackageInstall:
     default: 'false'
     description: Set to true to enable package installation via Puppet
@@ -232,7 +228,6 @@ resources:
       config: {get_resource: CephStorageConfig}
       server: {get_resource: CephStorage}
       input_values:
-        ntp_servers: {get_param: NtpServer}
         timezone: {get_param: TimeZone}
         enable_package_install: {get_param: EnablePackageInstall}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
@@ -274,7 +269,6 @@ resources:
             ceph:
               raw_data: {get_file: hieradata/ceph.yaml}
               mapped_data:
-                ntp::servers: {get_input: ntp_servers}
                 timezone::timezone: {get_input: timezone}
                 tripleo::packages::enable_install: {get_input: enable_package_install}
                 tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}

diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp
index 4add2f0..e69353b 100644 (file)
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -23,10 +23,7 @@ if hiera('step') >= 1 {
   Exec <| tag == 'kmod::load' |>  -> Sysctl <| |>
 
   include ::timezone
-
-  if count(hiera('ntp::servers')) > 0 {
-    include ::ntp
-  }
+  
 }
 
 if hiera('step') >= 3 {