Merge "Add default for DeployIdentifier in nested templates"

diff --cc puppet/all-nodes-config.yaml
index 3b96698,ab5ee6d..bc9a272
--- 1/puppet/all-nodes-config.yaml
--- 2/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@@ -22,8 -22,11 +22,9 @@@ parameters
      type: comma_delimited_list
    keystone_admin_api_node_ips:
      type: comma_delimited_list
 -  ceph_mon_node_names:
 -    type: comma_delimited_list
    DeployIdentifier:
      type: string
+     default: ''
      description: >
        Setting this to a unique value will re-run any deployment tasks which
        perform configuration on a Heat stack-update.