summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorCarlos Camacho <ccamacho@redhat.com>2016-06-17 09:00:18 +0200
committerCarlos Camacho <ccamacho@redhat.com>2016-06-21 18:45:04 +0200
commit5210355461cbaded0c66fee258245699ec469cdc (patch)
tree9a78282949bd039dfdd59698a2a7a6b96bc1ae1c /puppet
parenta2614491be1cae82e4b04337184b75644633ce3f (diff)
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
Diffstat (limited to 'puppet')
-rw-r--r--puppet/compute.yaml6
-rw-r--r--puppet/manifests/overcloud_compute.pp4
2 files changed, 0 insertions, 10 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index d3b17784..7a863252 100644
--- 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 30672f20..da84927e 100644
--- 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 {