From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 6 Jan 2016 09:04:18 +0000 (+0000)
Subject: Merge "Align template defaults with the client"
X-Git-Tag: opnfv-6.0.0~2238
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6746cb80f32032d2d205ea1a7d15c2f5a06a2843;p=apex-tripleo-heat-templates.git

Merge "Align template defaults with the client"
---

6746cb80f32032d2d205ea1a7d15c2f5a06a2843
diff --cc puppet/controller.yaml
index 8e013400,9b48cf59..0d5443b9
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@@ -80,12 -81,8 +80,12 @@@ parameters
      description: Contains parameters to configure Cinder backends. Typically
                   set via parameter_defaults in the resource registry.
      type: json
 +  CinderWorkers:
 +    default: 0
 +    description: Number of workers for Cinder service.
 +    type: number
    CloudName:
-     default: ''
+     default: overcloud
      description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
      type: string
    ControllerExtraConfig: