Removes previous patch for osc auth

This should be fixed now upstream

Change-Id: I84e4da5576f54401e8085be9d0dcab7b493c6496
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/build/osc_auth_fix.diff b/build/osc_auth_fix.diff
deleted file mode 100644 (file)
index 29aee3f..0000000
--- a/build/osc_auth_fix.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From fc370104156810cb4f65a3235d6bf6ab65f028bd Mon Sep 17 00:00:00 2001
-From: Boris Bobrov <bbobrov@mirantis.com>
-Date: Thu, 17 Nov 2016 13:46:21 +0300
-Subject: [PATCH] Use project_domain_id only in password auth
-
-The method being changed constructs domain-related parameters that will
-further be passed to the auth plugin. If project domain is not
-passed, the method sets it to the default domain.
-
-token_endpoint does not expect any information about domain,
-because it uses only a token and URL. Passing it to auth plugin causes
-an exception.
-
-Construct domain-related parameters only for specific plugins, such
-as password or totp.
-
-Change-Id: I13db3bbe31a0ed843e9f4528d37c768546e2bee9
-Closes-Bug: 1642301
-(cherry picked from commit e51a8d63747932f2ee4ffab02dfb0cd43e4a103d)
----
-
-diff --git a/openstackclient/common/client_config.py b/openstackclient/common/client_config.py
-index 895909e..e23b07b 100644
---- a/openstackclient/common/client_config.py
-+++ b/openstackclient/common/client_config.py
-@@ -148,6 +148,7 @@
-             # present, then do not change the behaviour. Otherwise, set the
-             # PROJECT_DOMAIN_ID to 'OS_DEFAULT_DOMAIN' for better usability.
-             if (
-+                    auth_type in ("password", "v3password", "v3totp") and
-                     not config['auth'].get('project_domain_id') and
-                     not config['auth'].get('project_domain_name')
-             ):

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 81e23aa..1264430 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -145,8 +145,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --mkdir /etc/puppet/modules/neutron/lib/puppet/provider/neutron_agent_vpp \
     --upload ${BUILD_ROOT}/puppet-neutron/lib/puppet/provider/neutron_agent_vpp/ini_setting.rb:/etc/puppet/modules/neutron/lib/puppet/provider/neutron_agent_vpp/ \
     --run-command "sed -i -E 's/timeout=[0-9]+/timeout=60/g' /usr/share/openstack-puppet/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb" \
-    --upload ${BUILD_ROOT}/osc_auth_fix.diff:/tmp/ \
-    --run-command "cd /usr/lib/python2.7/site-packages/ && git apply /tmp/osc_auth_fix.diff" \
     -a overcloud-full_build.qcow2
 
 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2