diff -pruN 2.1.0-1/AUTHORS 2.1.0-0ubuntu3/AUTHORS
--- 2.1.0-1/AUTHORS	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-0ubuntu3/AUTHORS	2020-04-02 18:38:17.000000000 +0000
@@ -0,0 +1,82 @@
+Alex Gaynor <alex.gaynor@gmail.com>
+Alexander D <maniac@pzskc383.dp.ua>
+Alvaro Lopez Garcia <aloga@ifca.unican.es>
+Andreas Jaeger <aj@suse.com>
+Andy Botting <andy@andybotting.com>
+Anita Kuno <anteaya@anteaya.info>
+Arie Bregman <abregman@redhat.com>
+Artem Goncharov <artem.goncharov@gmail.com>
+Cao Xuan Hoang <hoangcx@vn.fujitsu.com>
+Cedric Brandily <zzelle@gmail.com>
+ChangBo Guo(gcb) <eric.guo@easystack.cn>
+Charles Short <chucks@redhat.com>
+Chris Church <chris@ninemoreminutes.com>
+Christian Berendt <berendt@betacloud-solutions.de>
+Clark Boylan <clark.boylan@gmail.com>
+Clint Byrum <clint@fewbar.com>
+Colleen Murphy <colleen@gazlene.net>
+Corey Bryant <corey.bryant@canonical.com>
+Dao Cong Tien <tiendc@vn.fujitsu.com>
+David Shrewsbury <shrewsbury.dave@gmail.com>
+Davide Guerri <davide.guerri@gmail.com>
+Dean Troyer <dtroyer@gmail.com>
+Dean Troyer <dtroyer@users.noreply.github.com>
+Dirk Mueller <dirk@dmllr.de>
+Dmitry Tantsur <dtantsur@protonmail.com>
+Doug Hellmann <doug@doughellmann.com>
+Doug Wiegley <doug@parksidesoftware.com>
+Eric Harney <eharney@redhat.com>
+Flavio Percoco <flaper87@gmail.com>
+Ghe Rivero <ghe.rivero@hp.com>
+Gregory Haynes <greg@greghaynes.net>
+Ilya Shakhat <ishakhat@mirantis.com>
+James E. Blair <jeblair@linux.vnet.ibm.com>
+James E. Blair <jeblair@redhat.com>
+Jamie Lennox <jamielennox@gmail.com>
+Javier Pena <jpena@redhat.com>
+Jeremy Stanley <fungi@yuggoth.org>
+Jim Rollenhagen <jim@jimrollenhagen.com>
+John Dennis <jdennis@redhat.com>
+Jordan Pittier <jordan.pittier@scality.com>
+Joshua Harlow <jxharlow@godaddy.com>
+Julia Kreger <juliaashleykreger@gmail.com>
+LiuNanke <nanke.liu@easystack.cn>
+Logan V <logan2211@gmail.com>
+Mathieu Gagné <mgagne@iweb.com>
+Matthew Booth <mbooth@redhat.com>
+Mohammed Naser <mnaser@vexxhost.com>
+Monty Taylor <mordred@inaugust.com>
+Nick Jones <nick@stackhpc.com>
+OpenStack Release Bot <infra-root@openstack.org>
+Paulo Matias <matias@ufscar.br>
+Pavlo Shchelokovskyy <shchelokovskyy@gmail.com>
+Saju <sanjufoss@gmail.com>
+Sean Handley <sean.handley@gmail.com>
+Sean McGinnis <sean.mcginnis@gmail.com>
+Shuquan Huang <huang.shuquan@99cloud.net>
+Simon Leinen <simon.leinen@switch.ch>
+Spencer Krum <nibz@spencerkrum.com>
+Steve Martinelli <s.martinelli@gmail.com>
+Steve Martinelli <stevemar@ca.ibm.com>
+TerryHowe <terrylhowe@gmail.com>
+Thomas Bechtold <tbechtold@suse.com>
+Tim Burke <tim.burke@gmail.com>
+Tony Xu <hhktony@gmail.com>
+Vieri <15050873171@163.com>
+Xav Paice <xav@catalyst.net.nz>
+XiaojueGuan <guanalbertjone@gmail.com>
+Yaguang Tang <yaguang@umcloud.com>
+Yuriy Taraday <yorik.sar@gmail.com>
+ZhijunWei <wzj334965317@outlook.com>
+avnish <avnish.pal@nectechnologies.in>
+brandonzhao <zhaolong@inspur.com>
+jacky06 <zhang.min@99cloud.net>
+lifeless <robertc@robertcollins.net>
+lingyongxu <lyxu@fiberhome.com>
+malei <malei@maleideMacBook-Pro.local>
+pengyuesheng <pengyuesheng@gohighsec.com>
+qingszhao <zhao.daqing@99cloud.net>
+ricolin <rico.lin@easystack.cn>
+xhzhf <guoyongxhzhf@163.com>
+zhouxinyong <zhouxinyong@inspur.com>
+zhulingjie <easyzlj@gmail.com>
diff -pruN 2.1.0-1/ChangeLog 2.1.0-0ubuntu3/ChangeLog
--- 2.1.0-1/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-0ubuntu3/ChangeLog	2020-04-02 18:38:17.000000000 +0000
@@ -0,0 +1,711 @@
+CHANGES
+=======
+
+2.1.0
+-----
+
+* Use unittest.mock instead of third party mock
+* Uncap jsonschema
+
+2.0.0
+-----
+
+* Add a release note for Python 2 support removal
+* Fix pep8 issue in o\_c\_c/\_\_init\_\_
+* Stop testing python2.7
+* Update the constraints url
+* Update master for stable/train
+
+1.33.0
+------
+
+* Fix broken link to openstacksdk
+* Add Python 3 Train unit tests
+* Update for opendev
+* OpenDev Migration Patch
+* Update master for stable/stein
+* Update hacking version
+
+1.32.0
+------
+
+* Applying the HTTPS protocal in configuration.rst
+* Use template for lower-constraints
+* Change openstack-dev to openstack-discuss
+* Update min tox version to 2.0
+* Fix the conflict of urlparse between python2 and python3
+* Remove setup.py check from pep8 job
+* Change python3.5 job to python3.7 job on Stein+
+* fix bug link in readme
+* fix bug link in readme
+* add lib-forward-testing-python3 test job
+* add python 3.6 unit test job
+* switch documentation job to new PTI
+* import zuul job settings from project-config
+* Update reno for stable/rocky
+* Invalid link of doc reference
+* Add release note link in README
+* Shift Limestone Networks profile to openstacksdk
+* Update links in README
+
+1.31.2
+------
+
+* fix tox python3 overrides
+* Remove app\_name config tests
+* Add release note for the vendor data regression
+* fix saltstack breakage introduced in v1.31.0
+* Remove service-type override tests
+* Fix F405 additional strictness
+
+1.31.1
+------
+
+* Add cache methods back to OpenSackConfig
+* fix link to openstacksdk in deprecation block
+
+1.31.0
+------
+
+* Replace guts with openstack.config
+
+1.30.0
+------
+
+* Remove DataCentred from list of vendors
+* add lower-constraints job
+* Add Limestone Networks vendor info
+* Rename python-openstacksdk to openstacksdk
+* pypy is not checked at gate
+* Add image\_format for VEXXHOST profile
+* Updated from global requirements
+* Use 'none' auth plugin
+* Updated from global requirements
+* Add os-client-config tips jobs
+* Updated from global requirements
+* Add osc tips jobs back
+* Add missing auth url from betacloud to docs
+* Update reno for stable/queens
+* Updated from global requirements
+
+1.29.0
+------
+
+* Updated from global requirements
+* Split docs requirements and update tox.ini
+* Zuul: Remove project name
+* Add betacloud to the vendors
+* Make the get\_service\_type() overrides tolernat of no defaults
+* Remove osc devstack tips jobs
+* Do not apply format expansions to passwords
+* Updated from global requirements
+* Remove setting of version/release from releasenotes
+* Add shade-functional-tips jobs
+* Consume the osc-functional-devstack-tips job
+* Fix doc typo
+* Added nat\_source flag for networks
+* Add shade-tox-tips jobs
+* Update make\_rest\_client to work with version discovery
+* Protect against p\_opt not having prompt attribute
+* Treat clouds.yaml with one cloud like envvars
+* Updated from global requirements
+* Fix requires\_floating\_ip
+* Updates for stestr
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* DataCentred supports Keystone V3 and Glance V2
+* Update globals safely
+* Update the documentation link for doc migration
+* Remove OSIC
+* Update reno for stable/pike
+* Updated from global requirements
+* Manually sync with g-r
+
+1.28.0
+------
+
+* use openstackdocstheme html context
+* switch from oslosphinx to openstackdocstheme
+* turn on warning-is-error in documentation build
+* rearrange existing documentation to follow the new standard layout
+* Don't pop from os.environ
+* Keep a singleton to support multiple get\_config calls
+* Revert "Revert "Use interface not endpoint\_type for keystoneclient""
+* Revert "Use interface not endpoint\_type for keystoneclient"
+* Add ironicclient to constructors list
+* Add helper method to fetch service catalog
+* Fix interactions with keystoneauth from newton
+
+1.27.0
+------
+
+* Make \_fix\_argv() somewhat compatible with Argparse action='append'
+* Add ability to pass in user\_agent
+* Docs: add a note about rackspace API keys
+* Remove out of date comment
+* Stop special-casing idenity catalog lookups
+* Add designateclient to constructors list
+* OVH supports qcow2
+* Use interface not endpoint\_type for keystoneclient
+* Add support for bailing on invalid service versions
+* modify test-requirement according to requirements project
+* [Fix gate]Update test requirement
+* Pass ironic microversion through from api\_version
+* Add ability to skip yaml loading
+* Remove the keystoneclient auth fallback
+* Add support for overriding mistral service type
+* Add helper scripts to print version discovery info
+* Add support for indicating required floating IPs
+* Update reno for stable/ocata
+* fix location of team tags in README
+* Fix typo for baremetal\_service\_type
+
+1.26.0
+------
+
+* Revert "Fix interface\_key for identity clients"
+* Add support for Murano
+
+1.25.0
+------
+
+* Add OpenTelekomCloud to the vendors
+* Remove 3.4 from tox envlist
+* Use upper-constraints for tox envs
+* Update swift constructor to be Session aware
+* Magnum's service\_type is container\_infra
+* Add docutils contraint on 0.13.1 to fix building
+* Fix interface\_key for identity clients
+* Show team and repo badges on README
+
+1.24.0
+------
+
+* Revert "Remove validate\_auth\_ksc"
+
+1.23.0
+------
+
+* Remove validate\_auth\_ksc
+* Add fuga.io to vendors
+* Support token\_endpoint as an auth\_type
+* Add support for volumev3 service type
+* Normalize cloud config before osc-lib call
+* Fix a bunch of tests
+* Clarify how to set SSL settings
+* Update ECS image\_api\_version to 1
+
+1.22.0
+------
+
+* Revert "Split auth plugin loading into its own method"
+* Add setter for session constructor
+* Enable release notes translation
+* cloud\_config:get\_session\_endpoint: catch Keystone EndpointNotFound
+* Using assertIsNone() instead of assertEqual(None, ...)
+* Update homepage with developer documentation page
+* List py35 in the default tox env list
+* Fix AttributeError in \`get\_config\`
+* modify the home-page info with the developer documentation
+* Don't create envvars cloud if cloud or region are set
+* Don't build releasenotes in normal docs build
+* Update reno for stable/newton
+* Add ability to configure Session constructor
+* Split auth plugin loading into its own method
+
+1.21.1
+------
+
+* Go ahead and handle YAML list in region\_name
+
+1.21.0
+------
+
+* Add prompting for KSA options
+* Clean up vendor support list
+
+1.20.1
+------
+
+* Precedence final solution
+
+1.20.0
+------
+
+* Add support for configuring split-stack networks
+* Pop domain-id from the config if we infer values
+* Update Internap information
+
+1.19.1
+------
+
+* Add test for precedence rules
+* Pass the argparse data into to validate\_auth
+* Revert "Fix precedence for pass-in options"
+
+1.19.0
+------
+
+* Add release notes for 1.19.0 release
+* Add the new DreamCompute cloud
+* Fix precedence for pass-in options
+* Update citycloud to list new regions
+* Add support for listing a cloud as shut down
+* Add support for deprecating cloud profiles
+* Refactor fix magic in get\_one\_cloud()
+
+1.18.0
+------
+
+* Reword the entries in the README a bit
+* Add shade constructor helper method
+* Rename session\_client to make\_rest\_client
+* Add helper method for OpenStack SDK constructor
+* Add missing "cloud" argument to \_validate\_auth\_ksc
+* Workaround bad required params in troveclient
+* Trivial: Remove 'MANIFEST.in'
+* Trivial: remove openstack/common from flake8 exclude list
+* drop python3.3 support in classifier
+* Fix formatting in readme file
+* Remove discover from test-requirements.txt
+* Add version string
+
+1.17.0
+------
+
+* Pull the network settings from the actual dict
+* Clarify one-per-cloud network values
+* Flesh out netowrk config list
+* Change network info indication to a generic list
+* Update reno for stable/mitaka
+* Add osic vendor profile
+
+1.16.0
+------
+
+* Update the README a bit
+* Allow session\_client to take the same args as make\_client
+* Fix formulation
+
+1.15.0
+------
+
+* Add release notes
+* Send swiftclient username/password and token
+* Remove HP and RunAbove from vendor profiles
+* Added SSL support for VEXXHOST
+* Add support for zetta.io
+* Stop ignoring v2password plugin
+* Go ahead and remove final excludes
+* Don't set project\_domain if not project scoped
+* Clean up removed hacking rule from [flake8] ignore lists
+* set up release notes build
+
+1.14.0
+------
+
+* Fix a precedence problem with auth arguments
+* Return empty dict instead of None for lack of file
+* Pass version arg by name not position
+* Use \_get\_client in make\_client helper function
+* Add barbicanclient support
+* Remove openstack-common.conf
+* Add IBM Public Cloud
+* Replace assertEqual(None, \*) with assertIsNone in tests
+* Update auth urls and identity API versions
+* Stop hardcoding compute in simple\_client
+* Update volume API default version from v1 to v2
+* Debug log a deferred keystone exception, else we mask some useful diag
+* Fix README.rst, add a check for it to fit PyPI rules
+* Use reno for release notes
+* add URLs for release announcement tools
+* Allow filtering clouds on command line
+
+1.13.1
+------
+
+* Munge region\_name to '' if set to None
+* Fix some README typos
+* Fix token\_endpoint usage
+* remove python 2.6 os-client-config classifier
+* If cloud doesn't list regions expand passed name
+
+1.13.0
+------
+
+* Fix glance endpoints with endpoint\_override
+* Allow passing in explicit version for legacy\_client
+* Pass endpoint override to constructors
+* Support backwards compat for \_ args
+* Add backwards compat mapping for auth-token
+* Replace assertEqual(None, \*) with assertIsNone in tests
+* Allow arbitrary client-specific options
+* Add ceilometer constructor to known constructors
+* Add support for generalized per-region settings
+* Fix a README typo - hepler is not actually a thing
+* Make client constructor optional
+* Updated README to clarify legacy client usage
+* Add simple helper function for client construction
+* Add method for registering argparse options
+* Update vexxhost to Identity v3
+* Make sure that cloud always has a name
+* Remove optional keystoneauth1 imports
+
+1.12.0
+------
+
+* Add BHS1 to OVH
+* Handle cinder v2
+* Add support for secure.yaml file for auth info
+
+1.11.1
+------
+
+* Fix lack of parenthesis around boolean logic
+
+1.11.0
+------
+
+* Only pass timeout to swift if we have a value
+* Fix name of the object-store api key
+* Refactor per-service key making
+* Add support for legacy envvar prefixes
+* Fix JSON schema
+
+1.10.2
+------
+
+* Workaround a dispute between osc and neutronclient
+* Workaround for int value with verbose\_level
+* Remove unneeded workaround for ksc
+* Add default API version for magnum service
+
+1.10.1
+------
+
+* Work around a bug in keystoneclient constructor
+* Return cache settings as numbers not strings
+* Add method to get a mounted session from config
+
+1.10.0
+------
+
+* Convert floats to string
+* Don't assume pass\_version\_arg=False for network
+* Update network api version in defaults.json
+* Dont turn bools into strings
+* Use requestsexceptions for urllib squelching
+* Normalize int config values to string
+* Disable spurious urllib warnings
+* Add logging module support
+* Add methods for getting Session and Client objects
+* Update conoha's vendor profile to include SJC
+* Use json for in-tree cloud data
+* Update auro to indicate move to neutron
+* Copy values in backwards\_interface differently
+* Fix typo in Catalyst region configs
+* Aligned a few words in the docs
+* Sort vendor list
+* Add conoha public cloud
+* Allow for templated variables in auth\_url
+* Use assertDictEqual to test dict equality
+* Always pull regions from vendor profiles
+
+1.9.0
+-----
+
+* Clean up cache interface, add support for services
+* Add Rackspace LON region
+* Validate requested region against region list
+* Fix documentation around regions
+* Add an API reference to the docs
+* Pass OpenStackConfig in to CloudConfig for caches
+* Add auth hook for OpenStackClient
+* Adds some lines to complete table formatting
+
+1.8.1
+-----
+
+* Add universal=1 to setup.cfg to build python 3 wheels
+* Some cleanup
+
+1.8.0
+-----
+
+* Fix two typos
+* Put in override for Rackspace broken neutron
+* Support passing force\_ipv4 to the constructor
+* identity version is 2.0
+* Handle OS\_CLOUD and OS\_REGION\_NAME friendly-like
+* Added SWITCHengines vendor file
+* update RST for readme so pypi looks pretty
+
+1.7.5
+-----
+
+* Fix a little error with the None auth type
+* Add support for Catalyst as vendor
+* Change ignore-errors to ignore\_errors
+
+1.7.4
+-----
+
+* Handle ksa opt with no deprecated field
+
+1.7.3
+-----
+
+* Fall back to keystoneclient arg processing
+* Fix typo in ovh region names
+
+1.7.2
+-----
+
+* Move plugin loader creation to try block
+
+1.7.1
+-----
+
+* Convert auth kwargs '-' to '\_'
+* Properly handle os- prefixed args in fix\_args
+* Test kwargs passing not just argparse
+
+1.7.0
+-----
+
+* Allow configuring domain id once
+* Add internap to the vendor list
+* Fix typo in comment - we use ksa not ksc
+* Defer plugin validation to keystoneauth
+
+1.6.4
+-----
+
+* Remove an extra line
+* Add Datacentred to the vendor list
+* Add ultimum to list of vendors
+* Add Enter Cloud Suite to vendors list
+* Add elastx to vendor support matrix
+* Switch the image default to v2
+* Update auro auth\_url and region information
+* Add citycloud to the vendors list
+* Return keystoneauth plugins based on auth args
+* Remove duplicate lines that are the same as default
+* Add default version number for heat
+* Update OVH public cloud information
+* Handle empty defaults.yaml file
+* Do not treat project\_name and project\_id the same
+* Revert "Revert "Use the correct auth\_plugin for token authentication""
+
+1.6.3
+-----
+
+* Revert "Use the correct auth\_plugin for token authentication"
+
+1.6.2
+-----
+
+* Ignore infra CI env vars
+* Use the correct auth\_plugin for token authentication
+
+1.6.1
+-----
+
+* Align to generic password auth-type
+
+1.6.0
+-----
+
+* Clarify floating ip use for vendors
+* Add per-service endpoint overrides
+
+1.5.0
+-----
+
+* Remove requirements.txt from tox.ini
+* Remove py26 and py33 from tox.ini
+* Rename 'endpoint\_type' to 'interface'
+* Have service name default to None
+* Remove region list from single cloud
+* Fix set\_default() when used before config init
+* Specify the config file with environment variable
+* Add support for configuring region lists with yaml
+* Fix rendering issue in Readme
+* Clean up vendor data
+* Add support for indicating preference for IPv6
+* Normalize project\_name aliases
+
+1.4.0
+-----
+
+* Add some accessor methods to CloudConfig
+* Add missing tests
+* Add test to check cert and key as a tuple
+* Use one yaml file per vendor
+* Raise warning when a vendor profile is missing
+* Some cleanup in the README.rst
+* Add support for OVH Public Cloud
+* Add SSL documentation to README.rst
+* Stringify project details
+* Raise a warning with conflicting SSL params
+* Change references of "clouds.yaml" for real file
+* Raise a warning when using 'cloud' in config
+* Add cloud vendor files config in doc
+
+1.3.0
+-----
+
+* Provide a helper method to get requests ssl values
+* Add more defaults to our defaults file
+* Change naming in vendor doc to match vendors.py
+* Add auro to list of known vendors
+* Add list of image params needed to disable agents
+
+1.2.0
+-----
+
+* Add set\_one\_cloud method
+* Add tests for get\_cloud\_names
+* Add flag to indicate handling of security groups
+* Don't normalize too deeply
+
+1.1.0
+-----
+
+* Add tests for cloud config comparison
+* Add inequality method
+* Add an equality method for CloudConfig
+* Capture the filename used for config
+* Normalize all keys down to \_ instead of -
+* Expose method for getting a list of cloud names
+* Rename cloud to profile
+* Don't pass None as the cloud name
+
+1.0.0
+-----
+
+* Change overriding defaults to kwarg
+* Add tests for OSC usage
+* Use appdirs for platform-independent locations
+* Add UnitedStack
+* Expose function to get defaults dict
+* Add default versions for trove and ironic
+* Sort defaults list for less conflicts
+* Only add fall through cloud as a fall through
+
+0.8.2
+-----
+
+* Add flag to indicate where floating ips come from
+* get\_one\_cloud should use auth merge
+* Also accept .yml as a suffix
+* Remove crufty lines from README
+* Update vendor support to reflect v2 non-task
+
+0.8.1
+-----
+
+* Add flag to trigger task interface for rackspace
+
+0.8.0
+-----
+
+* Document vendor support information
+* Reset cache default to 0
+* add .venv to gitignore
+* Move region\_names out of auth dict
+* Add runabove to vendors
+* Add image information to vexxhost account
+* Add vexxhost
+* Add DreamCompute to vendors list
+* Allow overriding envvars as the name of the cloud
+* Put env vars into their own cloud config
+* Add keystoneclient to test-requirements
+* Actually put some content into our sphinx docs
+
+0.7.0
+-----
+
+* Update .gitreview for git section rename
+* Change dogpile cache defaults
+* Add cover to .gitignore
+
+0.6.0
+-----
+
+* Flesh out api version defaults
+* Handle project\_name/tenant\_name in the auth dict
+* Add two newlines to the ends of files
+* Rename auth\_plugin to auth\_type
+
+0.5.0
+-----
+
+* Add support for configuring dogpile.cache
+* Fix coverage report
+* Add more testing of vendor yaml loading
+* More comprehensive unit tests for os-client-config
+* Allow keystone validation bypass for noauth usage
+* Add basic unit test for config
+
+0.4.3
+-----
+
+* Prefer dest value when option is depricated
+* Allow region\_name to be None
+
+0.4.2
+-----
+
+* Don't return the auth dict inside the loop
+* Make sure we're deep-copying the auth dict
+
+0.4.1
+-----
+
+* Remove runtime depend on pbr
+* Provide Rackspace service\_name override
+
+0.4.0
+-----
+
+* Start keeping default versions for all services
+* Support keystone auth plugins in a generic way
+* Replace defaults\_dict with scanning env vars
+* Workflow documentation is now in infra-manual
+* Corrections to readme
+* Use yaml.safe\_load instead of load
+* Throw error if a non-existent cloud is requested
+
+0.3.0
+-----
+
+* Fix a missed argument from a previous refactor
+* Map CloudConfig attributes to CloudConfig.config
+* Add support for argparse Namespace objects
+* Add support for command line argument processing
+* Handle lack of username for project\_name defaults
+* Handle the project/tenant nonesense more cleanly
+* Add cache control settings
+* Handle no vendor clouds config files
+* Remove unused class method get\_services
+* Add clouds-public.yaml
+* Prep for move to stackforge
+
+0.2.0
+-----
+
+* Handle missing vendor key
+* Make env vars lowest priority
+* Handle null region
+* Update the README file for more completeness
+
+0.1.0
+-----
+
+* Get rid of extra complexity with service values
+* Remove babel and add pyyaml
+* Port in config reading from shade
+* Initial Cookiecutter Commit
diff -pruN 2.1.0-1/debian/changelog 2.1.0-0ubuntu3/debian/changelog
--- 2.1.0-1/debian/changelog	2020-05-08 16:17:06.000000000 +0000
+++ 2.1.0-0ubuntu3/debian/changelog	2020-07-29 17:56:09.000000000 +0000
@@ -1,49 +1,53 @@
-python-os-client-config (2.1.0-1) unstable; urgency=medium
+python-os-client-config (2.1.0-0ubuntu3) groovy; urgency=medium
 
-  * New upstream release.
-  * Removed python3-mock from build-depends.
+  [ Chris MacNaughton ]
+  * d/rules: Move to pybuild.
 
- -- Thomas Goirand <zigo@debian.org>  Fri, 08 May 2020 18:17:06 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 29 Jul 2020 13:56:09 -0400
 
-python-os-client-config (1.33.0-2) unstable; urgency=medium
+python-os-client-config (2.1.0-0ubuntu2) groovy; urgency=medium
 
-  * Uploading to unstable.
+  [ Chris MacNaughton ]
+  * New upstream release for OpenStack Victoria.
+  * d/control: Align (Build-)Depends with upstream.
 
- -- Thomas Goirand <zigo@debian.org>  Wed, 23 Oct 2019 00:47:00 +0200
+  [ Corey Bryant ]
+  * d/control: Drop remaining py2 Build-Depends.
 
-python-os-client-config (1.33.0-1) experimental; urgency=medium
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 28 Jul 2020 13:28:45 -0400
 
-  [ Ondřej Nový ]
-  * Use debhelper-compat instead of debian/compat.
-
-  [ Thomas Goirand ]
-  * New upstream release.
-  * Removed versions of (build-)depends when satisfied in Buster.
-  * Add fix-privacy-breach-in-doc.patch.
+python-os-client-config (1.31.2-0ubuntu2) eoan; urgency=medium
 
- -- Thomas Goirand <zigo@debian.org>  Wed, 18 Sep 2019 09:32:30 +0200
+  * d/control: Drop BDI's on python-* packages.
+  * d/control: Drop python-os-client-config binary package.
+  * d/rules: Tweak to stop build and install of Python 2 parts.
 
-python-os-client-config (1.32.0-1) unstable; urgency=medium
+ -- Sahid Orentino Ferdjaoui <sahid.ferdjaoui@canonical.com>  Thu, 11 Jul 2019 11:12:26 +0200
 
-  * New upstream release.
-  * Uploading to unstable.
-  * Removed Python 2 support.
+python-os-client-config (1.31.2-0ubuntu1) cosmic; urgency=medium
 
- -- Thomas Goirand <zigo@debian.org>  Tue, 16 Jul 2019 22:15:08 +0200
+  * Merge from Debian unstable.  Remaining changes:
+    - d/gbp.conf: Retain for gbp and pristine-tar config.
+    - d/control, d/tests/*: Enable autopkgtest-pkg-python testsuite
+      and drop deprecated 'XS-Testsuite: autopkgtest'.
+    - d/control, d/compat: Bump debhelper compat to 10.
+    - d/rules: Run tests via pkgos-dh_auto_test.
+    - d/watch: Get tarball from tarballs.openstack.org.
+  * New upstream release for OpenStack Rocky.
+  * d/control: Align (Build-)Depends with upstream.
 
-python-os-client-config (1.31.2-1) experimental; urgency=medium
+ -- Corey Bryant <corey.bryant@canonical.com>  Mon, 06 Aug 2018 15:55:37 -0400
 
-  [ Ondřej Nový ]
-  * d/control: Set Vcs-* to salsa.debian.org
-  * d/control: Use team+openstack@tracker.debian.org as maintainer
+python-os-client-config (1.29.0-0ubuntu1) bionic; urgency=medium
 
-  [ Thomas Goirand ]
   * New upstream release.
-  * Fixed (build-)depends for this release.
-  * Using Python 3 for building sphinx doc.
-  * Using pkgos-dh_auto_test.
+  * d/*: wrap-and-sort -bast.
+  * d/control: Update Standards-Version to 4.1.2.
+  * d/control: Bump debhelper compat to 10.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/rules: Run tests with stestr.
 
- -- Thomas Goirand <zigo@debian.org>  Mon, 20 Aug 2018 18:46:00 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 28 Feb 2018 16:11:37 -0500
 
 python-os-client-config (1.28.0-4) unstable; urgency=medium
 
@@ -93,6 +97,153 @@ python-os-client-config (1.28.0-1) exper
 
  -- Thomas Goirand <zigo@debian.org>  Wed, 20 Sep 2017 21:35:42 +0200
 
+python-os-client-config (1.28.0-0ubuntu1) artful; urgency=medium
+
+  * New upstream release.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/p/remove-the-use-of-reno.patch: Rebased.
+  * d/p/drop-openstackdoctheme.patch: Temporarily drop openstackdocstheme
+    sphinx extension until sphinx>=1.6.2 is available.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Fri, 28 Jul 2017 12:52:12 -0400
+
+python-os-client-config (1.27.0-0ubuntu1) artful; urgency=medium
+
+  * d/watch: Use tarballs.openstack.org for releases.
+  * New upstream release for OpenStack Pike.
+
+ -- James Page <james.page@ubuntu.com>  Mon, 15 May 2017 17:24:00 +0100
+
+python-os-client-config (1.26.0-0ubuntu1) zesty; urgency=medium
+
+  * New upstream release.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Thu, 19 Jan 2017 10:32:17 -0500
+
+python-os-client-config (1.25.0-0ubuntu1) zesty; urgency=medium
+
+  * New upstream version.
+  * d/control: Bump version dependencies.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 18 Jan 2017 09:31:19 -0500
+
+python-os-client-config (1.24.0-0ubuntu1) zesty; urgency=medium
+
+  * d/gbp.conf: Update gbp configuration file.
+  * d/control: Update Vcs-* links and maintainers.
+  * debian/tests: Add autopkgtest 
+  * New upstream version. 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 22 Nov 2016 09:54:37 -0500
+
+python-os-client-config (1.18.0-0ubuntu3) yakkety; urgency=medium
+
+  * d/rules: Manually install json files for py3 as well (for real this time).
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Thu, 18 Aug 2016 16:31:55 -0400
+
+python-os-client-config (1.18.0-0ubuntu2) yakkety; urgency=medium
+
+  * d/rules: Manually install json files for py3 as well.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Thu, 18 Aug 2016 11:54:21 -0400
+
+python-os-client-config (1.18.0-0ubuntu1) yakkety; urgency=medium
+
+  * d/rules: Use https for UPSTREAM_GIT.
+  * New upstream release.
+  * d/gbp.conf: Update debian-branch for Newton.
+  * d/p/also-package-json-files.patch: Dropped since upstream has removed
+    MANIFEST.in.
+  * d/rules: Manually install json files.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 17 Aug 2016 11:22:15 -0400
+
+python-os-client-config (1.16.0-1) unstable; urgency=medium
+
+  [ Corey Bryant ]
+  * d/control: Drop dependency on python-reno as it's not needed for package
+    builds.
+
+  [ Thomas Goirand ]
+  * New upstream release.
+  * Fixed short description typo.
+  * Standards-Version: 3.9.7 (no change)
+  * HTTPS VCS URLs and Homepage.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 04 Apr 2016 13:35:19 +0200
+
+python-os-client-config (1.14.0-2) unstable; urgency=medium
+
+  * Uploading to unstable.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 04 Apr 2016 11:32:10 +0000
+
+python-os-client-config (1.14.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+  * Added patch to stop using reno.
+  * Fixed debian/copyright ordering.
+  * Also running Py3 tests.
+
+ -- Thomas Goirand <zigo@debian.org>  Sat, 16 Jan 2016 06:14:32 +0000
+
+python-os-client-config (1.12.0-2) unstable; urgency=medium
+
+  * Uploading to unstable.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 16 Dec 2015 17:48:52 +0000
+
+python-os-client-config (1.12.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+  * Added support for DEB_BUILD_OPTIONS=nodocs.
+  * Config files are now .json and not .yaml: fixing the patch.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 27 Nov 2015 12:15:09 +0100
+
+python-os-client-config (1.6.0-4) unstable; urgency=medium
+
+  * Uploading to unstable.
+  * Black list TestBackwardsCompatibility.test_set_no_default which fails in
+    Python 3.5.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 16 Oct 2015 19:56:30 +0000
+
+python-os-client-config (1.6.0-3) experimental; urgency=medium
+
+  * Add 2 failed test in blacklist (failing to build in Jessie):
+    - test_environ.TestEnviron.test_environ_exists
+    - test_environ.TestEnviron.test_envvar_name_override
+  * Failed in Python 3.4 (in Experimental):
+    - test_config.TestConfig.test_get_all_clouds
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 15 Sep 2015 09:51:03 +0200
+
+python-os-client-config (1.6.0-2) experimental; urgency=medium
+
+  * Also includes all yaml files.
+  * Watch file using github and not broken PyPi.
+  * Also testing with Python 3.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 10 Sep 2015 08:48:43 +0000
+
+python-os-client-config (1.6.0-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 30 Jul 2015 15:12:25 +0000
+
+python-os-client-config (1.3.0-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream release:
+    - d/control: Add new dependency on python{3}-appdirs.
+
+ -- James Page <james.page@ubuntu.com>  Thu, 11 Jun 2015 09:41:52 +0100
+
 python-os-client-config (0.8.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -pruN 2.1.0-1/debian/compat 2.1.0-0ubuntu3/debian/compat
--- 2.1.0-1/debian/compat	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-0ubuntu3/debian/compat	2020-07-29 17:56:09.000000000 +0000
@@ -0,0 +1 @@
+10
diff -pruN 2.1.0-1/debian/control 2.1.0-0ubuntu3/debian/control
--- 2.1.0-1/debian/control	2020-05-08 16:17:06.000000000 +0000
+++ 2.1.0-0ubuntu3/debian/control	2020-07-29 17:56:09.000000000 +0000
@@ -1,38 +1,45 @@
 Source: python-os-client-config
 Section: python
 Priority: optional
-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OpenStack <openstack-devel@lists.alioth.debian.org>
 Uploaders:
  Thomas Goirand <zigo@debian.org>,
 Build-Depends:
- debhelper-compat (= 10),
+ debhelper (>= 10~),
  dh-python,
  openstack-pkg-tools,
  python3-all,
  python3-pbr,
  python3-setuptools,
- python3-sphinx,
+ python3-sphinx (>= 1.6.2),
 Build-Depends-Indep:
- python3-coverage,
- python3-docutils,
- python3-extras,
- python3-fixtures,
- python3-glanceclient,
- python3-hacking,
- python3-jsonschema,
- python3-openstackdocstheme,
- python3-openstacksdk,
- python3-oslotest,
- python3-reno,
- python3-requestsexceptions,
- python3-stestr,
- python3-testscenarios,
- python3-testtools,
- subunit,
-Standards-Version: 4.2.0
-Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-os-client-config
-Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-os-client-config.git
-Homepage: http://github.com/stackforge/os-client-config
+ python3-coverage (>= 4.0),
+ python3-docutils (>= 0.11),
+ python3-extras (>= 1.0.0),
+ python3-fixtures (>= 3.0.0),
+ python3-glanceclient (>= 1:2.8.0),
+ python3-hacking (>= 1.1.0),
+ python3-jsonschema (>= 2.6.0),
+ python3-keystoneauth1 (>= 3.3.0),
+ python3-keystoneclient (>= 1:1.1.0),
+ python3-mock (>= 2.0.0),
+ python3-openstackdocstheme (>= 1.18.1),
+ python3-openstacksdk (>= 0.13.0),
+ python3-oslotest (>= 1:3.2.0),
+ python3-reno (>= 2.5.0),
+ python3-requestsexceptions (>= 1.2.0),
+ python3-stestr (>= 1.0.0),
+ python3-subunit (>= 1.0.0),
+ python3-testrepository,
+ python3-testscenarios (>= 0.4),
+ python3-testtools (>= 2.2.0),
+ python3-yaml (>= 3.10),
+Standards-Version: 4.1.2
+Vcs-Browser: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/python-os-client-config
+Vcs-Git: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/python-os-client-config
+Homepage: https://github.com/stackforge/os-client-config
+Testsuite: autopkgtest-pkg-python
 
 Package: python-os-client-config-doc
 Section: doc
@@ -60,8 +67,12 @@ Description: OpenStack client configurat
 Package: python3-os-client-config
 Architecture: all
 Depends:
- python3-openstacksdk,
+ python3-appdirs (>= 1.3.0),
+ python3-keystoneauth1 (>= 3.3.0),
+ python3-openstacksdk (>= 0.13.0),
  python3-pbr,
+ python3-requestsexceptions (>= 1.2.0),
+ python3-yaml (>= 3.10),
  ${misc:Depends},
  ${python3:Depends},
 Suggests:
diff -pruN 2.1.0-1/debian/gbp.conf 2.1.0-0ubuntu3/debian/gbp.conf
--- 2.1.0-1/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-0ubuntu3/debian/gbp.conf	2020-07-29 17:56:09.000000000 +0000
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -pruN 2.1.0-1/debian/patches/fix-privacy-breach-in-doc.patch 2.1.0-0ubuntu3/debian/patches/fix-privacy-breach-in-doc.patch
--- 2.1.0-1/debian/patches/fix-privacy-breach-in-doc.patch	2020-05-08 16:17:06.000000000 +0000
+++ 2.1.0-0ubuntu3/debian/patches/fix-privacy-breach-in-doc.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-Description: Fix privacy breach in doc
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2019-09-18
-
---- python-os-client-config-1.33.0.orig/README.rst
-+++ python-os-client-config-1.33.0/README.rst
-@@ -2,9 +2,6 @@
- os-client-config
- ================
- 
--.. image:: https://governance.openstack.org/tc/badges/os-client-config.svg
--    :target: https://governance.openstack.org/tc/reference/tags/index.html
--
- .. warning::
-   `os-client-config` has been superceded by `openstacksdk`_. While
-   `os-client-config` will continue to exist, it is highly recommended that
diff -pruN 2.1.0-1/debian/patches/series 2.1.0-0ubuntu3/debian/patches/series
--- 2.1.0-1/debian/patches/series	2020-05-08 16:17:06.000000000 +0000
+++ 2.1.0-0ubuntu3/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-fix-privacy-breach-in-doc.patch
diff -pruN 2.1.0-1/debian/rules 2.1.0-0ubuntu3/debian/rules
--- 2.1.0-1/debian/rules	2020-05-08 16:17:06.000000000 +0000
+++ 2.1.0-0ubuntu3/debian/rules	2020-07-29 17:56:09.000000000 +0000
@@ -1,30 +1,36 @@
 #!/usr/bin/make -f
 
+export PYBUILD_NAME=os_client_config
+
 UPSTREAM_GIT := https://github.com/openstack/os-client-config.git
 include /usr/share/openstack-pkg-tools/pkgos.make
 
 %:
-	dh $@ --buildsystem=python_distutils --with python3,sphinxdoc
-
-override_dh_auto_clean:
-	rm -rf build
-
-override_dh_auto_build:
-	echo "Do nothing..."
-
-override_dh_auto_test:
-	echo "Do nothing..."
+	dh $@ --buildsystem=pybuild --with python3,sphinxdoc
 
 override_dh_auto_install:
 	pkgos-dh_auto_install --no-py2
 	cp os_client_config/defaults.json $(CURDIR)/debian/python3-os-client-config/usr/lib/python3/dist-packages/os_client_config/defaults.json
 
+override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	pkgos-dh_auto_test --no-py2 'tests\.(?!.*OptsTestCase.test_entry_point.*)'
 endif
 
+override_dh_clean:
+	dh_clean -O--buildsystem=pybuild
+	rm -rf build
+
 override_dh_sphinxdoc:
-ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
-	PYTHONPATH=. PYTHON=python3 python3 -m sphinx -b html doc/source debian/python-os-client-config-doc/usr/share/doc/python-os-client-config-doc/html
-	dh_sphinxdoc -O--buildsystem=python_distutils
-endif
+	sphinx-build -b html doc/source debian/python-os-client-config-doc/usr/share/doc/python-os-client-config-doc/html
+	dh_sphinxdoc -O--buildsystem=pybuild
+
+# Commands not to run
+override_dh_installcatalogs:
+override_dh_installemacsen override_dh_installifupdown:
+override_dh_installinfo override_dh_installmenu override_dh_installmime:
+override_dh_installmodules override_dh_installlogcheck:
+override_dh_installpam override_dh_installppp override_dh_installudev override_dh_installwm:
+override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal:
+override_dh_installcron override_dh_installdebconf:
+override_dh_installlogrotate override_dh_installgsettings:
diff -pruN 2.1.0-1/debian/watch 2.1.0-0ubuntu3/debian/watch
--- 2.1.0-1/debian/watch	2020-05-08 16:17:06.000000000 +0000
+++ 2.1.0-0ubuntu3/debian/watch	2020-07-29 17:56:09.000000000 +0000
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/\.(b|rc)/~$1/" \
-https://github.com/openstack/os-client-config/tags .*/(\d[\d\.]+)\.tar\.gz
+    http://tarballs.openstack.org/os-client-config/ os-client-config-(\d.*)\.tar\.gz
diff -pruN 2.1.0-1/.gitignore 2.1.0-0ubuntu3/.gitignore
--- 2.1.0-1/.gitignore	2020-03-13 18:50:53.000000000 +0000
+++ 2.1.0-0ubuntu3/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-*.py[cod]
-.venv
-
-# C extensions
-*.so
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-lib
-lib64
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-cover
-.coverage
-.tox
-nosetests.xml
-.stestr/
-.testrepository
-
-# Translations
-*.mo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
-# Complexity
-output/*.html
-output/*/index.html
-
-# Sphinx
-doc/build
-
-# pbr generates these
-AUTHORS
-ChangeLog
-
-# Editors
-*~
-.*.swp
-.*sw?
diff -pruN 2.1.0-1/.gitreview 2.1.0-0ubuntu3/.gitreview
--- 2.1.0-1/.gitreview	2020-03-13 18:50:53.000000000 +0000
+++ 2.1.0-0ubuntu3/.gitreview	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.opendev.org
-port=29418
-project=openstack/os-client-config.git
diff -pruN 2.1.0-1/os_client_config.egg-info/dependency_links.txt 2.1.0-0ubuntu3/os_client_config.egg-info/dependency_links.txt
--- 2.1.0-1/os_client_config.egg-info/dependency_links.txt	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-0ubuntu3/os_client_config.egg-info/dependency_links.txt	2020-04-02 18:38:17.000000000 +0000
@@ -0,0 +1 @@
+
diff -pruN 2.1.0-1/os_client_config.egg-info/not-zip-safe 2.1.0-0ubuntu3/os_client_config.egg-info/not-zip-safe
--- 2.1.0-1/os_client_config.egg-info/not-zip-safe	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-0ubuntu3/os_client_config.egg-info/not-zip-safe	2020-04-02 18:38:17.000000000 +0000
@@ -0,0 +1 @@
+
diff -pruN 2.1.0-1/os_client_config.egg-info/pbr.json 2.1.0-0ubuntu3/os_client_config.egg-info/pbr.json
--- 2.1.0-1/os_client_config.egg-info/pbr.json	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-0ubuntu3/os_client_config.egg-info/pbr.json	2020-04-02 18:38:17.000000000 +0000
@@ -0,0 +1 @@
+{"git_version": "bc96c23", "is_release": true}
\ No newline at end of file
diff -pruN 2.1.0-1/os_client_config.egg-info/PKG-INFO 2.1.0-0ubuntu3/os_client_config.egg-info/PKG-INFO
--- 2.1.0-1/os_client_config.egg-info/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-0ubuntu3/os_client_config.egg-info/PKG-INFO	2020-04-02 18:38:17.000000000 +0000
@@ -0,0 +1,53 @@
+Metadata-Version: 1.1
+Name: os-client-config
+Version: 2.1.0
+Summary: OpenStack Client Configuation Library
+Home-page: https://docs.openstack.org/os-client-config/latest
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+License: UNKNOWN
+Description: ================
+        os-client-config
+        ================
+        
+        .. image:: https://governance.openstack.org/tc/badges/os-client-config.svg
+            :target: https://governance.openstack.org/tc/reference/tags/index.html
+        
+        .. warning::
+          `os-client-config` has been superceded by `openstacksdk`_. While
+          `os-client-config` will continue to exist, it is highly recommended that
+          users transition to using `openstacksdk`_ directly.
+        
+        `os-client-config` is a library for collecting client configuration for
+        using an OpenStack cloud in a consistent and comprehensive manner. It
+        will find cloud config for as few as 1 cloud and as many as you want to
+        put in a config file. It will read environment variables and config files,
+        and it also contains some vendor specific default values so that you don't
+        have to know extra info to use OpenStack
+        
+        * If you have a config file, you will get the clouds listed in it
+        * If you have environment variables, you will get a cloud named `envvars`
+        * If you have neither, you will get a cloud named `defaults` with base defaults
+        
+        Source
+        ------
+        
+        * Free software: Apache license
+        * Documentation: http://docs.openstack.org/os-client-config/latest
+        * Source: http://opendev.org/openstack/os-client-config
+        * Bugs: https://storyboard.openstack.org/#!/project/openstack/os-client-config
+        * Release Notes https://docs.openstack.org/releasenotes/os-client-config
+        
+        .. _openstacksdk: http://docs.openstack.org/openstacksdk/latest
+        
+        
+Platform: UNKNOWN
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
diff -pruN 2.1.0-1/os_client_config.egg-info/requires.txt 2.1.0-0ubuntu3/os_client_config.egg-info/requires.txt
--- 2.1.0-1/os_client_config.egg-info/requires.txt	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-0ubuntu3/os_client_config.egg-info/requires.txt	2020-04-02 18:38:17.000000000 +0000
@@ -0,0 +1 @@
+openstacksdk>=0.13.0
diff -pruN 2.1.0-1/os_client_config.egg-info/SOURCES.txt 2.1.0-0ubuntu3/os_client_config.egg-info/SOURCES.txt
--- 2.1.0-1/os_client_config.egg-info/SOURCES.txt	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-0ubuntu3/os_client_config.egg-info/SOURCES.txt	2020-04-02 18:38:17.000000000 +0000
@@ -0,0 +1,89 @@
+.coveragerc
+.mailmap
+.stestr.conf
+.zuul.yaml
+AUTHORS
+CONTRIBUTING.rst
+ChangeLog
+HACKING.rst
+LICENSE
+README.rst
+lower-constraints.txt
+requirements.txt
+setup.cfg
+setup.py
+test-requirements.txt
+tox.ini
+doc/requirements.txt
+doc/source/conf.py
+doc/source/index.rst
+doc/source/contributor/index.rst
+doc/source/install/index.rst
+doc/source/reference/index.rst
+doc/source/user/configuration.rst
+doc/source/user/index.rst
+doc/source/user/network-config.rst
+doc/source/user/releasenotes.rst
+doc/source/user/using.rst
+doc/source/user/vendor-support.rst
+os_client_config/__init__.py
+os_client_config/cloud_config.py
+os_client_config/config.py
+os_client_config/constructors.json
+os_client_config/constructors.py
+os_client_config/defaults.json
+os_client_config/defaults.py
+os_client_config/exceptions.py
+os_client_config.egg-info/PKG-INFO
+os_client_config.egg-info/SOURCES.txt
+os_client_config.egg-info/dependency_links.txt
+os_client_config.egg-info/not-zip-safe
+os_client_config.egg-info/pbr.json
+os_client_config.egg-info/requires.txt
+os_client_config.egg-info/top_level.txt
+os_client_config/tests/__init__.py
+os_client_config/tests/base.py
+os_client_config/tests/test_cloud_config.py
+os_client_config/tests/test_config.py
+os_client_config/tests/test_environ.py
+os_client_config/tests/test_import_vendors.py
+os_client_config/tests/test_init.py
+os_client_config/vendors/__init__.py
+releasenotes/notes/catch-up-release-notes-e385fad34e9f3d6e.yaml
+releasenotes/notes/cloud-profile-status-e0d29b5e2f10e95c.yaml
+releasenotes/notes/default-cloud-7ee0bcb9e5dd24b9.yaml
+releasenotes/notes/fix-compat-with-old-keystoneauth-66e11ee9d008b962.yaml
+releasenotes/notes/fix-vendor-import-ebd4ade0d5c17146.yaml
+releasenotes/notes/goodbye-python2-40feeeb4be3e06c5.yaml
+releasenotes/notes/ironic-microversion-ba5b0f36f11196a6.yaml
+releasenotes/notes/load-yaml-3177efca78e5c67a.yaml
+releasenotes/notes/magic-fixes-dca4ae4dac2441a8.yaml
+releasenotes/notes/make-rest-client-dd3d365632a26fa0.yaml
+releasenotes/notes/make-rest-client-version-discovery-84125700f159491a.yaml
+releasenotes/notes/min-max-legacy-version-301242466ddefa93.yaml
+releasenotes/notes/nat-source-field-7c7db2a724616d59.yaml
+releasenotes/notes/network-list-e6e9dafdd8446263.yaml
+releasenotes/notes/option-precedence-1fecab21fdfb2c33.yaml
+releasenotes/notes/sdk-helper-41f8d815cfbcfb00.yaml
+releasenotes/notes/session-client-b581a6e5d18c8f04.yaml
+releasenotes/notes/shade-helper-568f8cb372eef6d9.yaml
+releasenotes/notes/started-using-reno-242e2b0cd27f9480.yaml
+releasenotes/notes/thin-shim-62c8e6f6942b83a5.yaml
+releasenotes/notes/vendor-add-betacloud-03872c3485104853.yaml
+releasenotes/notes/vendor-add-limestonenetworks-99b2ffab9fc23b08.yaml
+releasenotes/notes/vendor-updates-f11184ba56bb27cf.yaml
+releasenotes/source/conf.py
+releasenotes/source/index.rst
+releasenotes/source/mitaka.rst
+releasenotes/source/newton.rst
+releasenotes/source/ocata.rst
+releasenotes/source/pike.rst
+releasenotes/source/queens.rst
+releasenotes/source/rocky.rst
+releasenotes/source/stein.rst
+releasenotes/source/train.rst
+releasenotes/source/unreleased.rst
+releasenotes/source/_static/.placeholder
+releasenotes/source/_templates/.placeholder
+tools/keystone_version.py
+tools/nova_version.py
\ No newline at end of file
diff -pruN 2.1.0-1/os_client_config.egg-info/top_level.txt 2.1.0-0ubuntu3/os_client_config.egg-info/top_level.txt
--- 2.1.0-1/os_client_config.egg-info/top_level.txt	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-0ubuntu3/os_client_config.egg-info/top_level.txt	2020-04-02 18:38:17.000000000 +0000
@@ -0,0 +1 @@
+os_client_config
diff -pruN 2.1.0-1/PKG-INFO 2.1.0-0ubuntu3/PKG-INFO
--- 2.1.0-1/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ 2.1.0-0ubuntu3/PKG-INFO	2020-04-02 18:38:17.000000000 +0000
@@ -0,0 +1,53 @@
+Metadata-Version: 1.1
+Name: os-client-config
+Version: 2.1.0
+Summary: OpenStack Client Configuation Library
+Home-page: https://docs.openstack.org/os-client-config/latest
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+License: UNKNOWN
+Description: ================
+        os-client-config
+        ================
+        
+        .. image:: https://governance.openstack.org/tc/badges/os-client-config.svg
+            :target: https://governance.openstack.org/tc/reference/tags/index.html
+        
+        .. warning::
+          `os-client-config` has been superceded by `openstacksdk`_. While
+          `os-client-config` will continue to exist, it is highly recommended that
+          users transition to using `openstacksdk`_ directly.
+        
+        `os-client-config` is a library for collecting client configuration for
+        using an OpenStack cloud in a consistent and comprehensive manner. It
+        will find cloud config for as few as 1 cloud and as many as you want to
+        put in a config file. It will read environment variables and config files,
+        and it also contains some vendor specific default values so that you don't
+        have to know extra info to use OpenStack
+        
+        * If you have a config file, you will get the clouds listed in it
+        * If you have environment variables, you will get a cloud named `envvars`
+        * If you have neither, you will get a cloud named `defaults` with base defaults
+        
+        Source
+        ------
+        
+        * Free software: Apache license
+        * Documentation: http://docs.openstack.org/os-client-config/latest
+        * Source: http://opendev.org/openstack/os-client-config
+        * Bugs: https://storyboard.openstack.org/#!/project/openstack/os-client-config
+        * Release Notes https://docs.openstack.org/releasenotes/os-client-config
+        
+        .. _openstacksdk: http://docs.openstack.org/openstacksdk/latest
+        
+        
+Platform: UNKNOWN
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
diff -pruN 2.1.0-1/setup.cfg 2.1.0-0ubuntu3/setup.cfg
--- 2.1.0-1/setup.cfg	2020-03-13 18:50:53.000000000 +0000
+++ 2.1.0-0ubuntu3/setup.cfg	2020-04-02 18:38:17.000000000 +0000
@@ -1,25 +1,25 @@
 [metadata]
 name = os-client-config
 summary = OpenStack Client Configuation Library
-description-file =
-    README.rst
+description-file = 
+	README.rst
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
 home-page = https://docs.openstack.org/os-client-config/latest
-classifier =
-    Environment :: OpenStack
-    Intended Audience :: Information Technology
-    Intended Audience :: System Administrators
-    License :: OSI Approved :: Apache Software License
-    Operating System :: POSIX :: Linux
-    Programming Language :: Python
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
+classifier = 
+	Environment :: OpenStack
+	Intended Audience :: Information Technology
+	Intended Audience :: System Administrators
+	License :: OSI Approved :: Apache Software License
+	Operating System :: POSIX :: Linux
+	Programming Language :: Python
+	Programming Language :: Python :: 3
+	Programming Language :: Python :: 3.6
+	Programming Language :: Python :: 3.7
 
 [files]
-packages =
-    os_client_config
+packages = 
+	os_client_config
 
 [build_sphinx]
 source-dir = doc/source
@@ -29,3 +29,8 @@ warning-is-error = 1
 
 [upload_sphinx]
 upload-dir = doc/build/html
+
+[egg_info]
+tag_build = 
+tag_date = 0
+
