From: Dan Prince <dprince@redhat.com>
Date: Sun, 11 Jan 2015 03:04:42 +0000 (-0500)
Subject: Swift: set default replicas to 3
X-Git-Tag: opnfv-6.0.0~2682
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=25b35cb71174c1db971e2f80b693d1be2e502d4e;p=apex-tripleo-heat-templates.git

Swift: set default replicas to 3

Our existing default (replicas == 1) means that no data
(or copies) is being replicated in a multi-node Swift
environment. This seems like a bad production default
setting and could easily slip by if not set.

Setting it to 3 shouldn't hurt anything and seems to follow
suit with what several production installers (based around Puppet)
actually use. If using an installation with less than 3 swift
nodes I believe swift will do its best, and still work fine.

FWIW I noticed this when testing a multi-node Puppet swift
installation and was surprised when I didn't see any *data
files getting replicated across the storage cluster.

Change-Id: I44bdfff7aae6bdf845b79ca1f8f450c22113caed
---

diff --git a/controller-puppet.yaml b/controller-puppet.yaml
index de1d9dcd..c5462ff7 100644
--- a/controller-puppet.yaml
+++ b/controller-puppet.yaml
@@ -368,7 +368,7 @@ parameters:
     type: string
   SwiftReplicas:
     type: number
-    default: 1
+    default: 3
     description: How many replicas to use in the swift rings.
   VirtualIP:
     type: string
diff --git a/controller.yaml b/controller.yaml
index 4ab62d5d..a5ebab4f 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -368,7 +368,7 @@ parameters:
     type: string
   SwiftReplicas:
     type: number
-    default: 1
+    default: 3
     description: How many replicas to use in the swift rings.
   VirtualIP:
     type: string
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index e24c3a57..80fd2024 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -388,7 +388,7 @@ parameters:
     type: number
   SwiftReplicas:
     type: number
-    default: 1
+    default: 3
     description: How many replicas to use in the swift rings.
 
 # Compute-specific params
diff --git a/swift-deploy.yaml b/swift-deploy.yaml
index 1e15511f..d4d32cbd 100644
--- a/swift-deploy.yaml
+++ b/swift-deploy.yaml
@@ -24,7 +24,7 @@ parameters:
     hidden: true
   SwiftReplicas:
     type: number
-    default: 1
+    default: 3
     description: How many replicas to use in the swift rings.
 resources:
   controller0Swift:
diff --git a/swift-storage-puppet.yaml b/swift-storage-puppet.yaml
index 38183bba..ba32a81e 100644
--- a/swift-storage-puppet.yaml
+++ b/swift-storage-puppet.yaml
@@ -33,7 +33,7 @@ parameters:
     type: number
   Replicas:
     type: number
-    default: 1
+    default: 3
     description: How many replicas to use in the swift rings.
   SnmpdReadonlyUserName:
     default: ro_snmp_user
diff --git a/swift-storage.yaml b/swift-storage.yaml
index 076d4bcb..42a78666 100644
--- a/swift-storage.yaml
+++ b/swift-storage.yaml
@@ -71,7 +71,7 @@ parameters:
     type: number
   Replicas:
     type: number
-    default: 1
+    default: 3
     description: How many replicas to use in the swift rings.
   SnmpdReadonlyUserName:
     default: ro_snmp_user