Skip to content

Commit 8edc80e

Browse files
Merge pull request #953 from bogdando/tripleo_passwords
Fix hardcoded tripleo passwords file
2 parents 4e79d28 + f4262b2 commit 8edc80e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

tests/roles/backend_services/tasks/ospdo_backend_services.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- name: get service passwords
22
ansible.builtin.shell: |
33
oc get secret tripleo-passwords -o jsonpath='{.data.*}' | base64 -d>~/tripleo-standalone-passwords.yaml
4-
cp ~/tripleo-standalone-passwords.yaml ~/overcloud-passwords.yaml
4+
cp ~/tripleo-standalone-passwords.yaml {{ tripleo_passwords['default'] | replace("~", "$HOME") }}
55
when: get_svc_pass| default(false) | bool
66

77
- name: get OSPdO storage storageClass

tests/roles/common_defaults/defaults/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ mariadb_passwords_env: |-
119119
mariadb_copy_shell_vars_src: |-
120120
{{ shell_header }}
121121
122-
PASSWORD_FILE="$HOME/overcloud-passwords.yaml"
122+
PASSWORD_FILE="{{ tripleo_passwords['default'] | replace("~", "$HOME") }}"
123123
124124
{{ mariadb_image_env }}
125125
{{ cells_env }}

0 commit comments

Comments
 (0)