diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-07 09:44:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-07 09:44:20 +0000 |
| commit | 4d876bffabb6cabd07b293cbe001d7982a0ecf69 (patch) | |
| tree | 10fc69d2a57cdac81d31b749b464f12b11175a67 | |
| parent | 294c81c0b1cd7fa2a28114f3450bc014b3127489 (diff) | |
| parent | fe1f8a8c8644a2c27ee587a67fb4a738fd420dcf (diff) | |
Merge "Convert AllNodesExtraConfig to OS::Heat::None"
| -rw-r--r-- | extraconfig/all_nodes/default.yaml | 25 | ||||
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 3 |
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 b4dc57a5..8ec2a792 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 |