Skip to content

Commit a34e46e

Browse files
authored
Merge pull request #91 from stackhpc/proxysql-cert
Support Epoxy
2 parents ce69bb4 + 4ee2af2 commit a34e46e

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

ansible/files/multinode.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,11 @@ function generate_overcloud_certs() {
173173
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/vault-generate-internal-tls.yml
174174
encrypt_file $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/certificates/haproxy-internal.pem
175175

176+
# If ProxySQL certificate and key are generated, encrypt them
177+
for proxysql_item in $(ls -1 $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/certificates/proxysql-*); do
178+
encrypt_file $proxysql_item
179+
done
180+
176181
# Generate backend tls certificates
177182
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/vault-generate-backend-tls.yml
178183
for cert in $(ls -1 $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/certificates/*-key.pem); do
@@ -252,13 +257,15 @@ function build_kayobe_image() {
252257

253258
# Set base image for kayobe container. Use rocky 9 by default
254259
export BASE_IMAGE=rockylinux:9
260+
export USE_PYTHON_312=true
255261

256262
if [[ "$(sudo docker image ls)" == *"kayobe"* ]]; then
257263
echo "Image already exists skipping docker build"
258264
else
259265
sudo DOCKER_BUILDKIT=1 docker build \
260266
--network host \
261267
--build-arg BASE_IMAGE=$BASE_IMAGE \
268+
--build-arg USE_PYTHON_312=$USE_PYTHON_312 \
262269
--file ${config_directories[kayobe]}/.automation/docker/kayobe/Dockerfile \
263270
--tag kayobe:latest \
264271
${config_directories[kayobe]}

ansible/vars/defaults.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
src_directory: "{{ ansible_env.HOME }}/src"
33

44
kayobe_config_repo: https://github.com/stackhpc/stackhpc-kayobe-config.git
5-
kayobe_config_version: stackhpc/2024.1
5+
kayobe_config_version: stackhpc/2025.1
66
kayobe_config_name: kayobe-config
77
kayobe_config_environment: ci-multinode
88

0 commit comments

Comments
 (0)