summaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-10-19 04:54:09 +0000
committerGerrit Code Review <review@openstack.org>2017-10-19 04:54:09 +0000
commitf5cdf0a9fb6ea28c617e97a5060f2ecfc5b02729 (patch)
tree36cb6c2b58179c8c763e226f151de8b7adf932ce /network
parent38ef8b83b30d4fdc9084f43dd85e6098388cec5b (diff)
parent0ac7163737bd4d49c3986cd5d064435ea48dec42 (diff)
Merge "Fix some missed hard-coded network references" into stable/pike
Diffstat (limited to 'network')
-rw-r--r--network/service_net_map.j2.yaml38
1 files changed, 8 insertions, 30 deletions
diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml
index e19ccd84..dfb0e910 100644
--- a/network/service_net_map.j2.yaml
+++ b/network/service_net_map.j2.yaml
@@ -103,31 +103,12 @@ parameters:
internal use only, this will be removed in future.
type: json
- InternalApiNetName:
- default: internal_api
- description: The name of the internal_api network.
+{%- for network in networks %}
+ {{network.name}}NetName:
+ default: {{network.name_lower}}
+ description: The name of the {{network.name_lower}} network.
type: string
- ExternalNetName:
- default: external
- description: The name of the external network.
- type: string
- ManagementNetName:
- default: management
- description: The name of the management network.
- type: string
- StorageNetName:
- default: storage
- description: The name of the storage network.
- type: string
- StorageMgmtNetName:
- default: storage_mgmt
- description: The name of the storage_mgmt network.
- type: string
- TenantNetName:
- default: tenant
- description: The name of the tenant network.
- type: string
-
+{%- endfor %}
parameter_groups:
- label: deprecated
@@ -145,12 +126,9 @@ resources:
- map_replace:
- {get_param: ServiceNetMapDefaults}
- values:
- external: {get_param: ExternalNetName}
- internal_api: {get_param: InternalApiNetName}
- storage: {get_param: StorageNetName}
- storage_mgmt: {get_param: StorageMgmtNetName}
- tenant: {get_param: TenantNetName}
- management: {get_param: ManagementNetName}
+{%- for network in networks %}
+ {{network.name_lower}}: {get_param: {{network.name}}NetName}
+{%- endfor %}
- map_replace:
- {get_param: ServiceNetMap}
- keys: {get_param: ServiceNetMapDeprecatedMapping}