From 4230fbd222a6c9b8f239a7ffb62d6c16cc06cd41 Mon Sep 17 00:00:00 2001 From: Danila Balagansky Date: Tue, 30 Aug 2022 13:52:15 +0300 Subject: [PATCH] Add merge with `haproxy__overrides` variables for all `haproxy_default_services` Change-Id: Id635cc7d3e55e8a4774867e30f9302ddfd9f04d5 --- inventory/group_vars/haproxy/haproxy.yml | 80 +++++++++---------- ...xy_service_overrides-c7328e5e486381dd.yaml | 6 ++ 2 files changed, 46 insertions(+), 40 deletions(-) create mode 100644 releasenotes/notes/haproxy_service_overrides-c7328e5e486381dd.yaml diff --git a/inventory/group_vars/haproxy/haproxy.yml b/inventory/group_vars/haproxy/haproxy.yml index e658fe109c..b154f36ea4 100644 --- a/inventory/group_vars/haproxy/haproxy.yml +++ b/inventory/group_vars/haproxy/haproxy.yml @@ -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({})) }}" diff --git a/releasenotes/notes/haproxy_service_overrides-c7328e5e486381dd.yaml b/releasenotes/notes/haproxy_service_overrides-c7328e5e486381dd.yaml new file mode 100644 index 0000000000..349fc87b01 --- /dev/null +++ b/releasenotes/notes/haproxy_service_overrides-c7328e5e486381dd.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Add merge with ``haproxy__overrides`` variables (e.g.: + ``haproxy_cloudkitty_api_service``), which can be used for partial + overrides for haproxy services configurations.