Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: f86526e ddfbf35)
Merge "Move VIP-related data to AllNodesConfig"
authorJenkins <jenkins@review.openstack.org>
Tue, 6 Sep 2016 08:44:17 +0000 (08:44 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 6 Sep 2016 08:44:17 +0000 (08:44 +0000)
1  2 
puppet/all-nodes-config.yaml patch | diff1 | diff2 | blob | history

diff --cc puppet/all-nodes-config.yaml
index bc9a272,86056e4..7aa29b2
--- 1/puppet/all-nodes-config.yaml
--- 2/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.