diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-07-12 17:19:38 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2016-07-13 14:31:53 -0400 |
| commit | 5bec8f5c95158a74f409d175fb6b2de4c1454823 (patch) | |
| tree | 3244f6530f1262fad64d5a5f2cf28590cdd243b1 | |
| parent | b36000ac8c1a2d26ad82b6bc81fb5e4a87440d24 (diff) | |
correction to a conditional in nic template
Change-Id: Ibed808350163379fcfa5178c78fabe2f47e491fc
Signed-off-by: Dan Radez <dradez@redhat.com>
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 2 | ||||
| -rw-r--r-- | lib/python/apex/network_environment.py | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index 455ae0f3..91d0c478 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -94,7 +94,7 @@ resources: name: nic1 # force the MAC address of the bridge to this interface primary: true - {%- if 'public_network' in enabled_networks and vlans['private_network'] is number %} + {%- if 'public_network' in enabled_networks and vlans['public_network'] is number %} - type: vlan vlan_id: {get_param: ExternalNetworkVlanID} diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py index fec6299d..bf4bdc79 100644 --- a/lib/python/apex/network_environment.py +++ b/lib/python/apex/network_environment.py @@ -9,11 +9,13 @@ import yaml import re -from .common.constants import ADMIN_NETWORK -from .common.constants import PRIVATE_NETWORK -from .common.constants import STORAGE_NETWORK -from .common.constants import PUBLIC_NETWORK -from .common.constants import API_NETWORK +from .common.constants import ( + ADMIN_NETWORK, + PRIVATE_NETWORK, + STORAGE_NETWORK, + PUBLIC_NETWORK, + API_NETWORK, +) PORTS = '/ports' # Resources defined by <resource name>: <prefix> |