Skip to content

Commit

Permalink
fix: idempotence
Browse files Browse the repository at this point in the history
  • Loading branch information
dometto committed Jul 22, 2024
1 parent 223c2d9 commit e406e6c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion tasks/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
name: galaxyproject.galaxy-tools
vars:
galaxy_tools_base_dir: "/home/{{ galaxy_user }}"
galaxy_tools_api_key: "{{ galaxy_config.galaxy.bootstrap_admin_api_key }}"
galaxy_tools_api_key: "{{ _galaxy_config.galaxy.bootstrap_admin_api_key }}"
galaxy_tools_create_bootstrap_user: true
galaxy_tools_delete_bootstrap_user: true
galaxy_tools_bootstrap_user_remote: true
Expand Down
4 changes: 2 additions & 2 deletions tasks/set_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
_galaxy_do_bootstrap: "{{ _galaxy_bootstrap and _galaxy_tool_files | length + _galaxy_workflow_files | length + _galaxy_custom_repo | length > 0}}"

- name: Generate a bootstrap key
when: _galaxy_do_bootstrap
when: _galaxy_do_bootstrap and not _molecule_idempotence
ansible.builtin.set_fact:
_galaxy_bootstrap_api_key: "{{ lookup('ansible.builtin.password', '/dev/null', chars=['ascii_lowercase', 'digits'], length=50) }}"

Expand All @@ -40,4 +40,4 @@
# _galaxy_config is then passed to the role in galaxysrv.yml
- name: Save _galaxy_config
ansible.builtin.set_fact:
_galaxy_config: "{{ galaxy_config }}"
_galaxy_config: "{{ galaxy_configuration }}"
2 changes: 1 addition & 1 deletion vars/galaxy_vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ galaxy_job_config:
tools:
- class: local # these special tools that aren't parameterized for remote execution - expression tools, upload, etc
environment: local_env
galaxy_config:
galaxy_configuration:
galaxy:
use_remote_user: true
allow_user_creation: true
Expand Down

0 comments on commit e406e6c

Please sign in to comment.