summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-07-05 17:48:28 +0100
committerSteven Hardy <shardy@redhat.com>2016-07-05 17:48:28 +0100
commitfe1f8a8c8644a2c27ee587a67fb4a738fd420dcf (patch)
tree4df28b11d5ed635037345e14286afeafa05479a8
parent7ff66b9af1b755e3613e1f13274eef498eff1942 (diff)
Convert AllNodesExtraConfig to OS::Heat::None
Instead of creating a nested stack, as it's slightly lower overhead and will make things easier when adding custom roles (where a hard-coded default template can't work) Change-Id: If9f8294ba477d1c1364e19a52152905a2c02e959
-rw-r--r--extraconfig/all_nodes/default.yaml25
-rw-r--r--overcloud-resource-registry-puppet.yaml3
2 files changed, 2 insertions, 26 deletions
diff --git a/extraconfig/all_nodes/default.yaml b/extraconfig/all_nodes/default.yaml
deleted file mode 100644
index b210588f..00000000
--- a/extraconfig/all_nodes/default.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
- Noop extra config for allnodes extra cluster config
-
-# Parameters passed from the parent template - note if you maintain
-# out-of-tree templates they may require additional parameters if the
-# in-tree templates add a new role.
-parameters:
- controller_servers:
- type: json
- compute_servers:
- type: json
- blockstorage_servers:
- type: json
- objectstorage_servers:
- type: json
- cephstorage_servers:
- type: json
-# Note extra parameters can be defined, then passed data via the
-# environment parameter_defaults, without modifying the parent template
-
-#outputs:
- # Outputs can be passed here and inspected via heat, but they are not
- # consumed by the parent template
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 1ef3660f..37e66f53 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -50,7 +50,8 @@ resource_registry:
# phase, e.g when puppet is applied, but after the pre_deploy phase. Useful when
# configuration with knowledge of all nodes in the cluster is required vs single
# node configuration in the pre_deploy step.
- OS::TripleO::AllNodesExtraConfig: extraconfig/all_nodes/default.yaml
+ # See extraconfig/all_nodes/* for examples
+ OS::TripleO::AllNodesExtraConfig: OS::Heat::None
# TripleO overcloud networks
OS::TripleO::Network: network/networks.yaml