Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes from topics 'unittest_executor', 'import_absolute'
[releng.git]
/
prototypes
/
xci
/
template
/
controller.interface.j2
diff --git
a/prototypes/xci/template/controller.interface.j2
b/prototypes/xci/template/controller.interface.j2
index
74aeea9
..
638e78e
100644
(file)
--- a/
prototypes/xci/template/controller.interface.j2
+++ b/
prototypes/xci/template/controller.interface.j2
@@
-1,28
+1,25
@@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
# The loopback network interface
auto lo
iface lo inet loopback
# Physical interface
# The loopback network interface
auto lo
iface lo inet loopback
# Physical interface
-auto
ens3
-iface
ens3
inet manual
+auto
{{ interface }}
+iface
{{ interface }}
inet manual
# Container/Host management VLAN interface
# Container/Host management VLAN interface
-auto
ens3
.10
-iface
ens3
.10 inet manual
- vlan-raw-device
ens3
+auto
{{ interface }}
.10
+iface
{{ interface }}
.10 inet manual
+ vlan-raw-device
{{ interface }}
# OpenStack Networking VXLAN (tunnel/overlay) VLAN interface
# OpenStack Networking VXLAN (tunnel/overlay) VLAN interface
-auto
ens3
.30
-iface
ens3
.30 inet manual
- vlan-raw-device
ens3
+auto
{{ interface }}
.30
+iface
{{ interface }}
.30 inet manual
+ vlan-raw-device
{{ interface }}
# Storage network VLAN interface (optional)
# Storage network VLAN interface (optional)
-auto
ens3
.20
-iface
ens3
.20 inet manual
- vlan-raw-device
ens3
+auto
{{ interface }}
.20
+iface
{{ interface }}
.20 inet manual
+ vlan-raw-device
{{ interface }}
# Container/Host management bridge
auto br-mgmt
# Container/Host management bridge
auto br-mgmt
@@
-30,23
+27,19
@@
iface br-mgmt inet static
bridge_stp off
bridge_waitport 0
bridge_fd 0
bridge_stp off
bridge_waitport 0
bridge_fd 0
- bridge_ports
ens3
.10
+ bridge_ports
{{ interface }}
.10
address {{host_info[inventory_hostname].MGMT_IP}}
netmask 255.255.252.0
# OpenStack Networking VXLAN (tunnel/overlay) bridge
address {{host_info[inventory_hostname].MGMT_IP}}
netmask 255.255.252.0
# OpenStack Networking VXLAN (tunnel/overlay) bridge
-#
-# Only the COMPUTE and NETWORK nodes must have an IP address
-# on this bridge. When used by infrastructure nodes, the
-# IP addresses are assigned to containers which use this
-# bridge.
-#
auto br-vxlan
auto br-vxlan
-iface br-vxlan inet
manual
+iface br-vxlan inet
static
bridge_stp off
bridge_waitport 0
bridge_fd 0
bridge_stp off
bridge_waitport 0
bridge_fd 0
- bridge_ports ens3.30
+ bridge_ports {{ interface }}.30
+ address {{host_info[inventory_hostname].VXLAN_IP}}
+ netmask 255.255.252.0
# OpenStack Networking VLAN bridge
auto br-vlan
# OpenStack Networking VLAN bridge
auto br-vlan
@@
-54,18
+47,18
@@
iface br-vlan inet static
bridge_stp off
bridge_waitport 0
bridge_fd 0
bridge_stp off
bridge_waitport 0
bridge_fd 0
- bridge_ports
ens3
+ bridge_ports
{{ interface }}
address {{host_info[inventory_hostname].VLAN_IP}}
netmask 255.255.255.0
gateway 192.168.122.1
dns-nameserver 8.8.8.8 8.8.4.4
address {{host_info[inventory_hostname].VLAN_IP}}
netmask 255.255.255.0
gateway 192.168.122.1
dns-nameserver 8.8.8.8 8.8.4.4
-#
compute1
Storage bridge
+#
OpenStack
Storage bridge
auto br-storage
iface br-storage inet static
bridge_stp off
bridge_waitport 0
bridge_fd 0
auto br-storage
iface br-storage inet static
bridge_stp off
bridge_waitport 0
bridge_fd 0
- bridge_ports
ens3
.20
+ bridge_ports
{{ interface }}
.20
address {{host_info[inventory_hostname].STORAGE_IP}}
netmask 255.255.252.0
address {{host_info[inventory_hostname].STORAGE_IP}}
netmask 255.255.252.0