summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-07-19 16:51:15 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-19 16:51:15 +0000
commit40925d0cdc63e557ef04569642875cd07b8ed7ce (patch)
tree5bff2d016aebc4376197ec0ac4daae344b13e4bd /config
parent9f7c8cc97bb73069455b5357c0d4c0dcfc26d5a3 (diff)
parent1f5bede73d99f89a3cf1ec5fae7b30cee454b6c8 (diff)
Merge "Allows specifying nic order for overcloud nodes in network settings"
Diffstat (limited to 'config')
-rw-r--r--config/network/network_settings.yaml10
1 files changed, 10 insertions, 0 deletions
diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml
index 793c10db..7c0f5018 100644
--- a/config/network/network_settings.yaml
+++ b/config/network/network_settings.yaml
@@ -34,6 +34,8 @@ admin_network:
network_type: bridged
bridged_interface: ''
bond_interfaces: ''
+ compute_interface: nic1
+ controller_interface: nic1
usable_ip_range: 192.0.2.11,192.0.2.99
gateway: 192.0.2.1
provisioner_ip: 192.0.2.1
@@ -50,6 +52,8 @@ private_network:
enabled: true
vlan: native
cidr: 11.0.0.0/24
+ compute_interface: nic2
+ controller_interface: nic2
# "public" network is used for external connectivity.
# The external network provides Internet access for virtual
@@ -62,6 +66,8 @@ public_network:
enabled: true
network_type: ''
bridged_interface: ''
+ compute_interface: nic3
+ controller_interface: nic3
vlan: native
cidr: 192.168.37.0/24
gateway: 192.168.37.1
@@ -77,12 +83,16 @@ storage_network:
enabled: true
vlan: native
cidr: 12.0.0.0/24
+ compute_interface: nic4
+ controller_interface: nic4
#admin_network:
# enabled: true
# network_type: bridged #Indicates if this network will be bridged to an interface, or to a bond
# bridged_interface: '' #Interface to bridge to for installer VM
# bond_interfaces: '' #Interfaces to create bond with for installer VM
+# compute_interface: nic4 #Interface used for this network on the compute node. Can either be logical nic name like "nic1" or real name like "eth1"
+# controller_interface: nic4 #Interface used for this network on the controller node. Can either be logical nic name like "nic1" or real name like "eth1"
# vlan: native #VLAN tag to use, native means none
# usable_ip_range: 192.0.2.11,192.0.2.99 #Usable ip range, if empty entire range is usable, ex. 192.168.1.10,192.168.1.20
# gateway: 192.0.2.1 #Gateway (only needed when public_network is disabled), if empty it is auto-detected