Skip to content
Snippets Groups Projects
Commit 2445c78c authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "[ironic] add coordination backend for ironic inspector"

parents d1e57fed 2edc32f2
No related branches found
No related tags found
No related merge requests found
...@@ -1178,6 +1178,9 @@ grafana_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn | put_a ...@@ -1178,6 +1178,9 @@ grafana_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn | put_a
ironic_internal_endpoint: "{{ internal_protocol }}://{{ ironic_internal_fqdn | put_address_in_context('url') }}:{{ ironic_api_port }}" ironic_internal_endpoint: "{{ internal_protocol }}://{{ ironic_internal_fqdn | put_address_in_context('url') }}:{{ ironic_api_port }}"
ironic_public_endpoint: "{{ public_protocol }}://{{ ironic_external_fqdn | put_address_in_context('url') }}:{{ ironic_api_port }}" ironic_public_endpoint: "{{ public_protocol }}://{{ ironic_external_fqdn | put_address_in_context('url') }}:{{ ironic_api_port }}"
# Valid options are [ '', redis, etcd ]
ironic_coordination_backend: "{{ 'redis' if enable_redis|bool else 'etcd' if enable_etcd|bool else '' }}"
######## ########
# Swift # Swift
######## ########
......
...@@ -73,3 +73,14 @@ driver = {{ ironic_inspector_pxe_filter }} ...@@ -73,3 +73,14 @@ driver = {{ ironic_inspector_pxe_filter }}
[iptables] [iptables]
dnsmasq_interface = {{ ironic_dnsmasq_interface }} dnsmasq_interface = {{ ironic_dnsmasq_interface }}
{% endif %} {% endif %}
[coordination]
{% if ironic_coordination_backend == 'redis' %}
backend_url = {{ redis_connection_string }}
{% elif ironic_coordination_backend == 'etcd' %}
# NOTE(yoctozepto): etcd-compatible tooz drivers do not support multiple endpoints here (verified in Stein, Train)
# NOTE(yoctozepto): we must use etcd3gw (aka etcd3+http) due to issues with alternative (etcd3) and eventlet (as used by cinder)
# see https://bugs.launchpad.net/kolla-ansible/+bug/1854932
# and https://review.opendev.org/466098 for details
backend_url = etcd3+{{ etcd_protocol }}://{{ 'api' | kolla_address(groups['etcd'][0]) | put_address_in_context('url') }}:{{ etcd_client_port }}
{% endif %}
...@@ -599,6 +599,9 @@ ...@@ -599,6 +599,9 @@
# List of extra kernel parameters passed to the kernel used during inspection # List of extra kernel parameters passed to the kernel used during inspection
#ironic_inspector_kernel_cmdline_extras: [] #ironic_inspector_kernel_cmdline_extras: []
# Valid options are [ '', redis, etcd ]
#ironic_coordination_backend: "{{ 'redis' if enable_redis|bool else 'etcd' if enable_etcd|bool else '' }}"
###################################### ######################################
# Manila - Shared File Systems Options # Manila - Shared File Systems Options
###################################### ######################################
......
---
features:
- |
Adds support for configuring a coordination backend for Ironic
Inspector via the ``ironic_coordination_backend`` variable.
Possible values are ``redis`` or ``etcd``.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment