From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 5 Sep 2016 12:50:48 +0000 (+0000)
Subject: Merge "Add default for DeployIdentifier in nested templates"
X-Git-Tag: opnfv-6.0.0~1653
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=578c4f9e468266b284d72d07a053aafd79678dd8;p=apex-tripleo-heat-templates.git

Merge "Add default for DeployIdentifier in nested templates"
---

578c4f9e468266b284d72d07a053aafd79678dd8
diff --cc puppet/all-nodes-config.yaml
index 3b966985,ab5ee6d4..bc9a2720
--- a/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.