aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud.yaml
AgeCommit message (Collapse)AuthorFilesLines
2015-12-10Set the name property for all deployment resourcesSteve Baker1-0/+18
There are two reasons the name property should always be set for deployment resources: - The name often shows up in logs, files and API calls, the default derived name is long and unhelpful - Sorting by name determines the merge order of os-apply-config, and the execution order of puppet/shell scripts (note this is different to resource dependency order) so leaving the default name results in an undetermined order which could lead to unpredictable deployment of configs This change simply sets the name to the resource name, but a future change should prepend each name with a run-parts style 2 digit prefix so that the order is explicitly stated. Documentation for extraconfig needs to clearly state what prefix is needed to override which merge/execution order. For existing overcloud stacks, heat currently replaces deployment resources when the name changes, so this change Depends-On: I95037191915ccd32b2efb72203b146897a4edbc9 Change-Id: Ic4bcd56aa65b981275c3d4214588bfc4de63b3b0
2015-12-07Merge "Making nova parameters configurable for nuage-metadata-agent"Jenkins1-0/+5
2015-12-04Making nova parameters configurable for nuage-metadata-agentRohit Pagedar1-0/+5
Exposing 'instance_name_template' to be set via extra config for nuage-metadata-agent to function Making nova::api::admin_tenant_name available on the compute node which is required by nuage-metadata-agent service Making KeystonePublicApiVirtualIP available on the compute node, which is used by the nuage-metadata-agent to build the auth-url Change-Id: I9736015e18cebf32b07940bf559063b60085f2fb
2015-12-04Add option to add metadata for the overcloud nodesJuan Antonio Osorio Robles1-0/+11
Some Nova hooks might require custom properties/metadata set for the servers deployed in the overcloud, and this would enable us to inject such information. For FreeIPA (IdM) integration, there is effectively a Nova hook that requires such data. Currently this inserts metadata for all servers, but a subsequent CR will introduce per-role metadata. However, that was not added to this because it will require the usage of map_merge. which will block those changes to be backported. However, this one is not a problem in that sense. Change-Id: I98b15406525eda8dff704360d443590260430ff0
2015-12-03Rename overcloud-without-mergepy to overcloud.Dan Prince1-0/+1498
Mergepy is gone. We can now rename our primary overcloud template to be more sensible. Change-Id: I14f5ff78b083b34590d30357df94c42ff6a0c2c0