From 691eef8e435af2eed1e94615b56491a9a1a6124b Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Wed, 5 Jul 2023 07:35:14 -0400 Subject: [PATCH] Update go role to support both apt and dnf --- data/ansible/calls/asterisk/main.yaml | 2 +- data/ansible/calls/freeswitch/main.yaml | 2 +- data/ansible/calls/kamailio/main.yaml | 2 +- data/ansible/copr.fedorainfracloud.org/main.yaml | 2 +- data/ansible/deb_packages/main.yaml | 2 +- data/ansible/docker/main.yaml | 2 +- data/ansible/drone/main.yaml | 2 +- data/ansible/integration_tests/main.yaml | 2 +- .../roles/{install_go => go}/defaults/main.yaml | 5 +++-- .../ansible/roles/{install_go => go}/tasks/main.yaml | 12 ++++++++++-- .../roles/{install_go => go}/templates/golang.sh.j2 | 0 data/ansible/rpm_packages/main.yaml | 2 +- 12 files changed, 22 insertions(+), 13 deletions(-) rename data/ansible/roles/{install_go => go}/defaults/main.yaml (89%) rename data/ansible/roles/{install_go => go}/tasks/main.yaml (82%) rename data/ansible/roles/{install_go => go}/templates/golang.sh.j2 (100%) diff --git a/data/ansible/calls/asterisk/main.yaml b/data/ansible/calls/asterisk/main.yaml index a32ab7e58..ac21b1144 100644 --- a/data/ansible/calls/asterisk/main.yaml +++ b/data/ansible/calls/asterisk/main.yaml @@ -4,7 +4,7 @@ tasks: - name: Install Go import_role: - name: ../../roles/install_go + name: ../../roles/go - name: Install and configure CGRateS import_role: diff --git a/data/ansible/calls/freeswitch/main.yaml b/data/ansible/calls/freeswitch/main.yaml index f22c732c9..05a71bcf7 100644 --- a/data/ansible/calls/freeswitch/main.yaml +++ b/data/ansible/calls/freeswitch/main.yaml @@ -7,7 +7,7 @@ name: ../../roles/install_freeswitch - name: Install Go import_role: - name: ../../roles/install_go + name: ../../roles/go - name: Install and config CGRateS import_role: diff --git a/data/ansible/calls/kamailio/main.yaml b/data/ansible/calls/kamailio/main.yaml index eaea9fcfb..e11fcee8c 100644 --- a/data/ansible/calls/kamailio/main.yaml +++ b/data/ansible/calls/kamailio/main.yaml @@ -7,7 +7,7 @@ - name: Install Go import_role: - name: ../../roles/install_go + name: ../../roles/go - name: Install and configure CGRateS import_role: diff --git a/data/ansible/copr.fedorainfracloud.org/main.yaml b/data/ansible/copr.fedorainfracloud.org/main.yaml index abd58e42c..3a8e1a988 100644 --- a/data/ansible/copr.fedorainfracloud.org/main.yaml +++ b/data/ansible/copr.fedorainfracloud.org/main.yaml @@ -16,7 +16,7 @@ state: present - name: Install Go import_role: - name: ../roles/install_go + name: ../roles/go - name: Create coprgate directory become: yes diff --git a/data/ansible/deb_packages/main.yaml b/data/ansible/deb_packages/main.yaml index f339f5987..8084dd02a 100644 --- a/data/ansible/deb_packages/main.yaml +++ b/data/ansible/deb_packages/main.yaml @@ -70,7 +70,7 @@ # Install Go - name: Install Go import_role: - name: ../roles/install_go + name: ../roles/go ########################################################################################################################### ########################################################################################################################### diff --git a/data/ansible/docker/main.yaml b/data/ansible/docker/main.yaml index 24bc658cb..928b04b73 100644 --- a/data/ansible/docker/main.yaml +++ b/data/ansible/docker/main.yaml @@ -75,7 +75,7 @@ # Install Go - name: Install Go import_role: - name: ../roles/install_go + name: ../roles/go ########################################################################################################################### ########################################################################################################################### diff --git a/data/ansible/drone/main.yaml b/data/ansible/drone/main.yaml index cfabfbf2b..27988d2e2 100644 --- a/data/ansible/drone/main.yaml +++ b/data/ansible/drone/main.yaml @@ -50,7 +50,7 @@ # Install Go - name: Install Go import_role: - name: ../roles/install_go + name: ../roles/go ########################################################################################################################### ########################################################################################################################### diff --git a/data/ansible/integration_tests/main.yaml b/data/ansible/integration_tests/main.yaml index b1b82ced1..49b7e9783 100644 --- a/data/ansible/integration_tests/main.yaml +++ b/data/ansible/integration_tests/main.yaml @@ -31,7 +31,7 @@ - name: Install Go import_role: - name: ../roles/install_go + name: ../roles/go - name: Install and configure CGRateS import_role: diff --git a/data/ansible/roles/install_go/defaults/main.yaml b/data/ansible/roles/go/defaults/main.yaml similarity index 89% rename from data/ansible/roles/install_go/defaults/main.yaml rename to data/ansible/roles/go/defaults/main.yaml index 80e7816ed..565ee438a 100644 --- a/data/ansible/roles/install_go/defaults/main.yaml +++ b/data/ansible/roles/go/defaults/main.yaml @@ -1,8 +1,9 @@ --- -# defaults for install_go +# Package manager to use +package_manager: apt # Go version to install -golang_version: 1.20.4 +golang_version: 1.20.5 # Expected go version output go_version_target: "go version go{{ golang_version }} linux/amd64" diff --git a/data/ansible/roles/install_go/tasks/main.yaml b/data/ansible/roles/go/tasks/main.yaml similarity index 82% rename from data/ansible/roles/install_go/tasks/main.yaml rename to data/ansible/roles/go/tasks/main.yaml index f9a002d76..6e1d4f292 100644 --- a/data/ansible/roles/install_go/tasks/main.yaml +++ b/data/ansible/roles/go/tasks/main.yaml @@ -4,13 +4,21 @@ ignore_errors: true register: go_version_output -- name: Install Go dependencies +- name: Install Go dependencies with apt become: yes apt: name: '{{ go_dependencies }}' state: present update_cache: yes - cache_valid_time: 86400 + when: package_manager == 'apt' + +- name: Install Go dependencies with dnf + become: yes + dnf: + name: '{{ go_dependencies }}' + state: present + update_cache: yes + when: package_manager == 'dnf' - name: Remove old installation of Go if needed become: yes diff --git a/data/ansible/roles/install_go/templates/golang.sh.j2 b/data/ansible/roles/go/templates/golang.sh.j2 similarity index 100% rename from data/ansible/roles/install_go/templates/golang.sh.j2 rename to data/ansible/roles/go/templates/golang.sh.j2 diff --git a/data/ansible/rpm_packages/main.yaml b/data/ansible/rpm_packages/main.yaml index c92919c08..f3046cd2c 100644 --- a/data/ansible/rpm_packages/main.yaml +++ b/data/ansible/rpm_packages/main.yaml @@ -164,7 +164,7 @@ # Install Go - name: Install Go import_role: - name: ../roles/install_go + name: ../roles/go ########################################################################################################################### ###########################################################################################################################