Composable roles within services - NTP - Compute

Add NTP as a composable service for compute nodes.

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

Change-Id: I53958a660830211dee731e0129f4ff018c0cd853

diff --git a/overcloud.yaml b/overcloud.yaml
index c9c46c2..a1a1a31 100644 (file)
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -604,6 +604,7 @@ parameters:
   ComputeServices:
     default:
       - OS::TripleO::Services::NovaCompute
+      - 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 Compute Nodes.
@@ -976,7 +977,6 @@ resources:
           NovaPassword: {get_param: NovaPassword}
           NovaOVSBridge: {get_param: NovaOVSBridge}
           NovaSecurityGroupAPI: {get_param: NovaSecurityGroupAPI}
-          NtpServer: {get_param: NtpServer}
           RabbitHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, RabbitMqNetwork]}]}
           RabbitPassword: {get_param: RabbitPassword}
           RabbitUserName: {get_param: RabbitUserName}

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index d3b1778..7a86325 100644 (file)
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -233,10 +233,6 @@ parameters:
     default: 'neutron'
     description: The full class name of the security API class
     type: string
-  NtpServer:
-    default: ''
-    description: Comma-separated list of ntp servers
-    type: comma_delimited_list
   RabbitHost:
     type: string
     default: ''  # Has to be here because of the ignored empty value bug
@@ -579,7 +575,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}
-                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}
@@ -697,7 +692,6 @@ resources:
         rabbit_password: {get_param: RabbitPassword}
         rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
         rabbit_client_port: {get_param: RabbitClientPort}
-        ntp_servers: {get_param: NtpServer}
         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 30672f2..da84927 100644 (file)
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -20,10 +20,6 @@ create_resources(kmod::load, hiera('kernel_modules'), { })
 create_resources(sysctl::value, hiera('sysctl_settings'), { })
 Exec <| tag == 'kmod::load' |>  -> Sysctl <| |>
 
-if count(hiera('ntp::servers')) > 0 {
-  include ::ntp
-}
-
 include ::timezone
 
 if hiera('step') >= 4 {