Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • very-demiurge-very-mindful/kolla-ansible
1 result
Show changes
Commits on Source (23)
Showing
with 78 additions and 11 deletions
...@@ -372,7 +372,11 @@ cloudkitty_api_listen_port: "{{ cloudkitty_api_port }}" ...@@ -372,7 +372,11 @@ cloudkitty_api_listen_port: "{{ cloudkitty_api_port }}"
collectd_udp_port: "25826" collectd_udp_port: "25826"
cyborg_internal_fqdn: "{{ kolla_internal_fqdn }}"
cyborg_external_fqdn: "{{ kolla_external_fqdn }}"
cyborg_api_port: "6666" cyborg_api_port: "6666"
cyborg_api_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else cyborg_api_port }}"
cyborg_api_listen_port: "{{ cyborg_api_port }}"
designate_internal_fqdn: "{{ kolla_internal_fqdn }}" designate_internal_fqdn: "{{ kolla_internal_fqdn }}"
designate_external_fqdn: "{{ kolla_external_fqdn }}" designate_external_fqdn: "{{ kolla_external_fqdn }}"
......
...@@ -264,5 +264,5 @@ backend_url = {{ redis_connection_string }} ...@@ -264,5 +264,5 @@ backend_url = {{ redis_connection_string }}
# and https://review.opendev.org/466098 for details # and https://review.opendev.org/466098 for details
# NOTE(jan.gutter): etcd v3.4 removed the default `v3alpha` api_version. Until # NOTE(jan.gutter): etcd v3.4 removed the default `v3alpha` api_version. Until
# tooz defaults to a newer version, we should explicitly specify `v3` # tooz defaults to a newer version, we should explicitly specify `v3`
backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ etcd_client_port }}?api_version=v3{% if openstack_cacert %}?ca_cert={{ openstack_cacert }}{% endif %} backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ etcd_client_port }}?api_version=v3{% if openstack_cacert %}&ca_cert={{ openstack_cacert }}{% endif %}
{% endif %} {% endif %}
...@@ -186,6 +186,8 @@ fluentd_input_openstack_services: ...@@ -186,6 +186,8 @@ fluentd_input_openstack_services:
enabled: "{{ enable_nova | bool }}" enabled: "{{ enable_nova | bool }}"
- name: octavia - name: octavia
enabled: "{{ enable_octavia | bool }}" enabled: "{{ enable_octavia | bool }}"
- name: placement
enabled: "{{ enable_placement | bool }}"
- name: tacker - name: tacker
enabled: "{{ enable_tacker | bool }}" enabled: "{{ enable_tacker | bool }}"
- name: trove - name: trove
......
...@@ -8,6 +8,20 @@ cyborg_services: ...@@ -8,6 +8,20 @@ cyborg_services:
volumes: "{{ cyborg_api_default_volumes + cyborg_api_extra_volumes }}" volumes: "{{ cyborg_api_default_volumes + cyborg_api_extra_volumes }}"
dimensions: "{{ cyborg_api_dimensions }}" dimensions: "{{ cyborg_api_dimensions }}"
healthcheck: "{{ cyborg_api_healthcheck }}" healthcheck: "{{ cyborg_api_healthcheck }}"
haproxy:
cyborg_api:
enabled: "{{ enable_cyborg }}"
mode: "http"
external: false
port: "{{ cyborg_api_port }}"
listen_port: "{{ cyborg_api_listen_port }}"
cyborg_api_external:
enabled: "{{ enable_cyborg }}"
mode: "http"
external: true
external_fqdn: "{{ cyborg_external_fqdn }}"
port: "{{ cyborg_api_public_port }}"
listen_port: "{{ cyborg_api_listen_port }}"
cyborg-agent: cyborg-agent:
container_name: cyborg_agent container_name: cyborg_agent
group: cyborg-agent group: cyborg-agent
......
...@@ -17,7 +17,7 @@ keystone_services: ...@@ -17,7 +17,7 @@ keystone_services:
port: "{{ keystone_internal_port }}" port: "{{ keystone_internal_port }}"
listen_port: "{{ keystone_internal_listen_port }}" listen_port: "{{ keystone_internal_listen_port }}"
backend_http_extra: backend_http_extra:
- balance "{{ 'source' if enable_keystone_federation | bool else 'roundrobin' }}" - "balance {{ 'source' if enable_keystone_federation | bool else 'roundrobin' }}"
keystone_external: keystone_external:
enabled: "{{ enable_keystone }}" enabled: "{{ enable_keystone }}"
mode: "http" mode: "http"
...@@ -27,7 +27,7 @@ keystone_services: ...@@ -27,7 +27,7 @@ keystone_services:
port: "{{ keystone_public_port }}" port: "{{ keystone_public_port }}"
listen_port: "{{ keystone_public_listen_port }}" listen_port: "{{ keystone_public_listen_port }}"
backend_http_extra: backend_http_extra:
- balance "{{ 'source' if enable_keystone_federation | bool else 'roundrobin' }}" - "balance {{ 'source' if enable_keystone_federation | bool else 'roundrobin' }}"
keystone-ssh: keystone-ssh:
container_name: "keystone_ssh" container_name: "keystone_ssh"
group: "keystone" group: "keystone"
......
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
when: when:
- inventory_hostname in groups[keystone.group] - inventory_hostname in groups[keystone.group]
- name: Copying OpenID Identity Providers metadata - name: Templating OpenID Identity Providers metadata
vars: vars:
keystone: "{{ keystone_services['keystone'] }}" keystone: "{{ keystone_services['keystone'] }}"
become: true become: true
copy: template:
src: "{{ item.metadata_folder }}/" src: "{{ item.metadata_folder }}/"
dest: "{{ keystone_host_federation_oidc_metadata_folder }}" dest: "{{ keystone_host_federation_oidc_metadata_folder }}"
mode: "0660" mode: "0660"
...@@ -55,11 +55,11 @@ ...@@ -55,11 +55,11 @@
- item.certificate_file is defined - item.certificate_file is defined
- inventory_hostname in groups[keystone.group] - inventory_hostname in groups[keystone.group]
- name: Copying OpenStack Identity Providers attribute mappings - name: Templating OpenStack Identity Providers attribute mappings
vars: vars:
keystone: "{{ keystone_services['keystone'] }}" keystone: "{{ keystone_services['keystone'] }}"
become: true become: true
copy: template:
src: "{{ item.file }}" src: "{{ item.file }}"
dest: "{{ keystone_host_federation_oidc_attribute_mappings_folder }}/{{ item.file | basename }}" dest: "{{ keystone_host_federation_oidc_attribute_mappings_folder }}/{{ item.file | basename }}"
mode: "0660" mode: "0660"
......
...@@ -200,3 +200,8 @@ haproxy_external_single_frontend_options: ...@@ -200,3 +200,8 @@ haproxy_external_single_frontend_options:
- "timeout client {{ haproxy_glance_api_client_timeout }}" - "timeout client {{ haproxy_glance_api_client_timeout }}"
haproxy_glance_api_client_timeout: "6h" haproxy_glance_api_client_timeout: "6h"
################
# ProxySQL
################
mariadb_monitor_read_only_interval: ""
...@@ -32,6 +32,9 @@ mysql_variables: ...@@ -32,6 +32,9 @@ mysql_variables:
monitor_ping_interval: "{{ mariadb_monitor_ping_interval }}" monitor_ping_interval: "{{ mariadb_monitor_ping_interval }}"
monitor_ping_timeout: "{{ mariadb_monitor_ping_timeout }}" monitor_ping_timeout: "{{ mariadb_monitor_ping_timeout }}"
monitor_ping_max_failures: "{{ mariadb_monitor_ping_max_failures }}" monitor_ping_max_failures: "{{ mariadb_monitor_ping_max_failures }}"
{% if mariadb_monitor_read_only_interval | length > 0 %}
monitor_read_only_interval: {{ mariadb_monitor_read_only_interval }}
{% endif %}
monitor_connect_timeout: 6000 monitor_connect_timeout: 6000
connect_timeout_client: 100000 connect_timeout_client: 100000
connect_timeout_server: 30000 connect_timeout_server: 30000
......
...@@ -28,7 +28,7 @@ LogLevel info ...@@ -28,7 +28,7 @@ LogLevel info
<IfVersion >= 2.4> <IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion> </IfVersion>
ErrorLog "{{ log_dir }}/placement-api.log" ErrorLog "{{ log_dir }}/placement-api-error.log"
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
CustomLog "{{ log_dir }}/placement-api-access.log" logformat CustomLog "{{ log_dir }}/placement-api-access.log" logformat
<Directory {{ wsgi_directory }}> <Directory {{ wsgi_directory }}>
......
...@@ -83,7 +83,7 @@ following options on the first database node: ...@@ -83,7 +83,7 @@ following options on the first database node:
docker run --rm -it --volumes-from mariadb --name dbrestore \ docker run --rm -it --volumes-from mariadb --name dbrestore \
--volume mariadb_backup:/backup \ --volume mariadb_backup:/backup \
quay.io/openstack.kolla/centos-source-mariadb-server:|KOLLA_OPENSTACK_RELEASE| \ quay.io/openstack.kolla/mariadb-server:|KOLLA_OPENSTACK_RELEASE|-rocky-9 \
/bin/bash /bin/bash
(dbrestore) $ cd /backup (dbrestore) $ cd /backup
(dbrestore) $ rm -rf /backup/restore (dbrestore) $ rm -rf /backup/restore
...@@ -105,7 +105,7 @@ place, again on the first node: ...@@ -105,7 +105,7 @@ place, again on the first node:
docker run --rm -it --volumes-from mariadb --name dbrestore \ docker run --rm -it --volumes-from mariadb --name dbrestore \
--volume mariadb_backup:/backup \ --volume mariadb_backup:/backup \
quay.io/openstack.kolla/centos-source-mariadb-server:|KOLLA_OPENSTACK_RELEASE| \ quay.io/openstack.kolla/mariadb-server:|KOLLA_OPENSTACK_RELEASE|-rocky-9 \
/bin/bash /bin/bash
(dbrestore) $ rm -rf /var/lib/mysql/* (dbrestore) $ rm -rf /var/lib/mysql/*
(dbrestore) $ rm -rf /var/lib/mysql/\.[^\.]* (dbrestore) $ rm -rf /var/lib/mysql/\.[^\.]*
...@@ -148,7 +148,7 @@ incremental backup, ...@@ -148,7 +148,7 @@ incremental backup,
docker run --rm -it --volumes-from mariadb --name dbrestore \ docker run --rm -it --volumes-from mariadb --name dbrestore \
--volume mariadb_backup:/backup --tmpfs /backup/restore \ --volume mariadb_backup:/backup --tmpfs /backup/restore \
quay.io/openstack.kolla/centos-source-mariadb-server:|KOLLA_OPENSTACK_RELEASE| \ quay.io/openstack.kolla/mariadb-server:|KOLLA_OPENSTACK_RELEASE|-rocky-9 \
/bin/bash /bin/bash
(dbrestore) $ cd /backup (dbrestore) $ cd /backup
(dbrestore) $ rm -rf /backup/restore (dbrestore) $ rm -rf /backup/restore
......
---
fixes:
- |
Fixes Apache and placement writing to the same log file.
Apache placement VirtualHost ErrorLog has been renamed to
``placement-api-error.log`` (similar to other services).
`LP#[2095607] <https://launchpad.net/bugs/2095607>`__
---
fixes:
- |
Fixes a bug where the etcd3gw ``backend_url`` in cinder.conf would be
invalid when ``openstack_cacert`` was set.
`LP#2085908 <https://bugs.launchpad.net/kolla-ansible/+bug/2085908>`__
---
fixes:
- |
Fixes cyborg deployment, which was missing variables in order
to configure the haproxy listener.
`LP#2020088 <https://bugs.launchpad.net/kolla-ansible/+bug/2020088>`__
---
features:
- |
In the Keystone role files for the
``keystone_host_federation_oidc_metadata_folder`` and
``keystone_host_federation_oidc_attribute_mappings_folder`` directories
are now handled as templates. This relates to the OpenID Identity Providers
metadata and the OpenStack Identity Providers attribute mappings as part of
the identity federation with OIDC.
...@@ -11,6 +11,9 @@ network_address_family: "{{ address_family }}" ...@@ -11,6 +11,9 @@ network_address_family: "{{ address_family }}"
kolla_container_engine: "{{ container_engine }}" kolla_container_engine: "{{ container_engine }}"
docker_restart_policy: "no" docker_restart_policy: "no"
docker_apt_url: "http://{{ zuul_site_mirror_fqdn }}:8080/docker/{{ ansible_facts.distribution | lower }}"
docker_yum_url: "http://{{ zuul_site_mirror_fqdn }}:8080/docker/centos"
{% if container_engine == 'podman' %} {% if container_engine == 'podman' %}
podman_debug: true podman_debug: true
podman_registry_mirrors: podman_registry_mirrors:
...@@ -147,6 +150,10 @@ cinder_cluster_name: "kolla_ceph" ...@@ -147,6 +150,10 @@ cinder_cluster_name: "kolla_ceph"
glance_backend_ceph: "yes" glance_backend_ceph: "yes"
cinder_backend_ceph: "yes" cinder_backend_ceph: "yes"
nova_backend_ceph: "yes" nova_backend_ceph: "yes"
# RabbitMQ tuning
rabbitmq_cluster_partition_handling: "autoheal"
rabbitmq_extra_config:
cluster_keepalive_interval: 50000
# Redis for coordination # Redis for coordination
enable_redis: "yes" enable_redis: "yes"
...@@ -262,3 +269,7 @@ enable_skyline: "yes" ...@@ -262,3 +269,7 @@ enable_skyline: "yes"
enable_skyline: "yes" enable_skyline: "yes"
skyline_enable_sso: "yes" skyline_enable_sso: "yes"
{% endif %} {% endif %}
{% if groups['all'] | length > 1 %}
mariadb_monitor_read_only_interval: "30000"
{% endif %}