diff options
| author |   Steven Hardy <shardy@redhat.com> | 2017-08-09 19:17:49 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2017-08-15 08:24:35 +0100 |
| commit | a465b8dddf44f0d9e34190f680deda387f303b60 (patch) | |
| tree | 91e21fb52216db4e9c45cf1a6997201d6eb553b9 /network/network.network.j2.yaml | |
| parent | 6976b8f6502394b09fb502666a47c0b2fcbc5304 (diff) | |
Convert network templates to be rendered via j2
Use the network.network.j2.yaml to render these files, instead
of relying on the hard-coded versions.
Note this doesn't currently consider the _v6 templates as we may want
to deprecate these and instead rely on an ipv6 specific network_data file,
or perhaps make the network/network.network.j2.yaml generic and able to
detect the version from the cidr?
Change-Id: I662e8d0b3737c7807d18c8917bfce1e25baa3d8a
Partially-Implements: blueprint composable-networks
Diffstat (limited to 'network/network.network.j2.yaml')
| -rw-r--r-- | network/network.network.j2.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/network/network.network.j2.yaml b/network/network.network.j2.yaml index ccf437bb..29d58cd5 100644 --- a/network/network.network.j2.yaml +++ b/network/network.network.j2.yaml @@ -15,7 +15,7 @@ parameters: type: json {{network.name}}NetAdminStateUp: default: false - description: This admin state of the network. + description: The admin state of the network. type: boolean {{network.name}}NetEnableDHCP: default: false @@ -27,7 +27,7 @@ parameters: type: boolean {{network.name}}NetName: default: {{network.name_lower}} - description: The name of the {{network.name_lower}} network. + description: The name of the {{network.name_lower}} network. type: string {{network.name}}SubnetName: default: {{network.name_lower}}_subnet @@ -38,7 +38,7 @@ parameters: description: Ip allocation pool range for the {{network.name_lower}} network. type: json {{network.name}}InterfaceDefaultRoute: - default: {{network.gateway_ip|default("not_defined")}} + default: {{network.gateway_ip|default('""')}} description: default route for the {{network.name_lower}} network type: string {%- if network.vlan %} |