rpm/ceph
SHA256
1
0
Fork 0
forked from pool/ceph
Code Pull Requests Activity

Accepting request 1062103 from filesystems:ceph:pacific

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1062103
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=335
This commit is contained in:
Michael Fritch 2023-01-30 18:03:55 +00:00 committed by Git OBS Bridge
parent e44e54e022
commit 6af40582d8
7 changed files with 91 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-16.2.11-57-g9be7fb44a33.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c013cda690cdc7ceedcce37188be29edd5754faa856af109e7087a8e5a43fbf1
size 155886570

3
ceph-16.2.9-539-gea74dd900cd.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:56b655f66b8400cc81f6ca39f0d00cedfee8ab2b9aaf56137b539e2bcd8de6ac
size 155344965

31
ceph-test.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Fri Jan 27 09:47:26 UTC 2023 - Tim Serong <tserong@suse.com>
- Update to 16.2.11-57-g9be7fb44a33:
+ ceph.spec.in: Replace %usrmerged macro with regular version check
- checkin.sh: default to ses7p branch
-------------------------------------------------------------------
Fri Jan 27 00:45:39 UTC 2023 - Michael Fritch <michael.fritch@suse.com>
- Update to 16.2.11-56-gc067055f8f5:
+ (bsc#1199183) osd, tools, kv: non-aggressive, on-line trimming of accumulated dups
+ (bsc#1200262) ceph-volume: fix fast device alloc size on mulitple device
+ (bsc#1200501) cephadm: update monitoring container images
+ (bsc#1200978) mgr/dashboard: prevent alert redirect
+ (bsc#1201797) mgr/volumes: Add subvolumegroup resize cmd
+ (bsc#1201837) mgr/volumes: Fix subvolume discover during upgrade (CVE-2022-0670)
+ (bsc#1201976) monitoring/ceph-mixin: add RGW host to label info
+ (bsc#1202077) mgr/dashboard: enable addition of custom Prometheus alerts
+ (bsc#1203375) python-common: Add 'KB' to supported suffixes in SizeMatcher
+ (bsc#1204430) ceph-crash: drop privleges to run as "ceph" user, rather than root (CVE-2022-3650)
+ (bsc#1205025) rgw: Guard against malformed bucket URLs (CVE-2022-3854)
+ (bsc#1205436) mgr/dashboard: fix rgw connect when using ssl
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 6 04:06:27 UTC 2022 - Tim Serong <tserong@suse.com> Thu Oct 6 04:06:27 UTC 2022 - Tim Serong <tserong@suse.com>
@ -16,6 +40,7 @@ Wed Jul 13 07:18:02 UTC 2022 - Tim Serong <tserong@suse.com>
- Update to 16.2.9-536-g41a9f9a5573: - Update to 16.2.9-536-g41a9f9a5573:
+ (bsc#1195359, bsc#1200553) rgw: check bucket shard init status in RGWRadosBILogTrimCR + (bsc#1195359, bsc#1200553) rgw: check bucket shard init status in RGWRadosBILogTrimCR
+ (bsc#1194131) ceph-volume: honour osd_dmcrypt_key_size option (CVE-2021-3979) + (bsc#1194131) ceph-volume: honour osd_dmcrypt_key_size option (CVE-2021-3979)
+ (bsc#1196046) mgr/cephadm: try to get FQDN for configuration files
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 9 23:37:24 UTC 2022 - Tim Serong <tserong@suse.com> Thu Jun 9 23:37:24 UTC 2022 - Tim Serong <tserong@suse.com>
@ -37,6 +62,7 @@ Mon May 23 23:56:57 UTC 2022 - Michael Fritch <michael.fritch@suse.com>
+ (jsc#SES-2515) High-availability NFS export + (jsc#SES-2515) High-availability NFS export
+ (bsc#1196044) cephadm: prometheus: The generatorURL in alerts is only using hostname + (bsc#1196044) cephadm: prometheus: The generatorURL in alerts is only using hostname
+ (bsc#1196785) cephadm: avoid crashing on expected non-zero exit + (bsc#1196785) cephadm: avoid crashing on expected non-zero exit
+ (bsc#1187748) When an RBD is mapped, it is attempted to be deployed as an OSD.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 19 21:15:33 UTC 2022 - Michael Fritch <michael.fritch@suse.com> Tue Apr 19 21:15:33 UTC 2022 - Michael Fritch <michael.fritch@suse.com>
@ -92,6 +118,7 @@ Mon Jan 10 21:24:48 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
- Update to 16.2.7-37-gb3be69440db: - Update to 16.2.7-37-gb3be69440db:
+ (bsc#1194353) Downstream branding breaks dashboard npm build + (bsc#1194353) Downstream branding breaks dashboard npm build
+ (bsc#1188911) OSD marked down causes wrong backfill_toofull
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 12:57:53 UTC 2021 - Nathan Cutler <ncutler@suse.com> Tue Nov 22 12:57:53 UTC 2021 - Nathan Cutler <ncutler@suse.com>
@ -286,6 +313,9 @@ Thu Apr 1 15:10:47 UTC 2021 - Nathan Cutler <ncutler@suse.com>
- Update to 16.2.0-31-g5922b2b9c1: - Update to 16.2.0-31-g5922b2b9c1:
+ rebase on top of upstream v16.2.0 (first stable release in Pacific series) + rebase on top of upstream v16.2.0 (first stable release in Pacific series)
see https://ceph.io/releases/v16-2-0-pacific-released/ see https://ceph.io/releases/v16-2-0-pacific-released/
+ (bsc#1192838) cephadm: Fix iscsi client caps (allow mgr <service status> calls)
+ (bsc#1200317) mgr/cephadm: fix and improve osd draining
+ (bsc#1206158) add iscsi and nfs to upgrade process
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 26 10:14:59 UTC 2021 - Nathan Cutler <ncutler@suse.com> Fri Mar 26 10:14:59 UTC 2021 - Nathan Cutler <ncutler@suse.com>
@ -325,6 +355,7 @@ Wed Jan 27 15:17:14 UTC 2021 - Nathan Cutler <ncutler@suse.com>
- Update to 16.1.0-46-g571704f730 - Update to 16.1.0-46-g571704f730
+ rebase on top of upstream v16.1.0 (Pacific release candidate) + rebase on top of upstream v16.1.0 (Pacific release candidate)
+ (bsc#1192840) mgr/mgr_module.py: CLICommand: Fix parsing of kwargs arguments
+ drop obsolete downstream patches that were causing conflicts: + drop obsolete downstream patches that were causing conflicts:
* cephadm: use registry.suse.com by default * cephadm: use registry.suse.com by default
* cephadm: add global flag --container-init * cephadm: add global flag --container-init

17
ceph-test.spec
View File

@ -136,7 +136,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 16.2.9.539+gea74dd900cd Version: 16.2.11.57+g9be7fb44a33
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -152,7 +152,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
Group: System/Filesystems Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-16.2.9-539-gea74dd900cd.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-16.2.11-57-g9be7fb44a33.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
Source94: ceph-rpmlintrc Source94: ceph-rpmlintrc
Source95: checkin.sh Source95: checkin.sh
@ -595,12 +595,14 @@ This package contains Ceph benchmarks and test tools.
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%prep %prep
%autosetup -p1 -n ceph-16.2.9-539-gea74dd900cd %autosetup -p1 -n ceph-16.2.11-57-g9be7fb44a33
%build %build
# LTO can be enabled as soon as the following GCC bug is fixed: # Disable lto on systems that do not support symver attribute
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200 # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200 for details
%if ( 0%{?rhel} && 0%{?rhel} < 9 ) || ( 0%{?suse_version} && 0%{?suse_version} <= 1500 )
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
%endif
%if 0%{with seastar} && 0%{?rhel} %if 0%{with seastar} && 0%{?rhel}
. /opt/rh/gcc-toolset-9/enable . /opt/rh/gcc-toolset-9/enable
@ -787,7 +789,7 @@ touch %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
# firewall templates and /sbin/mount.ceph symlink # firewall templates and /sbin/mount.ceph symlink
%if 0%{?suse_version} && !0%{?usrmerged} %if 0%{?suse_version} && 0%{?suse_version} < 1550
mkdir -p %{buildroot}/sbin mkdir -p %{buildroot}/sbin
ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
%endif %endif
@ -892,6 +894,7 @@ rm -rf %{buildroot}%{_sbindir}/mount.ceph
rm -rf %{buildroot}/sbin/mount.ceph rm -rf %{buildroot}/sbin/mount.ceph
rm -rf %{buildroot}%{_bindir}/rbd-replay-prep rm -rf %{buildroot}%{_bindir}/rbd-replay-prep
rm -rf %{buildroot}%{_bindir}/ceph-post-file rm -rf %{buildroot}%{_bindir}/ceph-post-file
rm -rf %{buildroot}%{_libdir}/ceph/denc/denc-mod-*.so
rm -rf %{buildroot}%{_tmpfilesdir}/ceph-common.conf rm -rf %{buildroot}%{_tmpfilesdir}/ceph-common.conf
rm -rf %{buildroot}%{_mandir}/man8/ceph-authtool.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-authtool.8*
rm -rf %{buildroot}%{_mandir}/man8/ceph-conf.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-conf.8*
@ -1136,7 +1139,7 @@ rm -rf build
%endif %endif
%if ! 0%{?suse_version} %if ! 0%{?suse_version}
%endif %endif
%if 0%{?suse_version} && !0%{?usrmerged} %if 0%{?suse_version} && 0%{?suse_version} < 1550
%endif %endif
%if %{with lttng} %if %{with lttng}
%endif %endif

31
ceph.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Fri Jan 27 09:47:26 UTC 2023 - Tim Serong <tserong@suse.com>
- Update to 16.2.11-57-g9be7fb44a33:
+ ceph.spec.in: Replace %usrmerged macro with regular version check
- checkin.sh: default to ses7p branch
-------------------------------------------------------------------
Fri Jan 27 00:45:39 UTC 2023 - Michael Fritch <michael.fritch@suse.com>
- Update to 16.2.11-56-gc067055f8f5:
+ (bsc#1199183) osd, tools, kv: non-aggressive, on-line trimming of accumulated dups
+ (bsc#1200262) ceph-volume: fix fast device alloc size on mulitple device
+ (bsc#1200501) cephadm: update monitoring container images
+ (bsc#1200978) mgr/dashboard: prevent alert redirect
+ (bsc#1201797) mgr/volumes: Add subvolumegroup resize cmd
+ (bsc#1201837) mgr/volumes: Fix subvolume discover during upgrade (CVE-2022-0670)
+ (bsc#1201976) monitoring/ceph-mixin: add RGW host to label info
+ (bsc#1202077) mgr/dashboard: enable addition of custom Prometheus alerts
+ (bsc#1203375) python-common: Add 'KB' to supported suffixes in SizeMatcher
+ (bsc#1204430) ceph-crash: drop privleges to run as "ceph" user, rather than root (CVE-2022-3650)
+ (bsc#1205025) rgw: Guard against malformed bucket URLs (CVE-2022-3854)
+ (bsc#1205436) mgr/dashboard: fix rgw connect when using ssl
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 6 04:06:27 UTC 2022 - Tim Serong <tserong@suse.com> Thu Oct 6 04:06:27 UTC 2022 - Tim Serong <tserong@suse.com>
@ -16,6 +40,7 @@ Wed Jul 13 07:18:02 UTC 2022 - Tim Serong <tserong@suse.com>
- Update to 16.2.9-536-g41a9f9a5573: - Update to 16.2.9-536-g41a9f9a5573:
+ (bsc#1195359, bsc#1200553) rgw: check bucket shard init status in RGWRadosBILogTrimCR + (bsc#1195359, bsc#1200553) rgw: check bucket shard init status in RGWRadosBILogTrimCR
+ (bsc#1194131) ceph-volume: honour osd_dmcrypt_key_size option (CVE-2021-3979) + (bsc#1194131) ceph-volume: honour osd_dmcrypt_key_size option (CVE-2021-3979)
+ (bsc#1196046) mgr/cephadm: try to get FQDN for configuration files
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 9 23:37:24 UTC 2022 - Tim Serong <tserong@suse.com> Thu Jun 9 23:37:24 UTC 2022 - Tim Serong <tserong@suse.com>
@ -37,6 +62,7 @@ Mon May 23 23:56:57 UTC 2022 - Michael Fritch <michael.fritch@suse.com>
+ (jsc#SES-2515) High-availability NFS export + (jsc#SES-2515) High-availability NFS export
+ (bsc#1196044) cephadm: prometheus: The generatorURL in alerts is only using hostname + (bsc#1196044) cephadm: prometheus: The generatorURL in alerts is only using hostname
+ (bsc#1196785) cephadm: avoid crashing on expected non-zero exit + (bsc#1196785) cephadm: avoid crashing on expected non-zero exit
+ (bsc#1187748) When an RBD is mapped, it is attempted to be deployed as an OSD.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 19 21:15:33 UTC 2022 - Michael Fritch <michael.fritch@suse.com> Tue Apr 19 21:15:33 UTC 2022 - Michael Fritch <michael.fritch@suse.com>
@ -92,6 +118,7 @@ Mon Jan 10 21:24:48 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
- Update to 16.2.7-37-gb3be69440db: - Update to 16.2.7-37-gb3be69440db:
+ (bsc#1194353) Downstream branding breaks dashboard npm build + (bsc#1194353) Downstream branding breaks dashboard npm build
+ (bsc#1188911) OSD marked down causes wrong backfill_toofull
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 12:57:53 UTC 2021 - Nathan Cutler <ncutler@suse.com> Tue Nov 22 12:57:53 UTC 2021 - Nathan Cutler <ncutler@suse.com>
@ -286,6 +313,9 @@ Thu Apr 1 15:10:47 UTC 2021 - Nathan Cutler <ncutler@suse.com>
- Update to 16.2.0-31-g5922b2b9c1: - Update to 16.2.0-31-g5922b2b9c1:
+ rebase on top of upstream v16.2.0 (first stable release in Pacific series) + rebase on top of upstream v16.2.0 (first stable release in Pacific series)
see https://ceph.io/releases/v16-2-0-pacific-released/ see https://ceph.io/releases/v16-2-0-pacific-released/
+ (bsc#1192838) cephadm: Fix iscsi client caps (allow mgr <service status> calls)
+ (bsc#1200317) mgr/cephadm: fix and improve osd draining
+ (bsc#1206158) add iscsi and nfs to upgrade process
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 26 10:14:59 UTC 2021 - Nathan Cutler <ncutler@suse.com> Fri Mar 26 10:14:59 UTC 2021 - Nathan Cutler <ncutler@suse.com>
@ -325,6 +355,7 @@ Wed Jan 27 15:17:14 UTC 2021 - Nathan Cutler <ncutler@suse.com>
- Update to 16.1.0-46-g571704f730 - Update to 16.1.0-46-g571704f730
+ rebase on top of upstream v16.1.0 (Pacific release candidate) + rebase on top of upstream v16.1.0 (Pacific release candidate)
+ (bsc#1192840) mgr/mgr_module.py: CLICommand: Fix parsing of kwargs arguments
+ drop obsolete downstream patches that were causing conflicts: + drop obsolete downstream patches that were causing conflicts:
* cephadm: use registry.suse.com by default * cephadm: use registry.suse.com by default
* cephadm: add global flag --container-init * cephadm: add global flag --container-init

23
ceph.spec
View File

@ -136,7 +136,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 16.2.9.539+gea74dd900cd Version: 16.2.11.57+g9be7fb44a33
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -152,7 +152,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
Group: System/Filesystems Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-16.2.9-539-gea74dd900cd.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-16.2.11-57-g9be7fb44a33.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
# _insert_obs_source_lines_here # _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -562,6 +562,7 @@ Group: System/Filesystems
Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
Requires: ceph-grafana-dashboards = %{_epoch_prefix}%{version}-%{release} Requires: ceph-grafana-dashboards = %{_epoch_prefix}%{version}-%{release}
Requires: ceph-prometheus-alerts = %{_epoch_prefix}%{version}-%{release} Requires: ceph-prometheus-alerts = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-setuptools
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Requires: python%{python3_pkgversion}-cherrypy Requires: python%{python3_pkgversion}-cherrypy
Requires: python%{python3_pkgversion}-jwt Requires: python%{python3_pkgversion}-jwt
@ -611,6 +612,7 @@ Requires: python%{python3_pkgversion}-pecan
Requires: python%{python3_pkgversion}-pyOpenSSL Requires: python%{python3_pkgversion}-pyOpenSSL
Requires: python%{python3_pkgversion}-requests Requires: python%{python3_pkgversion}-requests
Requires: python%{python3_pkgversion}-dateutil Requires: python%{python3_pkgversion}-dateutil
Requires: python%{python3_pkgversion}-setuptools
%if 0%{?fedora} || 0%{?rhel} >= 8 %if 0%{?fedora} || 0%{?rhel} >= 8
Requires: python%{python3_pkgversion}-cherrypy Requires: python%{python3_pkgversion}-cherrypy
Requires: python%{python3_pkgversion}-pyyaml Requires: python%{python3_pkgversion}-pyyaml
@ -1208,12 +1210,14 @@ This package provides Ceph default alerts for Prometheus.
# common # common
################################################################################# #################################################################################
%prep %prep
%autosetup -p1 -n ceph-16.2.9-539-gea74dd900cd %autosetup -p1 -n ceph-16.2.11-57-g9be7fb44a33
%build %build
# LTO can be enabled as soon as the following GCC bug is fixed: # Disable lto on systems that do not support symver attribute
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200 # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200 for details
%if ( 0%{?rhel} && 0%{?rhel} < 9 ) || ( 0%{?suse_version} && 0%{?suse_version} <= 1500 )
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
%endif
%if 0%{with seastar} && 0%{?rhel} %if 0%{with seastar} && 0%{?rhel}
. /opt/rh/gcc-toolset-9/enable . /opt/rh/gcc-toolset-9/enable
@ -1400,7 +1404,7 @@ touch %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
# firewall templates and /sbin/mount.ceph symlink # firewall templates and /sbin/mount.ceph symlink
%if 0%{?suse_version} && !0%{?usrmerged} %if 0%{?suse_version} && 0%{?suse_version} < 1550
mkdir -p %{buildroot}/sbin mkdir -p %{buildroot}/sbin
ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
%endif %endif
@ -1553,8 +1557,7 @@ exit 0
%if ! 0%{?suse_version} %if ! 0%{?suse_version}
%postun -n cephadm %postun -n cephadm
userdel -r cephadm || true [ $1 -ne 0 ] || userdel cephadm || :
exit 0
%endif %endif
%files -n cephadm %files -n cephadm
@ -1580,13 +1583,15 @@ exit 0
%{_bindir}/rbd-replay-many %{_bindir}/rbd-replay-many
%{_bindir}/rbdmap %{_bindir}/rbdmap
%{_sbindir}/mount.ceph %{_sbindir}/mount.ceph
%if 0%{?suse_version} && !0%{?usrmerged} %if 0%{?suse_version} && 0%{?suse_version} < 1550
/sbin/mount.ceph /sbin/mount.ceph
%endif %endif
%if %{with lttng} %if %{with lttng}
%{_bindir}/rbd-replay-prep %{_bindir}/rbd-replay-prep
%endif %endif
%exclude %{_bindir}/ceph-post-file %exclude %{_bindir}/ceph-post-file
%dir %{_libdir}/ceph/denc
%{_libdir}/ceph/denc/denc-mod-*.so
%{_tmpfilesdir}/ceph-common.conf %{_tmpfilesdir}/ceph-common.conf
%{_mandir}/man8/ceph-authtool.8* %{_mandir}/man8/ceph-authtool.8*
%{_mandir}/man8/ceph-conf.8* %{_mandir}/man8/ceph-conf.8*

4
checkin.sh
View File

@ -24,7 +24,7 @@ function usage {
echo "Notes:" echo "Notes:"
echo " If existing clone is given, repo and branch are ignored." echo " If existing clone is given, repo and branch are ignored."
echo " Repo defaults to https://github.com/SUSE/ceph.git" echo " Repo defaults to https://github.com/SUSE/ceph.git"
echo " Branch defaults to ses6" echo " Branch defaults to ses7p"
exit 1 exit 1
} }
@ -61,7 +61,7 @@ eval set -- "$GETOPT"
EXISTING="" EXISTING=""
REPO="https://github.com/SUSE/ceph.git" REPO="https://github.com/SUSE/ceph.git"
BRANCH="ses6" BRANCH="ses7p"
while true ; do while true ; do
case "$1" in case "$1" in
-b|--branch) BRANCH="$2" ; shift 2 ;; -b|--branch) BRANCH="$2" ; shift 2 ;;