diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-12-08 17:34:08 +0000 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-03-05 03:20:42 +0000 |
| commit | a5116005d8a94b5e888791f02b53b33c407a08ad (patch) | |
| tree | 47efa97551c374c6ee4736815f6054f8099d055e /network | |
| parent | ccb13e7b4227188275cb3f8e599fa8f6f37639c0 (diff) | |
Add network_data.yaml to encapsulate list of networks for j2
This moves the hard-coded networks from the default environment,
and provides the first step towards enabling composable networks.
Co-Author: Dan Sneddon <dsneddon@redhat.com>
Partial-Bug: #1633090
Depends-On: I9f818912bd8e2a3220e41c8ccbbab3d9063b4d72
Change-Id: I7793b8badede5450b05437c84d9b40c28de7546b
Diffstat (limited to 'network')
| -rw-r--r-- | network/networks.j2.yaml | 17 | ||||
| -rw-r--r-- | network/networks.yaml | 26 |
2 files changed, 17 insertions, 26 deletions
diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml new file mode 100644 index 00000000..ef977d8d --- /dev/null +++ b/network/networks.j2.yaml @@ -0,0 +1,17 @@ +heat_template_version: ocata + +description: Create networks to split out Overcloud traffic + +resources: + + {%- for network in networks %} + {%- if network.name != 'InternalApi' %} + {{network.name}}Network: + {%- else %} + InternalNetwork: + {%- endif %} + type: OS::TripleO::Network::{{network.name}} + {%- endfor %} + + NetworkExtraConfig: + type: OS::TripleO::Network::ExtraConfig diff --git a/network/networks.yaml b/network/networks.yaml deleted file mode 100644 index 26033ee2..00000000 --- a/network/networks.yaml +++ /dev/null @@ -1,26 +0,0 @@ -heat_template_version: ocata - -description: Create networks to split out Overcloud traffic - -resources: - - ExternalNetwork: - type: OS::TripleO::Network::External - - InternalNetwork: - type: OS::TripleO::Network::InternalApi - - StorageMgmtNetwork: - type: OS::TripleO::Network::StorageMgmt - - StorageNetwork: - type: OS::TripleO::Network::Storage - - TenantNetwork: - type: OS::TripleO::Network::Tenant - - ManagementNetwork: - type: OS::TripleO::Network::Management - - NetworkExtraConfig: - type: OS::TripleO::Network::ExtraConfig |