Add Ironic-related bridges to AIO
This patchset sets the foundation for Ironic and Inspector AIO testing by setting up respective bridges and IPs. Change-Id: Ic92d520b86e958c2c257895af0d26db40a00503b
This commit is contained in:
parent
55cf3a975b
commit
ebf871f65f
@ -1,5 +1,6 @@
|
||||
---
|
||||
cidr_networks:
|
||||
bmaas: 172.29.228.0/22
|
||||
lbaas: 172.29.232.0/22
|
||||
dbaas: 172.29.252.0/22
|
||||
container: 172.29.236.0/22
|
||||
@ -13,6 +14,9 @@ cidr_networks:
|
||||
# - 2x2.11 -> 49 : available for container interface ip auto-allocation in LXC deploys
|
||||
# - 2x2.50 -? 2x5.254 : available for neutron allocation
|
||||
used_ips:
|
||||
- "172.29.228.1,172.29.228.10"
|
||||
- "172.29.229.50,172.29.231.255"
|
||||
- "172.29.228.100"
|
||||
- "172.29.232.1,172.29.232.10"
|
||||
- "172.29.232.50,172.29.235.255"
|
||||
- "172.29.252.1,172.29.252.10"
|
||||
@ -77,6 +81,16 @@ global_overrides:
|
||||
- octavia-worker
|
||||
- octavia-housekeeping
|
||||
- octavia-health-manager
|
||||
- network:
|
||||
container_bridge: "br-bmaas"
|
||||
container_type: "veth"
|
||||
container_interface: "eth15"
|
||||
host_bind_override: "eth15"
|
||||
ip_from_q: "bmaas"
|
||||
type: "flat"
|
||||
net_name: "bmaas"
|
||||
group_binds:
|
||||
- ironic_inspector
|
||||
- network:
|
||||
container_bridge: "br-vlan"
|
||||
container_type: "veth"
|
||||
|
@ -1,5 +1,8 @@
|
||||
---
|
||||
cidr_networks:
|
||||
{% if 'ironic' in bootstrap_host_scenarios_expanded %}
|
||||
bmaas: 172.29.228.0/22
|
||||
{% endif %}
|
||||
{% if 'trove' in bootstrap_host_scenarios_expanded %}
|
||||
dbaas: 172.29.252.0/22
|
||||
{% endif %}
|
||||
@ -11,6 +14,11 @@ cidr_networks:
|
||||
storage: 172.29.244.0/22
|
||||
|
||||
used_ips:
|
||||
{% if 'ironic' in bootstrap_host_scenarios_expanded %}
|
||||
- "172.29.228.1,172.29.228.10"
|
||||
- "172.29.229.50,172.29.231.255"
|
||||
- "172.29.228.100"
|
||||
{% endif %}
|
||||
{% if 'trove' in bootstrap_host_scenarios_expanded %}
|
||||
- "172.29.252.1,172.29.252.10"
|
||||
- "172.29.252.50,172.29.255.255"
|
||||
@ -116,6 +124,18 @@ global_overrides:
|
||||
- octavia-housekeeping
|
||||
- octavia-health-manager
|
||||
{% endif %}
|
||||
{% if 'ironic' in bootstrap_host_scenarios_expanded %}
|
||||
- network:
|
||||
container_bridge: "br-bmaas"
|
||||
container_type: "veth"
|
||||
container_interface: "eth15"
|
||||
host_bind_override: "eth15"
|
||||
ip_from_q: "bmaas"
|
||||
type: "flat"
|
||||
net_name: "bmaas"
|
||||
group_binds:
|
||||
- ironic_inspector
|
||||
{% endif %}
|
||||
{% if 'ovn' in bootstrap_host_scenarios_expanded %}
|
||||
- network:
|
||||
container_bridge: "br-provider"
|
||||
|
@ -62,6 +62,9 @@
|
||||
- NetDev:
|
||||
Name: dummy-lbaas
|
||||
Kind: dummy
|
||||
- NetDev:
|
||||
Name: dummy-bmaas
|
||||
Kind: dummy
|
||||
|
||||
- NetDev:
|
||||
Name: br-mgmt
|
||||
@ -81,6 +84,9 @@
|
||||
- NetDev:
|
||||
Name: br-lbaas
|
||||
Kind: bridge
|
||||
- NetDev:
|
||||
Name: br-bmaas
|
||||
Kind: bridge
|
||||
|
||||
- NetDev:
|
||||
Name: br-vlan-veth
|
||||
@ -97,6 +103,11 @@
|
||||
Kind: veth
|
||||
Peer:
|
||||
Name: eth14
|
||||
- NetDev:
|
||||
Name: br-bmaas-veth
|
||||
Kind: veth
|
||||
Peer:
|
||||
Name: eth15
|
||||
|
||||
systemd_networks:
|
||||
|
||||
@ -137,6 +148,16 @@
|
||||
bridge: "br-lbaas"
|
||||
mtu: 9000
|
||||
|
||||
- interface: "dummy-bmaas"
|
||||
bridge: "br-bmaas"
|
||||
mtu: 1500
|
||||
- interface: "br-bmaas"
|
||||
address: "172.29.228.100"
|
||||
netmask: "255.255.252.0"
|
||||
- interface: "br-bmaas-veth"
|
||||
bridge: "br-bmaas"
|
||||
mtu: 1500
|
||||
|
||||
- interface: "dummy-vxlan"
|
||||
bridge: "br-vxlan"
|
||||
mtu: 9000
|
||||
@ -179,6 +200,7 @@
|
||||
- 172.29.252.100 # br-dbaas
|
||||
- 172.29.232.100 # br-lbaas
|
||||
- 172.29.240.100 # br-vxlan
|
||||
- 172.29.228.100 # br-bmaas
|
||||
|
||||
- name: Run the systemd service role
|
||||
include_role:
|
||||
@ -202,6 +224,7 @@
|
||||
- "-{{ bootstrap_host_ethtool_path }} -K br-vlan gso off sg off tso off tx off"
|
||||
- "-{{ bootstrap_host_ethtool_path }} -K br-dbaas gso off sg off tso off tx off"
|
||||
- "-{{ bootstrap_host_ethtool_path }} -K br-lbaas gso off sg off tso off tx off"
|
||||
- "-{{ bootstrap_host_ethtool_path }} -K br-bmaas gso off sg off tso off tx off"
|
||||
- "-{{ bootstrap_host_ip_path }} link set eth12 up"
|
||||
- "-{{ bootstrap_host_ip_path }} link set br-vlan-veth up"
|
||||
- "-{{ bootstrap_host_ethtool_path }} -K eth12 gso off sg off tso off tx off"
|
||||
@ -211,6 +234,9 @@
|
||||
- "-{{ bootstrap_host_ip_path }} link set eth14 up"
|
||||
- "-{{ bootstrap_host_ip_path }} link set br-lbaas-veth up"
|
||||
- "-{{ bootstrap_host_ethtool_path }} -K eth14 gso off sg off tso off tx off"
|
||||
- "-{{ bootstrap_host_ip_path }} link set eth15 up"
|
||||
- "-{{ bootstrap_host_ip_path }} link set br-bmaas-veth up"
|
||||
- "-{{ bootstrap_host_ethtool_path }} -K eth15 gso off sg off tso off tx off"
|
||||
execstops:
|
||||
- "{{ bootstrap_host_iptables_path }} -t nat -D POSTROUTING -o {{ bootstrap_host_public_interface }} -j MASQUERADE"
|
||||
enabled: yes
|
||||
|
@ -294,5 +294,5 @@ lxc_container_networks: {}
|
||||
|
||||
{% if 'ironic' in bootstrap_host_scenario %}
|
||||
# The ironic inspector DHCP address that hands out DHCP offers
|
||||
ironic_inspector_dhcp_address: 192.168.0.100
|
||||
ironic_inspector_dhcp_address: 172.29.228.100
|
||||
{% endif %}
|
||||
|
@ -21,3 +21,10 @@ tempest_test_excludelist:
|
||||
|
||||
tempest_service_available_ironic: true
|
||||
tempest_service_available_neutron: true
|
||||
|
||||
# (jamesdenton) Set defaults for AIO
|
||||
ironic_inspector_dhcp_pool_range: 172.29.229.50 172.29.229.255
|
||||
ironic_inspector_dhcp_subnet: 172.29.228.0/22
|
||||
ironic_inspector_dhcp_subnet_mask: 255.255.252.0
|
||||
ironic_inspector_dhcp_gateway: 172.29.228.1
|
||||
ironic_inspector_dhcp_nameservers: 172.29.228.1
|
||||
|
Loading…
x
Reference in New Issue
Block a user