diff options
| author |   Dan Sneddon <dsneddon@redhat.com> | 2017-08-15 11:39:53 -0700 |
|---|---|---|
| committer |   Steven Hardy <shardy@redhat.com> | 2017-08-16 13:30:54 +0100 |
| commit | e148ac870b4058d70822ac3df4d1fe512cd44303 (patch) | |
| tree | eddcd570e41ef00d3aea34e3cbdd35bcd604ef0a /network/config/bond-with-vlans/controller-v6.yaml | |
| parent | b32d1c145b48d24c237d5a16911c6bd6d6025d83 (diff) | |
Render IP map and host maps according to network_data.yaml
This change renders the network IP maps and hostname maps for
all networks defined in network_data.yaml. This should make it
possible to create custom networks that will be rendered for
all applicable roles.
Note that at this time all networks will be rendered whether
they are enabled or not. All networks will be present in all
roles, but ports will be associated with noop.yaml in roles
that do not use the network. This is in accordance with
previous behavior, although we may wish to change this in
the future to limit the size of the role definitions and
reduce the number of placeholder resources in deployments
with many networks.
Note that this patch is a replacement for original patch
https://review.openstack.org/#/c/486280, which I was having
trouble rebasing to current.
Change-Id: I445b008fc1240af57c2b76a5dbb6c751a05b7a2a
Depends-on: I662e8d0b3737c7807d18c8917bfce1e25baa3d8a
Partially-implements: blueprint composable-networks
Diffstat (limited to 'network/config/bond-with-vlans/controller-v6.yaml')
| -rw-r--r-- | network/config/bond-with-vlans/controller-v6.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/network/config/bond-with-vlans/controller-v6.yaml b/network/config/bond-with-vlans/controller-v6.yaml index 33c6fa65..69ab7539 100644 --- a/network/config/bond-with-vlans/controller-v6.yaml +++ b/network/config/bond-with-vlans/controller-v6.yaml @@ -14,7 +14,7 @@ parameters: type: string InternalApiIpSubnet: default: '' - description: IP address/subnet on the internal API network + description: IP address/subnet on the internal_api network type: string StorageIpSubnet: default: '' @@ -22,7 +22,7 @@ parameters: type: string StorageMgmtIpSubnet: default: '' - description: IP address/subnet on the storage mgmt network + description: IP address/subnet on the storage_mgmt network type: string TenantIpSubnet: default: '' |