From b190a75b2cb9a365be39dd39db5bd4c05c1ce109 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Tue, 26 Feb 2019 16:45:19 +0100
Subject: [PATCH] Remove python-keystonemiddleware Ubuntu Swift fix

The Swift Ubuntu packages has been updated to properly
depend on the python-keystonemiddleware package. [1]

[1] https://bugs.launchpad.net/bugs/1815093

Change-Id: Id7172f018a23444ab827c8eedde81e019316ab00
---
 manifests/repos.pp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/manifests/repos.pp b/manifests/repos.pp
index 8920d7049..1112f2248 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -120,13 +120,6 @@ class openstack_integration::repos {
   }
 
   if $::operatingsystem == 'Ubuntu' {
-    # NOTE(tobias-urdin): Remove this when Ubuntu 18.04 bionic-updates swift
-    # packages properly depends on python-keystonemiddleware (swift is still py2).
-    package { 'python-keystonemiddleware':
-      ensure => 'present',
-    }
-    Apt::Source<||> -> Package['python-keystonemiddleware']
-
     # TODO(tobias-urdin): Something changed in packages that was installed in puppet-nova
     # on Ubuntu so the rbd and rados python libs are not installed anymore.
     # Need to figure out a good place to add them back in, until then just testing with this.