commit f41119e1ef3d973cc9e65263348caa438b6cbf58
Author: Lee Yarwood <lyarwood@redhat.com>
Date:   Wed Sep 23 12:08:38 2020 +0100

    dnf: Correctly configure repos
    
    I0eab8ad25112511b0c4dd4b7796b4cda821bca8b incorrectly attempted to write
    directly to the /etc/repos.d/ directory as the stack user. This isn't
    possible even with sudo so use the config-manager command to import
    locally written files as the stack user.
    
    Additionally ensure there is no whitespace at the start of each line
    within the files.
    
    Change-Id: I2fbc3b7c7df90328954eb4dcee921bd2ae9b2706

diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index 1596f08..dcae859 100755
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -881,66 +881,64 @@ function dnf_add_repository_ceph {
     local ceph_release=$1
     local distro_release=$2
 
-    cat >/etc/yum.repos.d/ceph.repo <<EOF
-    [ceph]
-    name=Ceph packages for \$basearch
-    baseurl=https://download.ceph.com/rpm-{ceph-release}/{distro}/\$basearch
-    enabled=1
-    priority=2
-    gpgcheck=1
-    gpgkey=https://download.ceph.com/keys/release.asc
-
-    [ceph-noarch]
-    name=Ceph noarch packages
-    baseurl=https://download.ceph.com/rpm-{ceph-release}/{distro}/noarch
-    enabled=1
-    priority=2
-    gpgcheck=1
-    gpgkey=https://download.ceph.com/keys/release.asc
-
-    [ceph-source]
-    name=Ceph source packages
-    baseurl=https://download.ceph.com/rpm-{ceph-release}/{distro}/SRPMS
-    enabled=0
-    priority=2
-    gpgcheck=1
-    gpgkey=https://download.ceph.com/keys/release.asc
+    cat > ceph.repo <<EOF
+[ceph]
+name=Ceph packages for \$basearch
+baseurl=https://download.ceph.com/rpm-${ceph_release}/${distro_release}/\$basearch
+enabled=1
+priority=2
+gpgcheck=1
+gpgkey=https://download.ceph.com/keys/release.asc
+
+[ceph-noarch]
+name=Ceph noarch packages
+baseurl=https://download.ceph.com/rpm-${ceph_release}/${distro_release}/noarch
+enabled=1
+priority=2
+gpgcheck=1
+gpgkey=https://download.ceph.com/keys/release.asc
+
+[ceph-source]
+name=Ceph source packages
+baseurl=https://download.ceph.com/rpm-${ceph_release}/${distro_release}/SRPMS
+enabled=0
+priority=2
+gpgcheck=1
+gpgkey=https://download.ceph.com/keys/release.asc
 EOF
-
-    sed -i -e "s/{ceph-release}/${ceph_release}/" -e "s/{distro}/${distro_release}/" /etc/yum.repos.d/ceph.repo
+    sudo dnf config-manager --add-repo ceph.repo
 }
 
 function dnf_add_repository_nfsganesha {
     local ganesha_release=$1
     local ceph_release=$2
 
-    cat >/etc/yum.repos.d/nfs-ganesha.repo <<EOF
-    [nfs-ganesha]
-    name=NFS Ganesha packages for \$basearch
-    baseurl=https://download.ceph.com/nfs-ganesha/{ganesha-release}/{ceph-release}/\$basearch
-    enabled=1
-    priority=2
-    gpgcheck=1
-    gpgkey=https://download.ceph.com/keys/release.asc
-
-    [nfs-ganesha-noarch]
-    name=NFS Ganesha noarch packages
-    baseurl=https://download.ceph.com/nfs-ganesha/{ganesha-release}/{ceph-release}/noarch
-    enabled=1
-    priority=2
-    gpgcheck=1
-    gpgkey=https://download.ceph.com/keys/release.asc
-
-    [nfs-ganesha-source]
-    name=NFS Ganesha source packages
-    baseurl=https://download.ceph.com/nfs-ganesha/{ganesha-release}/{ceph-release}/SRPMS
-    enabled=0
-    priority=2
-    gpgcheck=1
-    gpgkey=https://download.ceph.com/keys/release.asc
+    cat > nfs-ganesha.repo <<EOF
+[nfs-ganesha]
+name=NFS Ganesha packages for \$basearch
+baseurl=https://download.ceph.com/nfs-ganesha/${ganesha_release}/${ceph_release}/\$basearch
+enabled=1
+priority=2
+gpgcheck=1
+gpgkey=https://download.ceph.com/keys/release.asc
+
+[nfs-ganesha-noarch]
+name=NFS Ganesha noarch packages
+baseurl=https://download.ceph.com/nfs-ganesha/${ganesha_release}/${ceph_release}/noarch
+enabled=1
+priority=2
+gpgcheck=1
+gpgkey=https://download.ceph.com/keys/release.asc
+
+[nfs-ganesha-source]
+name=NFS Ganesha source packages
+baseurl=https://download.ceph.com/nfs-ganesha/${ganesha_release}/${ceph_release}/SRPMS
+enabled=0
+priority=2
+gpgcheck=1
+gpgkey=https://download.ceph.com/keys/release.asc
 EOF
-
-    sed -i -e "s/{ganesha-release}/${ganesha_release}/" -e "s/{ceph-release}/${ceph_release}/" /etc/yum.repos.d/nfsganesha.repo
+    sudo dnf config-manager --add-repo nfs-ganesha.repo
 }
 
 # configure_repo_ceph() - Configure Ceph repositories