Add merge with `haproxy_<service>_overrides` variables for all

`haproxy_default_services`

Change-Id: Id635cc7d3e55e8a4774867e30f9302ddfd9f04d5
This commit is contained in:
Danila Balagansky 2022-08-30 13:52:15 +03:00
parent 18bf330d43
commit 4230fbd222
2 changed files with 46 additions and 40 deletions

View File

@ -570,43 +570,43 @@ haproxy_zun_console_service:
haproxy_service_enabled: "{{ groups['zun_api'] is defined and groups['zun_api'] | length > 0 }}"
haproxy_default_services:
- service: "{{ haproxy_adjutant_api_service }}"
- service: "{{ haproxy_aodh_api_service }}"
- service: "{{ haproxy_barbican_service }}"
- service: "{{ haproxy_ceph_rgw_service }}"
- service: "{{ haproxy_cinder_api_service }}"
- service: "{{ haproxy_cloudkitty_api_service }}"
- service: "{{ haproxy_designate_api_service }}"
- service: "{{ haproxy_galera_service }}"
- service: "{{ haproxy_glance_api_service }}"
- service: "{{ haproxy_gnocchi_service }}"
- service: "{{ haproxy_heat_api_cfn_service }}"
- service: "{{ haproxy_heat_api_service }}"
- service: "{{ haproxy_horizon_service }}"
- service: "{{ haproxy_ironic_api_service }}"
- service: "{{ haproxy_ironic_inspector_service }}"
- service: "{{ haproxy_keystone_service }}"
- service: "{{ haproxy_letsencrypt_service }}"
- service: "{{ haproxy_magnum_service }}"
- service: "{{ haproxy_manila_service }}"
- service: "{{ haproxy_masakari_api_service }}"
- service: "{{ haproxy_mistral_service }}"
- service: "{{ haproxy_murano_service }}"
- service: "{{ haproxy_neutron_server_service }}"
- service: "{{ haproxy_nova_api_metadata_service }}"
- service: "{{ haproxy_nova_api_compute_service }}"
- service: "{{ haproxy_nova_console_service }}"
- service: "{{ haproxy_octavia_service }}"
- service: "{{ haproxy_opendaylight_neutron_service }}"
- service: "{{ haproxy_opendaylight_websocket_service }}"
- service: "{{ haproxy_panko_api_service }}"
- service: "{{ haproxy_placement_service }}"
- service: "{{ haproxy_rabbitmq_service }}"
- service: "{{ haproxy_repo_service }}"
- service: "{{ haproxy_sahara_api_service }}"
- service: "{{ haproxy_senlin_api_service }}"
- service: "{{ haproxy_swift_proxy_service }}"
- service: "{{ haproxy_tacker_service }}"
- service: "{{ haproxy_trove_service }}"
- service: "{{ haproxy_zun_api_service }}"
- service: "{{ haproxy_zun_console_service }}"
- service: "{{ haproxy_adjutant_api_service | combine(haproxy_adjutant_api_service_overrides | default({})) }}"
- service: "{{ haproxy_aodh_api_service | combine(haproxy_aodh_api_service_overrides | default({})) }}"
- service: "{{ haproxy_barbican_service | combine(haproxy_barbican_service_overrides | default({})) }}"
- service: "{{ haproxy_ceph_rgw_service | combine(haproxy_ceph_rgw_service_overrides | default({})) }}"
- service: "{{ haproxy_cinder_api_service | combine(haproxy_cinder_api_service_overrides | default({})) }}"
- service: "{{ haproxy_cloudkitty_api_service | combine(haproxy_cloudkitty_api_service_overrides | default({})) }}"
- service: "{{ haproxy_designate_api_service | combine(haproxy_designate_api_service_overrides | default({})) }}"
- service: "{{ haproxy_galera_service | combine(haproxy_galera_service_overrides | default({})) }}"
- service: "{{ haproxy_glance_api_service | combine(haproxy_glance_api_service_overrides | default({})) }}"
- service: "{{ haproxy_gnocchi_service | combine(haproxy_gnocchi_service_overrides | default({})) }}"
- service: "{{ haproxy_heat_api_cfn_service | combine(haproxy_heat_api_cfn_service_overrides | default({})) }}"
- service: "{{ haproxy_heat_api_service | combine(haproxy_heat_api_service_overrides | default({})) }}"
- service: "{{ haproxy_horizon_service | combine(haproxy_horizon_service_overrides | default({})) }}"
- service: "{{ haproxy_ironic_api_service | combine(haproxy_ironic_api_service_overrides | default({})) }}"
- service: "{{ haproxy_ironic_inspector_service | combine(haproxy_ironic_inspector_service_overrides | default({})) }}"
- service: "{{ haproxy_keystone_service | combine(haproxy_keystone_service_overrides | default({})) }}"
- service: "{{ haproxy_letsencrypt_service | combine(haproxy_letsencrypt_service_overrides | default({})) }}"
- service: "{{ haproxy_magnum_service | combine(haproxy_magnum_service_overrides | default({})) }}"
- service: "{{ haproxy_manila_service | combine(haproxy_manila_service_overrides | default({})) }}"
- service: "{{ haproxy_masakari_api_service | combine(haproxy_masakari_api_service_overrides | default({})) }}"
- service: "{{ haproxy_mistral_service | combine(haproxy_mistral_service_overrides | default({})) }}"
- service: "{{ haproxy_murano_service | combine(haproxy_murano_service_overrides | default({})) }}"
- service: "{{ haproxy_neutron_server_service | combine(haproxy_neutron_server_service_overrides | default({})) }}"
- service: "{{ haproxy_nova_api_metadata_service | combine(haproxy_nova_api_metadata_service_overrides | default({})) }}"
- service: "{{ haproxy_nova_api_compute_service | combine(haproxy_nova_api_compute_service_overrides | default({})) }}"
- service: "{{ haproxy_nova_console_service | combine(haproxy_nova_console_service_overrides | default({})) }}"
- service: "{{ haproxy_octavia_service | combine(haproxy_octavia_service_overrides | default({})) }}"
- service: "{{ haproxy_opendaylight_neutron_service | combine(haproxy_opendaylight_neutron_service_overrides | default({})) }}"
- service: "{{ haproxy_opendaylight_websocket_service | combine(haproxy_opendaylight_websocket_service_overrides | default({})) }}"
- service: "{{ haproxy_panko_api_service | combine(haproxy_panko_api_service_overrides | default({})) }}"
- service: "{{ haproxy_placement_service | combine(haproxy_placement_service_overrides | default({})) }}"
- service: "{{ haproxy_rabbitmq_service | combine(haproxy_rabbitmq_service_overrides | default({})) }}"
- service: "{{ haproxy_repo_service | combine(haproxy_repo_service_overrides | default({})) }}"
- service: "{{ haproxy_sahara_api_service | combine(haproxy_sahara_api_service_overrides | default({})) }}"
- service: "{{ haproxy_senlin_api_service | combine(haproxy_senlin_api_service_overrides | default({})) }}"
- service: "{{ haproxy_swift_proxy_service | combine(haproxy_swift_proxy_service_overrides | default({})) }}"
- service: "{{ haproxy_tacker_service | combine(haproxy_tacker_service_overrides | default({})) }}"
- service: "{{ haproxy_trove_service | combine(haproxy_trove_service_overrides | default({})) }}"
- service: "{{ haproxy_zun_api_service | combine(haproxy_zun_api_service_overrides | default({})) }}"
- service: "{{ haproxy_zun_console_service | combine(haproxy_zun_console_service_overrides | default({})) }}"

View File

@ -0,0 +1,6 @@
---
features:
- |
Add merge with ``haproxy_<service>_overrides`` variables (e.g.:
``haproxy_cloudkitty_api_service``), which can be used for partial
overrides for haproxy services configurations.