From 08ed9d987334ef2b78d7f902cad1771df38e5dc3 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Mon, 28 Oct 2024 18:25:01 +0100
Subject: [PATCH] Remove ceph_yum_repo_url leftovers

With [1] the ceph_yum_repo_url was deprecated in favor of unified
ceph_repo_url variable, though it was not fully removed from
redhat vars, resulting in "variable not defined" error.

Also a type was made for defenition of yum repos at the same patch
that's being addressed now.

[1] https://review.opendev.org/c/openstack/openstack-ansible-ceph_client/+/929645

Change-Id: I971754edcf7cc58e67b91f726c4f16aa97374bb2
---
 tasks/ceph_preinstall_dnf.yml | 2 +-
 vars/redhat.yml               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasks/ceph_preinstall_dnf.yml b/tasks/ceph_preinstall_dnf.yml
index 3d45983..6fb56ad 100644
--- a/tasks/ceph_preinstall_dnf.yml
+++ b/tasks/ceph_preinstall_dnf.yml
@@ -59,7 +59,7 @@
     gpgkey: "{{ item.gpgkey | default(omit) }}"
     name: "{{ item.name }}"
     priority: "{{ item.priority | default(omit) }}"
-    state: "{{ item.enabled | default('present') }}"
+    state: "{{ item.state | default('present') }}"
   with_items: "{{ ceph_repos }}"
   register: install_repo
   until: install_repo  is success
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 7fdc8c8..151569e 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -47,7 +47,7 @@ _ceph_repos:
   - name: ceph
     description: "Ceph packages for $basearch"
     file: ceph
-    baseurl: "{{ ceph_yum_repo_url }}/el$releasever/$basearch"
+    baseurl: "{{ ceph_repo_url }}/el$releasever/$basearch"
     gpgcheck: yes
     enabled: yes
     priority: 50
@@ -55,7 +55,7 @@ _ceph_repos:
   - name: ceph-noarch
     description: "Ceph noarch packages"
     file: ceph
-    baseurl: "{{ ceph_yum_repo_url }}/el$releasever/noarch"
+    baseurl: "{{ ceph_repo_url }}/el$releasever/noarch"
     gpgcheck: yes
     enabled: yes
     priority: 50