diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-28 18:58:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-28 18:58:11 +0000 |
| commit | 2840a7db67fdaf58567c195557c6fb8ee38f73bd (patch) | |
| tree | 1beb8f677649ca6d1bf670ab4eca175fcdd5b60a /config/network/network_settings.yaml | |
| parent | c5ea99b97d53ddb8451be21ffed5118125457cca (diff) | |
| parent | 890ed0bcb03b61c5e5da596f89771d6196cd4231 (diff) | |
Merge changes from topics 'fix_dpdk', 'vlan_support'
* changes:
Fixes IP failure during os-collect-config ping check
Adding VLAN support
Diffstat (limited to 'config/network/network_settings.yaml')
| -rw-r--r-- | config/network/network_settings.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml index 5614c64d..793c10db 100644 --- a/config/network/network_settings.yaml +++ b/config/network/network_settings.yaml @@ -34,7 +34,6 @@ admin_network: network_type: bridged bridged_interface: '' bond_interfaces: '' - vlan: native usable_ip_range: 192.0.2.11,192.0.2.99 gateway: 192.0.2.1 provisioner_ip: 192.0.2.1 @@ -49,6 +48,7 @@ admin_network: # private_network: enabled: true + vlan: native cidr: 11.0.0.0/24 # "public" network is used for external connectivity. @@ -62,6 +62,7 @@ public_network: enabled: true network_type: '' bridged_interface: '' + vlan: native cidr: 192.168.37.0/24 gateway: 192.168.37.1 floating_ip_range: 192.168.37.200,192.168.37.220 @@ -74,6 +75,7 @@ public_network: # storage_network: enabled: true + vlan: native cidr: 12.0.0.0/24 #admin_network: |