Skip to content

Commit

Permalink
Also use a var when adding the node repo key
Browse files Browse the repository at this point in the history
  • Loading branch information
pescobar committed Mar 21, 2024
1 parent d6a9a1c commit 69bde0c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion defaults/main/install.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file holds install related configurations as well as base directories for
# configuration files.
# configuration files.

ood_base_conf_dir: "/etc/ood/config"
ood_app_dir: "{{ ood_base_apache_dir }}/apps"
Expand All @@ -23,6 +23,8 @@ apt_repo_url: "https://apt.osc.edu/ondemand/3.1/ondemand-release-web_3.1.1-{{ de
rpm_repo_key: "https://yum.osc.edu/ondemand/RPM-GPG-KEY-ondemand"
deb_repo_key: "https://apt.osc.edu/ondemand/DEB-GPG-KEY-ondemand"
deb_repo_key_id: "4B72FE2B92D31755"
node_repo_key: "https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
node_repo_key_id: "1655A0AB68576280"

ondemand_package: "ondemand" # Idempotent. Use `latest` to upgrade, or full package name or comparison operators.
ondemand_package_excludes: []
Expand Down
2 changes: 1 addition & 1 deletion tasks/install-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
when: ansible_os_family == "Debian"
loop:
- { url: "{{ deb_repo_key }}", id: "{{ deb_repo_key_id }}" }
- { url: "https://deb.nodesource.com/gpgkey/nodesource.gpg.key", id: "1655A0AB68576280" }
- { url: "{{ node_repo_key }}", id: "{{ node_repo_key_id }}" }

- name: Install the rpm repo
ansible.builtin.package:
Expand Down

0 comments on commit 69bde0c

Please sign in to comment.