aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorCarlos Camacho <ccamacho@redhat.com>2016-06-17 09:22:01 +0200
committerCarlos Camacho <ccamacho@redhat.com>2016-06-21 18:46:42 +0200
commit1bab553fd591810b242963b394daad6019e78f2a (patch)
tree755159d504b67c7a1a74065b2f7eac450285a855 /puppet
parenta2614491be1cae82e4b04337184b75644633ce3f (diff)
Composable roles within services - NTP - ObjectStorage
Add NTP as a composable service for ObjectStorage. Partially-implements: blueprint composable-services-within-roles Change-Id: I6315abc7955c9dc1df9f211c1c5b7332b5e01d5a
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/overcloud_object.pp3
-rw-r--r--puppet/swift-storage.yaml6
2 files changed, 0 insertions, 9 deletions
diff --git a/puppet/manifests/overcloud_object.pp b/puppet/manifests/overcloud_object.pp
index 3585c993..4fca8f5f 100644
--- a/puppet/manifests/overcloud_object.pp
+++ b/puppet/manifests/overcloud_object.pp
@@ -23,9 +23,6 @@ if hiera('step') >= 1 {
include ::timezone
- if count(hiera('ntp::servers')) > 0 {
- include ::ntp
- }
}
if hiera('step') >= 4 {
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index ed52f928..30f7657b 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -46,10 +46,6 @@ parameters:
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
hidden: true
- 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
@@ -292,7 +288,6 @@ resources:
swift::storage::all::storage_local_net_ip: {get_input: swift_management_network}
swift_mount_check: {get_input: swift_mount_check }
tripleo::ringbuilder::min_part_hours: { get_input: swift_min_part_hours }
- ntp::servers: {get_input: ntp_servers}
timezone::timezone: {get_input: timezone}
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
@@ -317,7 +312,6 @@ resources:
swift_ring_build: {get_param: RingBuild}
swift_part_power: {get_param: PartPower}
swift_replicas: { get_param: Replicas}
- ntp_servers: {get_param: NtpServer}
timezone: {get_param: TimeZone}
enable_package_install: {get_param: EnablePackageInstall}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}