Merge "Remove unsafe "unset" defaults"

diff --cc overcloud.yaml
index 416b9d5,e91c777..442ce81
--- 1/overcloud.yaml
--- 2/overcloud.yaml
+++ b/overcloud.yaml
@@@ -135,10 -132,9 +132,9 @@@ parameters
        'datacentre' to permit external network creation.
    NeutronNetworkType:
      default: 'vxlan'
 -    description: The tenant network type for Neutron, either gre or vxlan.
 -    type: string
 +    description: The tenant network type for Neutron.
 +    type: comma_delimited_list
    NeutronPassword:
-     default: unset
      description: The password for the neutron service account, used by neutron agents.
      type: string
      hidden: true

diff --cc puppet/cinder-storage.yaml
Simple merge

diff --cc puppet/compute.yaml
Simple merge

diff --cc puppet/controller.yaml
index f7c2897,5906f92..982ab6d
--- 1/puppet/controller.yaml
--- 2/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@@ -226,12 -203,7 +220,11 @@@ parameters
      default: /dev/log
      description: Syslog address where HAproxy will send its log
      type: string
 +  GlanceWorkers:
 +    default: 0
 +    description: Number of workers for Glance service.
 +    type: number
    HeatPassword:
-     default: unset
      description: The password for the Heat service and db account, used by the Heat services.
      type: string
      hidden: true
@@@ -508,12 -471,7 +498,11 @@@
    NovaApiVirtualIP:
      type: string
      default: ''
 +  NeutronWorkers:
 +    default: 0
 +    description: Number of workers for Neutron service.
 +    type: number
    NovaPassword:
-     default: unset
      description: The password for the nova service and db account, used by nova-api.
      type: string
      hidden: true

diff --cc puppet/swift-storage.yaml
Simple merge