diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-12-06 12:58:55 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-12-08 21:52:32 -0500 |
| commit | 58a098e08ec131338b0c29b902472c54b2a26168 (patch) | |
| tree | 8fb5727e1511d1114cd5b60f0659d624105b4542 /build/osc_auth_fix.diff | |
| parent | 9131b0a81c22e713b4d4798d7ff32254be3b99e3 (diff) | |
Fixes and cleans up build/cache directory usage
Changes include:
- Building is isolated to a .build directory that is git ignored
- Caching is isolated to a .cache directory that is git ignored
- Build scripts have been variablized, and relative paths have been
removed
- Unused files removed
- build.sh, make file cleaned up
- Fixed broken building of markupsafe and jinja2 packages
- make clean-cache will remove the cache now
- per item cleans are removed in place of simple clean .build now
- includes fix for OSC issue with LP# 1642301
Change-Id: I42b8e4eb694bf0a2c398858814f8b73785931896
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/osc_auth_fix.diff')
| -rw-r--r-- | build/osc_auth_fix.diff | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/build/osc_auth_fix.diff b/build/osc_auth_fix.diff new file mode 100644 index 00000000..29aee3f8 --- /dev/null +++ b/build/osc_auth_fix.diff @@ -0,0 +1,33 @@ +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') + ): |