From: Gary Lowell <gary.lowell@inktank.com>
Date: Thu, 27 Sep 2012 06:13:03 +0000 (-0700)
Subject: ceph-build:  Add distribution to ceph repo rpm name.
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd20bc0a3d5b934d9192deeb93c47dfcfa61d72e;p=ceph-build.git

ceph-build:  Add distribution to ceph repo rpm name.
---

diff --git a/gen_yum_repo.sh b/gen_yum_repo.sh
index 915740c5..055541b8 100755
--- a/gen_yum_repo.sh
+++ b/gen_yum_repo.sh
@@ -5,12 +5,13 @@
 #  Needs to be run after all the RPMs are built.
 
 usage() {
-    echo "usage: $0 releasedir keyid [repo-host]"
+    echo "usage: $0 releasedir keyid dist"
 }
 
 release_dir="$1"
 keyid="$2"
-repo_host="$3"
+dist="$3"
+repo_host=""
 
 [ -z "$release_dir" ] && echo specify release directory && exit 1
 #[ -z "$keyid" ] && echo specify keyid && exit 1
@@ -26,11 +27,11 @@ RPMBUILD=$release_dir
 cat <<EOF > $RPMBUILD/SPECS/ceph-release.spec
 Name:           ceph-release       
 Version:        1
-Release:        0
+Release:        0.$dist
 Summary:        Ceph repository configuration
 Group:          System Environment/Base 
 License:        GPLv2
-URL:            http://download.ceph.com/pub/ceph
+URL:            http://ceph.com/$dist
 Source0:        RPM-GPG-KEY-CEPH
 Source1:        ceph.repo	
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -83,8 +84,7 @@ chmod 644 $RPMBUILD/SOURCES/RPM-GPG-KEY-CEPH
 cat <<EOF > $RPMBUILD/SOURCES/ceph.repo
 [ceph]
 name=Ceph
-baseurl=http://gitbuilder-centos6-amd64.front.sepia.ceph.com/rpms/centos6/\$basearch
-failovermethod=priority
+baseurl=http://ceph.com/rpms/$dist/\$basearch
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CEPH
diff --git a/push_to_rpm_repo.sh b/push_to_rpm_repo.sh
index 360738f7..5609a345 100755
--- a/push_to_rpm_repo.sh
+++ b/push_to_rpm_repo.sh
@@ -29,7 +29,7 @@ for dist in `ls -1 $releasedir/$cephvers/rpm`
 do
     echo dist $dist
     # build and sign yum index in release directory
-    $bindir/gen_yum_repo.sh $releasedir/$cephvers/rpm/$dist $keyid
+    $bindir/gen_yum_repo.sh $releasedir/$cephvers/rpm/$dist $keyid $dist
     # stage the results
     for dir in $releasedir/$cephvers/rpm/$dist/RPMS/*
     do