openstack/openstack-ansible
Code Issues Proposed changes

Merge "Use haproxy for metal deployments"

Browse Source
This commit is contained in:
Zuul 2020-10-14 09:53:08 +00:00 committed by Gerrit Code Review
commit 0b664f8098
5 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ used_ips:
{% endif %}
- "172.29.236.1,172.29.236.50"
- "172.29.236.100"
- "172.29.236.101"
- "172.29.240.1,172.29.240.50"
- "172.29.240.100"
- "172.29.244.1,172.29.244.50"
@ -30,7 +31,7 @@ used_ips:
- "172.29.248.100"
global_overrides:
internal_lb_vip_address: 172.29.236.100
internal_lb_vip_address: 172.29.236.101
# The external IP is quoted simply to ensure that the .aio file can be used as input
# dynamic inventory testing.
external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_default_ipv4.address) }}"

2
tests/roles/bootstrap-host/tasks/check-requirements.yml
View File

@ -44,8 +44,6 @@
msg: "The scenario key words 'lxc' and 'metal' are mutually exclusive."
- conditional: "{{ (bootstrap_host_scenario is search('metal')) and (bootstrap_host_scenario is search('nspawn')) }}"
msg: "The scenario key words 'metal' and 'nspawn' are mutually exclusive."
- conditional: "{{ (bootstrap_host_scenario is search('metal')) and (bootstrap_host_scenario is search('haproxy')) }}"
msg: "The scenario key words 'metal' and 'haproxy' are mutually exclusive."
- name: Identify the space available in /
# NOTE(hwoarang): df does not work reliably on btrfs filesystems

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

@ -104,8 +104,11 @@
bridge: "br-mgmt"
mtu: 9000
- interface: "br-mgmt"
address: "172.29.236.100"
netmask: "255.255.252.0"
config_overrides:
Network:
Address:
? "172.29.236.100/22"
? "172.29.236.101/22"
- interface: "dummy-storage"
bridge: "br-storage"

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

@ -42,12 +42,6 @@ galera_wsrep_provider_options:
## Repo
repo_nginx_threads: 2
{% if 'metal' in bootstrap_host_scenarios %}
# NOTE(mnaser): We don't currently deploy HAproxy in metal scenarios therefore
# all URLs which be using HTTP instead of HTTPS.
openstack_service_publicuri_proto: http
{% endif %}
## Keystone
keystone_httpd_mpm_start_servers: 2
keystone_httpd_mpm_min_spare_threads: 1

5
tests/roles/bootstrap-host/vars/main.yml
View File

@ -20,12 +20,9 @@ bootstrap_host_scenarios: "{{ (bootstrap_host_scenario.split('_') | reject('equa
bootstrap_host_scenarios_expanded: |-
{# Keystone is included in every scenario #}
{% set scenario_list = bootstrap_host_scenarios + ['keystone'] %}
{% if 'metal' not in bootstrap_host_scenarios %}
{% set _ = scenario_list.append('haproxy') %}
{% endif %}
{% if ['aio', 'translations'] | intersect(bootstrap_host_scenarios) | length > 0 %}
{# Base services deployed with aio and translations scenarios #}
{% set _ = scenario_list.extend(['cinder', 'glance', 'neutron', 'nova', 'placement']) %}
{% set _ = scenario_list.extend(['cinder', 'glance', 'neutron', 'nova', 'placement', 'haproxy']) %}
{% if 'metal' not in bootstrap_host_scenarios %}
{# Horizon is a base service in container jobs #}
{% set _ = scenario_list.append('horizon') %}