openstack/openstack-ansible
Code Issues Proposed changes

Map dbaas and lbaas with role defaults

Browse Source 
In octavia role default cidr is set to 172.29.232.0/22
along with all docs. So we'd better change our example
and aio build template rather then octavia role defaults.

This also affects trove, but trove role uses quite another
network in defaults then supposed to.

We also add dbaas network inside trove containers where
they should present.

Change-Id: I7ee01f50532596f27039eae6c112bb86b20c383d
This commit is contained in:
Dmitriy Rabotyagov 2021-03-31 18:01:41 +03:00 committed by Dmitriy Rabotyagov
parent 1f2252e4d8
commit 0637c998d7
5 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etc/openstack_deploy/openstack_user_config.yml.aio
View File

@ -1,16 +1,22 @@
---
cidr_networks:
dbaas: 172.29.232.0/22
lbaas: 172.29.252.0/22
lbaas: 172.29.232.0/22
dbaas: 172.29.252.0/22
container: 172.29.236.0/22
tunnel: 172.29.240.0/22
storage: 172.29.244.0/22
# For dbaas and lbaas network, most part of the network we should make available for
# neutron subnet as guest/amphora instances will be spawned within this network. We
# reserve network keeping in mind the following:
# - 2x2.1 -> 10 : physical routers / SVI (or br-[l|d]baas if you route via the infra host)
# - 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.232.1,172.29.232.50"
- "172.29.232.100"
- "172.29.252.1,172.29.252.50"
- "172.29.252.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"
- "172.29.252.50,172.29.255.255"
- "172.29.236.1,172.29.236.50"
- "172.29.236.100"
- "172.29.240.1,172.29.240.50"

13
etc/openstack_deploy/openstack_user_config.yml.aio.j2
View File

@ -1,10 +1,10 @@
---
cidr_networks:
{% if 'trove' in bootstrap_host_scenarios_expanded %}
dbaas: 172.29.232.0/22
dbaas: 172.29.252.0/22
{% endif %}
{% if 'octavia' in bootstrap_host_scenarios_expanded %}
lbaas: 172.29.252.0/22
lbaas: 172.29.232.0/22
{% endif %}
container: 172.29.236.0/22
tunnel: 172.29.240.0/22
@ -12,13 +12,12 @@ cidr_networks:
used_ips:
{% if 'trove' in bootstrap_host_scenarios_expanded %}
- "172.29.232.1,172.29.232.50"
- "172.29.232.100"
- "172.29.252.1,172.29.252.10"
- "172.29.252.50,172.29.255.255"
{% endif %}
{% if 'octavia' in bootstrap_host_scenarios_expanded %}
- "172.29.252.1,172.29.252.50"
- "172.29.252.100"
- "172.29.253.1,172.29.253.200"
- "172.29.232.1,172.29.232.10"
- "172.29.232.50,172.29.235.255"
{% endif %}
- "172.29.236.1,172.29.236.50"
- "172.29.236.100"

8
tests/roles/bootstrap-host/tasks/prepare_networking.yml
View File

@ -121,7 +121,7 @@
bridge: "br-dbaas"
mtu: 9000
- interface: "br-dbaas"
address: "172.29.232.100"
address: "172.29.252.100"
netmask: "255.255.252.0"
- interface: "br-dbaas-veth"
bridge: "br-dbaas"
@ -131,7 +131,7 @@
bridge: "br-lbaas"
mtu: 9000
- interface: "br-lbaas"
address: "172.29.252.100"
address: "172.29.232.100"
netmask: "255.255.252.0"
- interface: "br-lbaas-veth"
bridge: "br-lbaas"
@ -176,8 +176,8 @@
with_items:
- 172.29.236.100 # br-mgmt
- 172.29.244.100 # br-storage
- 172.29.232.100 # br-dbaas
- 172.29.252.100 # br-lbaas
- 172.29.252.100 # br-dbaas
- 172.29.232.100 # br-lbaas
- 172.29.240.100 # br-vxlan
- name: Run the systemd service role

6
tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
View File

@ -112,8 +112,8 @@ octavia_wsgi_threads: 1
octavia_wsgi_processes_max: 2
octavia_wsgi_processes: 2
octavia_wsgi_buffer_size: 16384
octavia_management_net_subnet_cidr: 172.29.252.0/22
octavia_management_net_subnet_allocation_pools: "172.29.253.1-172.29.253.200"
octavia_management_net_subnet_cidr: 172.29.232.0/22
octavia_management_net_subnet_allocation_pools: "172.29.232.50-172.29.235.254"
## Heat
heat_api_workers: 1
@ -182,7 +182,7 @@ trove_wsgi_processes: 1
# IPs. We don't store those IPs when running metal so we
# have to override it manually. We should remove this and
# fix the role (or the inventory tool) eventually.
octavia_hm_hosts: 172.29.252.100 # br-lbaas IP
octavia_hm_hosts: 172.29.232.100 # br-lbaas IP
{% endif %}
## Sahara

6
tests/roles/bootstrap-host/templates/user_variables_translations.yml.j2
View File

@ -23,7 +23,7 @@ trove_service_net_subnet_cidr: "172.29.236.0/22"
trove_service_net_allocation_pool_start: "172.29.237.110"
trove_service_net_allocation_pool_end: "172.29.237.200"
{% else %}
trove_service_net_subnet_cidr: "172.29.232.0/22"
trove_service_net_allocation_pool_start: "172.29.233.110"
trove_service_net_allocation_pool_end: "172.29.233.200"
trove_service_net_subnet_cidr: "172.29.252.0/22"
trove_service_net_allocation_pool_start: "172.29.252.50"
trove_service_net_allocation_pool_end: "172.29.255.254"
{% endif %}