From: Ben Nemec <bnemec@redhat.com>
Date: Mon, 26 Jun 2017 22:35:24 +0000 (-0500)
Subject: Make CephValidationDelay/Retries default consistent
X-Git-Tag: opnfv-6.0.0~404^2~2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ccc37ba8613772542ba0de8b9c78d48f38c68ab2;p=apex-tripleo-heat-templates.git

Make CephValidationDelay/Retries default consistent

Also fix one instance of ManagementIpSubnet that was missing a
description.

Change-Id: I7c5b31d9ef464cefee1dd6ae7ebb9c017cbbd894
Partial-Bug: 1700664
---

diff --git a/network/ports/net_ip_map.yaml b/network/ports/net_ip_map.yaml
index 75818bf0..a6971b0f 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 28552301..cbeef6c5 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'