summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-14 11:32:58 +0000
committerGerrit Code Review <review@openstack.org>2016-09-14 11:32:58 +0000
commit89f9a3f2e0274169f305a503f642867ef14244e1 (patch)
tree531f99ebd3bd1082c2452881002a95f0b14db75f
parent8fb5d99714397c8e7b4a118ed406a6879be54cac (diff)
parentfa6bafac537779975207dfe12e5781c91173a793 (diff)
Merge "Convert allNodesConfig properties to composable jinja2"
-rw-r--r--overcloud.j2.yaml40
1 files changed, 12 insertions, 28 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 88a91e38..fa160e4d 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -276,29 +276,17 @@ resources:
cloud_name_storage_mgmt: {get_param: CloudNameStorageManagement}
cloud_name_ctlplane: {get_param: CloudNameCtlplane}
hosts:
+{% for role in roles %}
- list_join:
- '\n'
- - {get_attr: [Compute, hosts_entry]}
- - list_join:
- - '\n'
- - {get_attr: [Controller, hosts_entry]}
- - list_join:
- - '\n'
- - {get_attr: [BlockStorage, hosts_entry]}
- - list_join:
- - '\n'
- - {get_attr: [ObjectStorage, hosts_entry]}
- - list_join:
- - '\n'
- - {get_attr: [CephStorage, hosts_entry]}
+ - {get_attr: [{{role.name}}, hosts_entry]}
+{% endfor %}
enabled_services:
list_join:
- ','
- - {get_attr: [ControllerServiceChain, role_data, service_names]}
- - {get_attr: [ComputeServiceChain, role_data, service_names]}
- - {get_attr: [BlockStorageServiceChain, role_data, service_names]}
- - {get_attr: [ObjectStorageServiceChain, role_data, service_names]}
- - {get_attr: [CephStorageServiceChain, role_data, service_names]}
+{% for role in roles %}
+ - {get_attr: [{{role.name}}ServiceChain, role_data, service_names]}
+{% endfor %}
controller_ips: {get_attr: [Controller, ip_address]}
controller_names: {get_attr: [Controller, hostname]}
service_ips:
@@ -310,21 +298,17 @@ resources:
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], [$[0], $[1].flatten()]))
data:
l:
- - {get_attr: [ControllerIpListMap, service_ips]}
- - {get_attr: [ComputeIpListMap, service_ips]}
- - {get_attr: [BlockStorageIpListMap, service_ips]}
- - {get_attr: [ObjectStorageIpListMap, service_ips]}
- - {get_attr: [CephStorageIpListMap, service_ips]}
+{% for role in roles %}
+ - {get_attr: [{{role.name}}IpListMap, service_ips]}
+{% endfor %}
service_node_names:
yaql:
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], [$[0], $[1].flatten()]))
data:
l:
- - {get_attr: [ControllerIpListMap, service_hostnames]}
- - {get_attr: [ComputeIpListMap, service_hostnames]}
- - {get_attr: [BlockStorageIpListMap, service_hostnames]}
- - {get_attr: [ObjectStorageIpListMap, service_hostnames]}
- - {get_attr: [CephStorageIpListMap, service_hostnames]}
+{% for role in roles %}
+ - {get_attr: [{{role.name}}IpListMap, service_hostnames]}
+{% endfor %}
# FIXME(shardy): These require further work to move into service_ips
memcache_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, MemcachedNetwork]}]}
keystone_public_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystonePublicApiNetwork]}]}