Skip to content

Commit 90b0148

Browse files
authored
Support OpenStack Epoxy multinode (#1724)
* Bump Ceph to v19.2.2 * Add test cinder_cluster_name for CI * Disable database internal/backend TLS Because of a SSL handshake bug with ProxySQL 2.7 [1], our use of intermediate CA breaks K-A database internal/backend TLS. Disabling them until either the bug fix is backported to 2.7 or K-A bumps it to version 3.x. [1] sysown/proxysql#4877 * Bump K-A to stackhpc/20.1.0.4 to fix LP#2105505 https://bugs.launchpad.net/kolla-ansible/+bug/2105505
1 parent e00d3f7 commit 90b0148

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

etc/kayobe/cephadm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cephadm_ceph_release: "squid"
1212
cephadm_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/ceph:{{ cephadm_image_tag }}"
1313

1414
# Ceph container image tag.
15-
cephadm_image_tag: "v19.2.1"
15+
cephadm_image_tag: "v19.2.2"
1616

1717
# HAProxy container image.
1818
cephadm_haproxy_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/haproxy:{{ cephadm_haproxy_image_tag }}"

etc/kayobe/environments/ci-multinode/kolla/globals.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ kolla_enable_tls_backend: "yes"
1515
# Enable RabbitMQ TLS
1616
rabbitmq_enable_tls: "yes"
1717

18+
# Disable database TLS
19+
database_enable_tls_internal: false
20+
database_enable_tls_backend: false
21+
1822
############################################################################
1923
# Most development environments will use nested virtualisation, and we can't
2024
# guarantee that nested KVM support is available. Use QEMU as a lowest common
@@ -67,3 +71,6 @@ designate_forwarders_addresses: "1.1.1.1; 8.8.8.8"
6771
# Open up ports in firewalld for services on the public API network.
6872
enable_external_api_firewalld: true
6973
external_api_firewalld_zone: "{{ public_net_name | net_zone }}"
74+
75+
# Test cinder cluster
76+
cinder_cluster_name: "stackhpc_test_cinder_cluster"

etc/kayobe/stackhpc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ stackhpc_kolla_source_version: stackhpc/20.1.0.3
149149

150150
# Kolla Ansible source repository.
151151
stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
152-
stackhpc_kolla_ansible_source_version: stackhpc/20.1.0.2
152+
stackhpc_kolla_ansible_source_version: stackhpc/20.1.0.4
153153

154154
###############################################################################
155155
# Container image registry

0 commit comments

Comments
 (0)