aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
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 /puppet
parent38ef8b83b30d4fdc9084f43dd85e6098388cec5b (diff)
parent0ac7163737bd4d49c3986cd5d064435ea48dec42 (diff)
Merge "Fix some missed hard-coded network references" into stable/pike
Diffstat (limited to 'puppet')
-rw-r--r--puppet/all-nodes-config.j2.yaml (renamed from puppet/all-nodes-config.yaml)38
1 files changed, 8 insertions, 30 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.j2.yaml
index 37c1d4e5..bdd2bcf3 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.j2.yaml
@@ -2,14 +2,10 @@ heat_template_version: pike
description: 'All Nodes Config for Puppet'
parameters:
- cloud_name_external:
- type: string
- cloud_name_internal_api:
- type: string
- cloud_name_storage:
- type: string
- cloud_name_storage_mgmt:
+{%- for network in networks if network.vip|default(false) %}
+ cloud_name_{{network.name_lower}}:
type: string
+{%- endfor %}
cloud_name_ctlplane:
type: string
enabled_services:
@@ -70,30 +66,12 @@ parameters:
type: boolean
default: false
- InternalApiNetName:
- default: internal_api
- description: The name of the internal_api 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.
+{%- for network in networks %}
+ {{network.name}}NetName:
+ default: {{network.name_lower}}
+ description: The name of the {{network.name_lower}} network.
type: string
+{%- endfor %}
resources: