aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-13 13:55:35 +0000
committerGerrit Code Review <review@openstack.org>2017-07-13 13:55:36 +0000
commit18c86b0a0d8319d2b89f94af4a9d235f659cb796 (patch)
treec8dc427415a93689f8f486ba360c5d012168a501
parent5b2395a2ed7c5eb0b4f1b5c01467a6c5c095867b (diff)
parentccc37ba8613772542ba0de8b9c78d48f38c68ab2 (diff)
Merge "Make CephValidationDelay/Retries default consistent"
-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'