From 0a1c270ff8d4509e1e84b75133b5dc1fc7c7bf68 Mon Sep 17 00:00:00 2001
From: mprahl <mprahl@redhat.com>
Date: Fri, 10 Nov 2017 09:51:37 -0500
Subject: [PATCH] Don't require Kerberos cache since we can't even use stage
 Koji to build modules anymore

---
 Vagrantfile           |  4 +---
 docker-compose.yml    |  8 --------
 docs/CONTRIBUTING.rst | 11 -----------
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 026df36e..fc6ad3c3 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,8 +3,7 @@
 
 $script = <<SCRIPT
     grep -q '^127\.0\.0\.1 fedmsg-relay$' /etc/hosts || echo "127.0.0.1 fedmsg-relay" >> /etc/hosts
-    echo "export KRB5CCNAME=FILE:/var/tmp/krbcc" > /etc/profile.d/module_build_service_developer_env.sh
-    echo "export MODULE_BUILD_SERVICE_DEVELOPER_ENV=1" >> /etc/profile.d/module_build_service_developer_env.sh
+    echo "export MODULE_BUILD_SERVICE_DEVELOPER_ENV=1" > /etc/profile.d/module_build_service_developer_env.sh
     source /etc/profile.d/module_build_service_developer_env.sh
     dnf install -y \
         fedmsg-hub \
@@ -52,7 +51,6 @@ Vagrant.configure("2") do |config|
   config.vm.synced_folder "./", "/tmp/module_build_service"
   # Disable the default share
   config.vm.synced_folder ".", "/vagrant", disabled: true
-  config.vm.provision "file", source: "/tmp/mbs-krbcc", destination: "/var/tmp/krbcc", run: "always"
   config.vm.network "forwarded_port", guest_ip: "0.0.0.0", guest: 5000, host: 5000
   config.vm.network "forwarded_port", guest_ip: "0.0.0.0", guest: 2001, host: 5001
   config.vm.network "forwarded_port", guest_ip: "0.0.0.0", guest: 13747, host: 13747
diff --git a/docker-compose.yml b/docker-compose.yml
index 90a4c210..3a8c163c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,16 +29,8 @@ services:
     command: bash -c "while [ ! -f /etc/module-build-service/.ready ] ; do sleep 1 ; done ; fedmsg-hub"
     links:
       - fedmsg-relay
-    environment:
-      # Check /var/tmp/krbcc and make sure that it is not a directory.  If it
-      # is, then delete it with 'sudo rm -rf /var/tmp/krbcc'.
-      # Initialize the file before running 'docker-compose up' with:
-      # $ KRB5CCNAME=FILE:/var/tmp/krbcc kinit YOUR_USERNAME@FEDORAPROJECT.ORG
-      - KRB5CCNAME=FILE:/var/tmp/krbcc
     volumes_from:
       - base
-    volumes:
-      - /tmp/mbs-krbcc:/var/tmp/krbcc:Z
 
   frontend:
     depends_on:
diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst
index 3d8149a2..c61313c1 100644
--- a/docs/CONTRIBUTING.rst
+++ b/docs/CONTRIBUTING.rst
@@ -53,17 +53,6 @@ refer to the `Running Tests` section first.
 We have two mechanisms for quickly setting up a development environment,
 `docker-compose` and `vagrant`.
 
-In order to to setup a development environment, it is required that you have
-your Fedora kerberos credentials generated in a *special location*. Before
-starting your development environment, run the following::
-
-    $ KRB5CCNAME=FILE:/tmp/mbs-krbcc kinit YOUR_USERNAME@STG.FEDORAPROJECT.ORG
-
-If you have problems in later steps with kerberos reading those credentials
-inside the `scheduler` container, you should check that `/var/tmp/krbcc` exists
-on your machine and that *it is not a directory*. Try removing it with `$ sudo
-rm -rf /var/tmp/krbcc` and running `kinit` again. Also, check for permissions
-and SELinux context of the credentials cache file.
 
 PDC and pdc-updater
 -------------------