Merge "Align template defaults with the client"

diff --cc overcloud.yaml
Simple merge

diff --cc puppet/compute.yaml
Simple merge

diff --cc puppet/controller.yaml
index 8e01340,9b48cf5..0d5443b
--- 1/puppet/controller.yaml
--- 2/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: