From 5d28cf0bdeb7e6ddce64ca0fcad2edd6f480c135 Mon Sep 17 00:00:00 2001
From: Chris Hawk <hawk@google.com>
Date: Fri, 26 Jul 2024 15:12:45 -0700
Subject: [PATCH 1/2] Update ansible-lint; exclude the submodule and stop
 excluding others

---
 .ansible-lint | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index c77c6a8..00c8c96 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -1,10 +1,10 @@
 ---
+profile: production
 parseable: true
 skip_list:
   - ANSIBLE0010
 use_default_rules: true
 verbosity: 1
 exclude_paths:
-  - ./roles/gcp_http_lb/
-  - ./tests/
-  - ./plugins
+  # Ignore submodule https://github.com/GoogleCloudPlatform/google-cloud-ops-agents-ansible
+  - roles/google-cloud-ops-agents-ansible/

From 3010182ade956bf9ddfa248dd9dc355ca401c748 Mon Sep 17 00:00:00 2001
From: Chris Hawk <hawk@google.com>
Date: Fri, 26 Jul 2024 15:17:30 -0700
Subject: [PATCH 2/2] Change RHEL yum references to dnf

---
 roles/gcloud/tasks/archive/command_completion.yml |  2 +-
 roles/gcloud/tasks/package/redhat.yml             | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/gcloud/tasks/archive/command_completion.yml b/roles/gcloud/tasks/archive/command_completion.yml
index 2772101..a130e33 100644
--- a/roles/gcloud/tasks/archive/command_completion.yml
+++ b/roles/gcloud/tasks/archive/command_completion.yml
@@ -10,7 +10,7 @@
   when: ansible_os_family == "Debian"
 
 - name: Gcloud | Archive | RedHat | Ensure bash completion is installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name:
       - bash-completion
   register: task_result
diff --git a/roles/gcloud/tasks/package/redhat.yml b/roles/gcloud/tasks/package/redhat.yml
index 8917561..156d545 100644
--- a/roles/gcloud/tasks/package/redhat.yml
+++ b/roles/gcloud/tasks/package/redhat.yml
@@ -1,18 +1,18 @@
 ---
-- name: Gcloud | RHEL | Add an Apt signing key, uses whichever key is at the URL
+# https://cloud.google.com/sdk/docs/install#rpm
+- name: Gcloud | RHEL | Add a dnf signing key, uses whichever key is at the URL
   ansible.builtin.yum_repository:
     name: google-cloud-sdk
     description: Google Cloud SDK
-    baseurl: https://packages.cloud.google.com/yum/repos/cloud-sdk-el7-x86_64
+    baseurl: https://packages.cloud.google.com/yum/repos/cloud-sdk-el9-x86_64
     enabled: true
     gpgcheck: true
-    repo_gpgcheck: true
+    repo_gpgcheck: false
     gpgkey:
-      - https://packages.cloud.google.com/yum/doc/yum-key.gpg
       - https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
 
 - name: Gcloud | RHEL | Install the google-cloud-sdk package
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: google-cloud-sdk
     update_cache: "yes"
   register: task_result
@@ -21,7 +21,7 @@
   delay: 2
 
 - name: Gcloud | Debian | Install the google-cloud-sdk additional components
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: google-cloud-sdk-{{ item }}
     update_cache: "yes"
   register: task_result