From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 6 Sep 2016 08:44:17 +0000 (+0000)
Subject: Merge "Move VIP-related data to AllNodesConfig"
X-Git-Tag: opnfv-6.0.0~1649
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4488b0fdf809413cdd0e6deb92de879224cda383;p=apex-tripleo-heat-templates.git

Merge "Move VIP-related data to AllNodesConfig"
---

4488b0fdf809413cdd0e6deb92de879224cda383
diff --cc puppet/all-nodes-config.yaml
index bc9a2720,86056e42..7aa29b24
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@@ -22,9 -22,12 +22,13 @@@ parameters
      type: comma_delimited_list
    keystone_admin_api_node_ips:
      type: comma_delimited_list
+   NetVipMap:
+     type: json
+   ServiceNetMap:
+     type: json
    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.