aboutsummaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-21 00:41:15 +0000
committerGerrit Code Review <review@openstack.org>2017-04-21 00:41:15 +0000
commit89927b6b4da16b5234778711e262e0febd3f6814 (patch)
treea6e95182663ef7023b71001febe1161cfc64b843 /network
parent9f05a77d676f990fd5c51b0bfccff378fb650124 (diff)
parenta5116005d8a94b5e888791f02b53b33c407a08ad (diff)
Merge "Add network_data.yaml to encapsulate list of networks for j2"
Diffstat (limited to 'network')
-rw-r--r--network/networks.j2.yaml17
-rw-r--r--network/networks.yaml26
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