Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OPSEXP-1699 Fix compatibility issue with Ansible 2.13 #416

Merged
merged 5 commits into from
Aug 26, 2022
Merged

OPSEXP-1699 Fix compatibility issue with Ansible 2.13 #416

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d1a57f
Fix compatibility issue with Ansible 2.13
gionn Aug 25, 2022
d45559b
Fix another compatibility issue with Ansible 2.13
gionn Aug 25, 2022
170dec5
quote everything
gionn Aug 25, 2022
1230233
another quoting fix
gionn Aug 25, 2022
b8674c9
and test
gionn Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions roles/repository/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@

- name: Set solr.sharedSecret property
set_fact:
temp_array: '{{ temp_array }} + [ ''-Dsolr.sharedSecret="{{ reposearch_shared_secret }}"'' ]'
temp_array: "{{ temp_array + [ '-Dsolr.sharedSecret=' ~ reposearch_shared_secret | quote ] }}"
when: acs.version is version('7.2.0', '>=')

- name: Set metadata-keystore.password and related properties
set_fact:
temp_array: '{{ temp_array }} + [
''-Dmetadata-keystore.password="{{ repo_custom_keystore_password }}"'',
''-Dmetadata-keystore.aliases=metadata'',
''-Dmetadata-keystore.metadata.password="{{ repo_custom_keystore_metadata_password }}"'',
]'
when: repo_custom_keystore_password is defined and repo_custom_keystore_metadata_password
temp_array: "{{ temp_array + [
'-Dmetadata-keystore.password=' ~ repo_custom_keystore_password | quote,
'-Dmetadata-keystore.aliases=metadata',
'-Dmetadata-keystore.metadata.password=' ~ repo_custom_keystore_metadata_password | quote
] }}"
when: repo_custom_keystore_password is defined and repo_custom_keystore_metadata_password is defined

- name: Combine secure acs environment
set_fact:
Expand All @@ -31,8 +31,8 @@

- name: Ensure a list of packages installed
become: true
package:
name: "{{ utils_repo }} + {{ utils_storage[cs_storage.type | default('tmpfs')] }}"
ansible.builtin.package:
name: "{{ utils_repo + utils_storage[cs_storage.type | default('tmpfs')] }}"
state: present

- name: Create folders
Expand Down
2 changes: 1 addition & 1 deletion tests/molecule/secrets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repo_db_password: alfresco
sync_db_password: alfresco
reposearch_shared_secret: alfresco
reposearch_shared_secret: alfresco with space
activemq_username: admin
activemq_password: admin