Skip to content

Commit e20605d

Browse files
committed
Fix designate/TLS integration
When designate is deployed with the new internal TLS configuration, the first service deploy will fail if the barbican role IDs are undefined. This change assumes that secrets.yml already exists and replaces the contents rather than creating it from scratch.
1 parent 9b0f372 commit e20605d

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

templates/deploy-openstack.tpl

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ set +x
4242
export KAYOBE_VAULT_PASSWORD=$(cat ~/vault.password)
4343
set -x
4444

45+
# Install uuidgen on ubuntu
46+
if $(which apt 2>/dev/null >/dev/null); then
47+
sudo apt update
48+
sudo apt -y install uuidgen
49+
fi
50+
4551
# Configure hosts
4652
kayobe control host bootstrap
4753
kayobe seed host configure
@@ -83,16 +89,11 @@ sed -i 's/# kolla_enable_tls_internal: true/kolla_enable_tls_internal: true/g' $
8389
cat $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/globals-tls-config.yml >> $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/globals.yml
8490

8591
# Create vault configuration for barbican
86-
cat << EOF >> $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/secrets.yml
87-
---
88-
secrets_barbican_approle_secret_id: $(uuidgen)
89-
EOF
92+
sed -i "s/secret_id:.*/secret_id: $(uuidgen)/g" KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/secrets.yml
9093
ansible-vault encrypt --vault-password-file ~/vault.password $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/secrets.yml
9194
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/vault-deploy-barbican.yml
9295
ansible-vault decrypt --vault-password-file ~/vault.password $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/secrets.yml
93-
cat << EOF >> $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/secrets.yml
94-
secrets_barbican_approle_role_id: $(cat /tmp/barbican-role-id)
95-
EOF
96+
sed -i "s/role_id:.*/role_id: $(cat /tmp/barbican-role-id)/g" KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/secrets.yml
9697
ansible-vault encrypt --vault-password-file ~/vault.password $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/secrets.yml
9798
rm /tmp/barbican-role-id
9899

0 commit comments

Comments
 (0)