diff options
| author |   Michael Chapman <michapma@redhat.com> | 2016-07-14 02:32:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-14 02:32:19 +0000 |
| commit | 79fae9380d8e5480c38fe6f0e3483eff64bf0dec (patch) | |
| tree | 0b62cee12d87a7aea8c460f6847d72a40b567c4d | |
| parent | 5dc5309bdafb0e8800605e2248e4a837c84d3880 (diff) | |
| parent | 5bec8f5c95158a74f409d175fb6b2de4c1454823 (diff) | |
Merge "correction to a conditional in nic template"
| -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> |