Attachment 1458786 Details for Bug 1598522 – Revert "DAEMON_PACKAGES: Adding rook package"

[patch] Revert "DAEMON_PACKAGES: Adding rook package"

0001-Revert-DAEMON_PACKAGES-Adding-rook-package.patch (text/plain), 2.12 KB, created by Ken Dreyer (Red Hat) on 2018-07-13 20:48:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ken Dreyer (Red Hat)

Created: 2018-07-13 20:48:43 UTC

Size: 2.12 KB

patch

obsolete

>From d20f309119c30840c62706f89aa83ce5b403c5cd Mon Sep 17 00:00:00 2001
>From: Ken Dreyer <kdreyer@redhat.com>
>Date: Fri, 13 Jul 2018 14:44:19 -0600
>Subject: [PATCH] Revert "DAEMON_PACKAGES: Adding rook package"
>
>This reverts commit 4765d7fdbec44ab9acc14fce614398dd737b1334.
>
>The "rook" RPM Requires ceph-mon, ceph-osd, and ceph-mgr, which causes
>Pungi to pull these packages into the RHCS Tools repository.
>
>Revert the rook addition to the RHCS container so we can remove Rook for
>RHCS 3.1. When the rook packaging is fixed in
>https://bugzilla.redhat.com/show_bug.cgi?id=1598522 we can add it back
>in.
>---
> ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_INSTALL__         | 2 +-
> ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ | 2 +-
> ceph-releases/ALL/rhel7/daemon-base/__ROOK_PACKAGES__              | 1 -
> 3 files changed, 2 insertions(+), 3 deletions(-)
> delete mode 100644 ceph-releases/ALL/rhel7/daemon-base/__ROOK_PACKAGES__
>
>diff --git a/ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_INSTALL__
>index b425739..c5836a0 100644
>--- a/ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_INSTALL__
>+++ b/ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_INSTALL__
>@@ -1,3 +1,3 @@
> yum update -y && \
> yum install -y wget unzip util-linux python-setuptools udev device-mapper && \
>-yum install -y __CEPH_BASE_PACKAGES__ __ROOK_PACKAGES__
>+yum install -y __CEPH_BASE_PACKAGES__
>diff --git a/ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ b/ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__
>index a243d55..0fea829 100644
>--- a/ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__
>+++ b/ceph-releases/ALL/rhel7/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__
>@@ -1 +1 @@
>-rpm -q __CEPH_BASE_PACKAGES__ __ROOK_PACKAGES__
>+rpm -q __CEPH_BASE_PACKAGES__
>diff --git a/ceph-releases/ALL/rhel7/daemon-base/__ROOK_PACKAGES__ b/ceph-releases/ALL/rhel7/daemon-base/__ROOK_PACKAGES__
>deleted file mode 100644
>index 124f03a..0000000
>--- a/ceph-releases/ALL/rhel7/daemon-base/__ROOK_PACKAGES__
>+++ /dev/null
>@@ -1 +0,0 @@
>-rook rook-rookflex
>-- 
>2.14.4
>

Actions: View | Diff

Attachments on bug 1598522: 1458786