From 646350c1d6dcd02c4dd939a220e231eedff5b055 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Mon, 27 Apr 2015 10:37:01 +0200
Subject: Remove keystoneclient.middleware

The code has been moved to the new keystonemiddleware project and
keystone.middleware was deprecated since Juno. It's time to drop it in
Mitaka.

Remove the directory keystoneclient/middleware/.

Remove test_auth_token_middleware.py, test_memcache_crypt.py and
test_s3_token_middleware.py in keystoneclient/tests/unit/.

Remove the create_middleware_cert shell function from
examples/pki/gen_pki.sh. And remove the call from
examples/pki/run_all.sh.

Remove netaddr, pycrypto and WebOb test dependencies, only needed to
test the removed middleware.

Closes-Bug: #1449066
Change-Id: Iedd6887dcde62177d37e1e1988ed72bcb59c05f6
---
 examples/pki/gen_pki.sh | 5 -----
 examples/pki/run_all.sh | 1 -
 2 files changed, 6 deletions(-)

(limited to 'examples')

diff --git a/examples/pki/gen_pki.sh b/examples/pki/gen_pki.sh
index b8b28f9..8e2b59f 100755
--- a/examples/pki/gen_pki.sh
+++ b/examples/pki/gen_pki.sh
@@ -191,11 +191,6 @@ function issue_certs {
   check_error $?
 }
 
-function create_middleware_cert {
-  cp $CERTS_DIR/ssl_cert.pem $CERTS_DIR/middleware.pem
-  cat $PRIVATE_DIR/ssl_key.pem >> $CERTS_DIR/middleware.pem
-}
-
 function check_openssl {
   echo 'Checking openssl availability ...'
   which openssl
diff --git a/examples/pki/run_all.sh b/examples/pki/run_all.sh
index ba2f0b6..2438ec7 100755
--- a/examples/pki/run_all.sh
+++ b/examples/pki/run_all.sh
@@ -26,6 +26,5 @@ generate_ca
 ssl_cert_req
 cms_signing_cert_req
 issue_certs
-create_middleware_cert
 gen_sample_cms
 cleanup
-- 
cgit v1.2.1