fixes #14858 - removes gutterball (#213)

(cherry picked from commit d6a7aec)
Katello · May 27, 2016 · 226ba5c · 226ba5c
1 parent 3c071dc
commit 226ba5c
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 194 deletions.
diff --git a/comps/comps-katello-candlepin-server-rhel6.xml b/comps/comps-katello-candlepin-server-rhel6.xml
@@ -14,7 +14,6 @@
        <packagereq type="default">candlepin</packagereq>
        <packagereq type="default">candlepin-common</packagereq>
        <packagereq type="default">candlepin-selinux</packagereq>
-       <packagereq type="default">gutterball</packagereq>
     </packagelist>
   </group>
   <group>

diff --git a/comps/comps-katello-candlepin-server-rhel7.xml b/comps/comps-katello-candlepin-server-rhel7.xml
@@ -14,7 +14,6 @@
        <packagereq type="default">candlepin</packagereq>
        <packagereq type="default">candlepin-common</packagereq>
        <packagereq type="default">candlepin-selinux</packagereq>
-       <packagereq type="default">gutterball</packagereq>
     </packagelist>
   </group>
   <group>

diff --git a/comps/comps-katello-server-rhel6.xml b/comps/comps-katello-server-rhel6.xml
@@ -47,10 +47,6 @@
        <packagereq type="default">tfm-rubygem-terminal-table</packagereq>
        <packagereq type="default">tfm-rubygem-qpid_messaging</packagereq>
        <packagereq type="default">tfm-rubygem-hammer_cli_csv</packagereq>
-
-       <!-- gutterball packages -->
-       <packagereq type="default">tfm-rubygem-foreman_gutterball</packagereq>
-       <packagereq type="default">tfm-rubygem-hammer_cli_gutterball</packagereq>
     </packagelist>
   </group>
   <group>

diff --git a/comps/comps-katello-server-rhel7.xml b/comps/comps-katello-server-rhel7.xml
@@ -48,10 +48,6 @@
        <packagereq type="default">tfm-rubygem-terminal-table</packagereq>
        <packagereq type="default">tfm-rubygem-qpid_messaging</packagereq>
        <packagereq type="default">tfm-rubygem-hammer_cli_csv</packagereq>
-
-       <!-- gutterball packages -->
-       <packagereq type="default">tfm-rubygem-foreman_gutterball</packagereq>
-       <packagereq type="default">tfm-rubygem-hammer_cli_gutterball</packagereq>
     </packagelist>
   </group>
   <group>

diff --git a/katello/katello-backup b/katello/katello-backup
@@ -55,7 +55,6 @@ else
     '/etc/candlepin',
     '/etc/foreman',
     '/etc/foreman-proxy',
-    '/etc/gutterball',
     '/etc/hammer',
     '/etc/httpd',
     '/etc/foreman-installer',

diff --git a/katello/katello-remove b/katello/katello-remove
@@ -57,7 +57,6 @@ CONFIG_FILES=(
     /etc/tomcat
     /etc/squid
     /etc/puppet
-    /etc/gutterball
     /etc/qpid
     /etc/qpid-dispatch
     /etc/sysconfig/foreman.rpmsave
@@ -73,7 +72,6 @@ LOG_FILES=(
     /var/log/foreman
     /var/log/foreman-proxy
     /var/log/foreman-installer
-    /var/log/gutterball
     /var/log/tomcat
     /var/log/squid
     /var/log/capsule-certs-generate*
@@ -110,7 +108,6 @@ RPMS=(
     `rpm -qa | grep ^python-semantic-version`
     `rpm -qa | grep ^python-requests`
     `rpm -qa | grep ^python-isodate`
-    `rpm -qa | grep gutterball`
     `rpm -qa | grep $HOSTNAME`
     `rpm -qa | grep saslwrapper`
     `rpm -qa | grep ruby`
@@ -159,10 +156,8 @@ CONTENT=(
     /var/cache/candlepin
     /var/cache/foreman-proxy
     /var/cache/
-    /usr/bin/gutterball-db
     /opt/theforeman
     /var/www/html/pub/katello-rhsm-consumer
-    /tmp/gutterballkeystore.p12
 )
 
 katello-service stop

diff --git a/katello/katello.spec b/katello/katello.spec
@@ -114,8 +114,6 @@ Requires:       %{?scl_prefix}rubygem-hammer_cli
 Requires:       %{?scl_prefix}rubygem-hammer_cli_foreman
 Requires:       %{?scl_prefix}rubygem-hammer_cli_katello
 Requires:       %{?scl_prefix}rubygem-hammer_cli_import
-Requires:       %{?scl_prefix}rubygem-hammer_cli_gutterball
-Requires:       %{?scl_prefix}rubygem-foreman_gutterball
 Requires:       %{name}-debug
 Requires:       %{name}-service
 

diff --git a/rel-eng/packages/rubygem-foreman_gutterball b/rel-eng/packages/rubygem-foreman_gutterball
diff --git a/rel-eng/packages/rubygem-hammer_cli_gutterball b/rel-eng/packages/rubygem-hammer_cli_gutterball
diff --git a/rubygem-foreman_gutterball/foreman_gutterball-0.0.1.gem b/rubygem-foreman_gutterball/foreman_gutterball-0.0.1.gem
diff --git a/rubygem-foreman_gutterball/rubygem-foreman_gutterball.spec b/rubygem-foreman_gutterball/rubygem-foreman_gutterball.spec
diff --git a/rubygem-hammer_cli_gutterball/hammer_cli_gutterball-1.0.1.gem b/rubygem-hammer_cli_gutterball/hammer_cli_gutterball-1.0.1.gem
diff --git a/rubygem-hammer_cli_gutterball/rubygem-hammer_cli_gutterball.spec b/rubygem-hammer_cli_gutterball/rubygem-hammer_cli_gutterball.spec