aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Nemec <bnemec@redhat.com>2017-06-26 17:35:24 -0500
committerBen Nemec <bnemec@redhat.com>2017-06-28 11:54:26 -0500
commitccc37ba8613772542ba0de8b9c78d48f38c68ab2 (patch)
treeae734fe257b6c81dd55bf907f5a1c8134415836b
parentbb291c5a9b5a74628c889b76c68f622f7ba31dd6 (diff)
Make CephValidationDelay/Retries default consistent
Also fix one instance of ManagementIpSubnet that was missing a description. Change-Id: I7c5b31d9ef464cefee1dd6ae7ebb9c017cbbd894 Partial-Bug: 1700664
-rw-r--r--network/ports/net_ip_map.yaml1
-rw-r--r--puppet/services/ceph-mon.yaml4
2 files changed, 3 insertions, 2 deletions
diff --git a/network/ports/net_ip_map.yaml b/network/ports/net_ip_map.yaml
index 75818bf..a6971b0 100644
--- a/network/ports/net_ip_map.yaml
+++ b/network/ports/net_ip_map.yaml
@@ -64,6 +64,7 @@ parameters:
ManagementIpSubnet:
default: ''
type: string
+ description: IP address/subnet on the management network
ManagementIpUri:
default: ''
type: string
diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml
index 2855230..cbeef6c 100644
--- a/puppet/services/ceph-mon.yaml
+++ b/puppet/services/ceph-mon.yaml
@@ -69,11 +69,11 @@ parameters:
type: json
CephValidationRetries:
type: number
- default: 5
+ default: 40
description: Number of retry attempts for Ceph validation
CephValidationDelay:
type: number
- default: 10
+ default: 30
description: Interval (in seconds) in between validation checks
MonitoringSubscriptionCephMon:
default: 'overcloud-ceph-mon'