Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
dfang committed Jul 28, 2023
1 parent 50a19e4 commit 19f2b96
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 4 deletions.
22 changes: 21 additions & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,30 @@
- "ansible_distribution_version: {{ ansible_distribution_version }}"
- "ansible_pkg_mgr: {{ ansible_pkg_mgr }}"
- "ansible_user: {{ ansible_user }}"
tags:
- always

# - set_fact:
# ansible_ssh_user: "{{ lookup('env', 'SSH_USER') | default('deploy', true) }}"
# http_proxy: "{{ http_proxy | default(omit) }}"
# https_proxy: "{{ https_proxy | default(omit) }}"
# tags:
# - always

# - debug:
# var: http_proxy
# tags:
# - always

# - debug:
# var: https_proxy
# tags:
# - always

- name: Set facts
ansible.builtin.import_tasks: set-facts.yml
tags:
- always

- name: Install rtx
ansible.builtin.import_tasks: install-rtx.yml
Expand All @@ -26,7 +47,6 @@
- name: Install global dependencies
ansible.builtin.import_tasks: install-plugin-global-dependencies.yml
tags:
- package-cache
- plugin-dependencies

- name: Install plugin specific dependencies
Expand Down
3 changes: 0 additions & 3 deletions tasks/update-package-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# | amazonlinux2 | Amazon | RedHat | yum |

- name: Update package cache using apt (Ubuntu/Debian)
tags: always
ansible.builtin.apt:
update_cache: true
cache_valid_time: 3600
Expand All @@ -30,15 +29,13 @@
# when: ansible_os_family == "RedHat"

- name: Update package cache using dnf (CentOS8/Fedora/RockyLinux)
tags: always
ansible.builtin.dnf:
update_cache: true
changed_when: false
become: true
when: ansible_pkg_mgr == "dnf"

- name: Update package cache using yum (AmazonLinux2)
tags: always
ansible.builtin.yum:
update_cache: true
changed_when: false
Expand Down

0 comments on commit 19f2b96

Please sign in to comment.