summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-03 12:16:29 +0000
committerGerrit Code Review <review@openstack.org>2017-07-03 12:16:29 +0000
commit92af39f6f22aa6ee64daa11bc6e6d5e08cdd4b19 (patch)
treed157b10cd7e49f9203dc4de077ac749e8f9559bf
parentb87d4e1a1245dc1be512e0c7c38e052fff0c5b8b (diff)
parentafbbbdc894da2f9ce18d62fd457b2077745b4b3b (diff)
Merge "Add ServerIdMap output"
-rw-r--r--overcloud.j2.yaml18
1 files changed, 18 insertions, 0 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 1848e09a..56a10a52 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -462,6 +462,21 @@ resources:
servers: {get_attr: [{{role.name}}, attributes, nova_server_resource]}
{% endfor %}
+ # This is a different format to *Servers, as it creates a map of lists
+ # whereas *Servers creates a map of maps with keys of the nested resource names
+ ServerIdMap:
+ type: OS::Heat::Value
+ properties:
+ value:
+ server_ids:
+{% for role in roles %}
+ {{role.name}}: {get_attr: [{{role.name}}, nova_server_resource]}
+{% endfor %}
+ bootstrap_server_id:
+ yaql:
+ expression: coalesce($.data, []).first(null)
+ data: {get_attr: [{{primary_role_name}}, nova_server_resource]}
+
# This resource just creates a dict out of the DeploymentServerBlacklist,
# which is a list. The dict is used in the role templates to set a condition
# on whether to create the deployment resources. We can't use the list
@@ -825,3 +840,6 @@ outputs:
map_merge:
- {get_attr: [VipMap, net_ip_map]}
- redis: {get_attr: [RedisVirtualIP, ip_address]}
+ ServerIdData:
+ description: Mapping of each role to a list of nova server IDs and the bootstrap ID
+ value: {get_attr: [ServerIdMap, value]}