diff options
author | Steven Hardy <shardy@redhat.com> | 2017-10-02 18:09:21 +0100 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2017-10-11 18:00:56 +0000 |
commit | 0ac7163737bd4d49c3986cd5d064435ea48dec42 (patch) | |
tree | 3586699f3fb3e91b0f4c3b89abb3e835c37e7cba /puppet | |
parent | 94e8238d6b61811d705b653ffb36d1aea624d015 (diff) |
Fix some missed hard-coded network references
These got missed in the refactoring to support composable networks.
Change-Id: I5c97df08ae84e9c383175687428fb00143d171ff
Closes-Bug: #1720849
(cherry picked from commit ef1768e40c3a6c58a22381a4546772f571bee5cc)
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: |