Skip to content

Commit df6135a

Browse files
committed
Update SKC playbook paths
SKC PR#1744 [1] changed the paths of playbooks that multinode.sh uses. Updated their paths accordingly. [1] stackhpc/stackhpc-kayobe-config#1744
1 parent 927c14d commit df6135a

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

ansible/files/multinode.sh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@ function copy_ca_to_seed() {
168168
}
169169

170170
function deploy_ceph() {
171-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/cephadm-deploy.yml
171+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ceph/cephadm-deploy.yml
172172
sleep 30
173-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/cephadm.yml
174-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/cephadm-gather-keys.yml
173+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ceph/cephadm.yml
174+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ceph/cephadm-gather-keys.yml
175175
}
176176

177177
function deploy_overcloud_vault() {
@@ -182,21 +182,21 @@ function deploy_overcloud_vault() {
182182
fi
183183

184184
# Deploy hashicorp vault to the controllers
185-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/secret-store-deploy-overcloud.yml
185+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/secret-store/secret-store-deploy-overcloud.yml
186186
# Encrypt either vault or openbao certificate keys
187187
encrypt_file $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/vault/overcloud-vault-keys.json
188188
encrypt_file $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/openbao/overcloud-openbao-keys.json
189189
}
190190

191191
function generate_overcloud_certs() {
192192
# Generate external tls certificates
193-
if [[ -f $KAYOBE_CONFIG_PATH/ansible/secret-store-generate-test-external-tls.yml ]]; then
194-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/secret-store-generate-test-external-tls.yml
193+
if [[ -f $KAYOBE_CONFIG_PATH/ansible/secret-store/secret-store-generate-test-external-tls.yml ]]; then
194+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/secret-store/secret-store-generate-test-external-tls.yml
195195
encrypt_file $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/certificates/haproxy.pem
196196
fi
197197

198198
# Generate internal tls certificates
199-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/secret-store-generate-internal-tls.yml
199+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/secret-store/secret-store-generate-internal-tls.yml
200200
encrypt_file $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/certificates/haproxy-internal.pem
201201

202202
# If ProxySQL certificate and key are generated, encrypt them
@@ -205,7 +205,7 @@ function generate_overcloud_certs() {
205205
done
206206

207207
# Generate backend tls certificates
208-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/secret-store-generate-backend-tls.yml
208+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/secret-store/secret-store-generate-backend-tls.yml
209209
for cert in $(ls -1 $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/certificates/*-key.pem); do
210210
encrypt_file $cert
211211
done
@@ -227,7 +227,7 @@ function generate_barbican_secrets() {
227227
decrypt_file $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/secrets.yml
228228
sed -i "s/secret_id:.*/secret_id: $(uuidgen)/g" $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/secrets.yml
229229
encrypt_file $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/secrets.yml
230-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/secret-store-deploy-barbican.yml
230+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/secret-store/secret-store-deploy-barbican.yml
231231
decrypt_file $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/secrets.yml
232232
sed -i "s/role_id:.*/role_id: $(cat /tmp/barbican-role-id)/g" $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/secrets.yml
233233
encrypt_file $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/secrets.yml
@@ -257,10 +257,10 @@ function deploy_wazuh() {
257257
run_kayobe infra vm host configure
258258

259259
# Deploy Wazuh
260-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/wazuh-secrets.yml
260+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/deployment/wazuh-secrets.yml
261261
encrypt_file $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/wazuh-secrets.yml
262-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/wazuh-manager.yml
263-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/wazuh-agent.yml
262+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/deployment/wazuh-manager.yml
263+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/deployment/wazuh-agent.yml
264264
}
265265

266266
function create_resources() {
@@ -387,8 +387,8 @@ function deploy_full() {
387387

388388
function upgrade_overcloud() {
389389
# Generate external tls certificates if it was previously disabled.
390-
if [[ -f $KAYOBE_CONFIG_PATH/ansible/secret-store-generate-test-external-tls.yml ]] && [[ ! -f $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/certificates/haproxy.pem ]]; then
391-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/secret-store-generate-test-external-tls.yml
390+
if [[ -f $KAYOBE_CONFIG_PATH/ansible/secret-store/secret-store-generate-test-external-tls.yml ]] && [[ ! -f $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/certificates/haproxy.pem ]]; then
391+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/secret-store/secret-store-generate-test-external-tls.yml
392392
encrypt_file $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/certificates/haproxy.pem
393393
fi
394394

@@ -416,14 +416,14 @@ function minor_upgrade() {
416416
set -f
417417
run_kayobe seed host package update --packages '*'
418418
set +f
419-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/reboot.yml --limit seed
419+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/maintenance/reboot.yml --limit seed
420420

421421
# Upgrade overcloud host packages
422422
run_kayobe overcloud host configure
423423
set -f
424424
run_kayobe overcloud host package update --packages '*'
425425
set +f
426-
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/reboot.yml --limit overcloud
426+
run_kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/maintenance/reboot.yml --limit overcloud
427427

428428
# Upgrade overcloud containers
429429
run_kayobe overcloud service deploy

0 commit comments

Comments
 (0)