From 689729fa354921152cb1bd7220056a89b627e66e Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Sun, 5 Feb 2017 20:45:52 -0800 Subject: [PATCH] Use https for *.openstack.org references The openstack.org pages now support https and our references to the site should by default be one signed by the organization. Change-Id: Ia6cdaf7fabd1c355df002aa07b0695610dde9cd1 --- CONTRIBUTING.rst | 4 ++-- HACKING.rst | 4 ++-- README.rst | 10 +++++----- bindep.txt | 2 +- doc/source/conf.py | 6 +++--- doc/source/index.rst | 6 +++--- keystoneclient/i18n.py | 2 +- keystoneclient/tests/unit/generic/test_client.py | 3 ++- keystoneclient/tests/unit/v2_0/test_discovery.py | 4 ++-- keystoneclient/tests/unit/v2_0/test_extensions.py | 4 ++-- keystoneclient/tests/unit/v3/test_discover.py | 8 ++++---- .../notes/deprecated_auth-d2a2bf537bdb88d3.yaml | 4 ++-- setup.cfg | 2 +- 13 files changed, 30 insertions(+), 29 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index b7139eccc..604d3ac77 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,7 +1,7 @@ If you would like to contribute to the development of OpenStack, you must follow the steps documented at: - http://docs.openstack.org/infra/manual/developers.html + https://docs.openstack.org/infra/manual/developers.html If you already have a good understanding of how the system works and your OpenStack accounts are set up, you can skip to the @@ -9,7 +9,7 @@ development workflow section of this documentation to learn how changes to OpenStack should be submitted for review via the Gerrit tool: - http://docs.openstack.org/infra/manual/developers.html#development-workflow + https://docs.openstack.org/infra/manual/developers.html#development-workflow Pull requests submitted through GitHub will be ignored. diff --git a/HACKING.rst b/HACKING.rst index 0dfef9905..1ab4a8744 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -2,7 +2,7 @@ Keystone Style Commandments =========================== - Step 1: Read the OpenStack Style Commandments - http://docs.openstack.org/developer/hacking/ + https://docs.openstack.org/developer/hacking/ - Step 2: Read on Exceptions @@ -17,7 +17,7 @@ Testing python-keystoneclient uses testtools and testr for its unittest suite and its test runner. Basic workflow around our use of tox and testr can -be found at http://wiki.openstack.org/testr. If you'd like to learn more +be found at https://wiki.openstack.org/testr. If you'd like to learn more in depth: https://testtools.readthedocs.org/ diff --git a/README.rst b/README.rst index 02eed1cde..7421e5e1e 100644 --- a/README.rst +++ b/README.rst @@ -2,8 +2,8 @@ Team and repository tags ======================== -.. image:: http://governance.openstack.org/badges/python-keystoneclient.svg - :target: http://governance.openstack.org/reference/tags/index.html +.. image:: https://governance.openstack.org/badges/python-keystoneclient.svg + :target: https://governance.openstack.org/reference/tags/index.html .. Change things from this point on @@ -33,14 +33,14 @@ OpenStack's Identity Service. For command line interface support, use * `How to Contribute`_ .. _PyPi: https://pypi.python.org/pypi/python-keystoneclient -.. _Online Documentation: http://docs.openstack.org/developer/python-keystoneclient +.. _Online Documentation: https://docs.openstack.org/developer/python-keystoneclient .. _Launchpad project: https://launchpad.net/python-keystoneclient .. _Blueprints: https://blueprints.launchpad.net/python-keystoneclient .. _Bugs: https://bugs.launchpad.net/python-keystoneclient .. _Source: https://git.openstack.org/cgit/openstack/python-keystoneclient .. _OpenStackClient: https://pypi.python.org/pypi/python-openstackclient -.. _How to Contribute: http://docs.openstack.org/infra/manual/developers.html -.. _Specs: http://specs.openstack.org/openstack/keystone-specs/ +.. _How to Contribute: https://docs.openstack.org/infra/manual/developers.html +.. _Specs: https://specs.openstack.org/openstack/keystone-specs/ .. contents:: Contents: :local: diff --git a/bindep.txt b/bindep.txt index bcd43fb87..d17936945 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,5 +1,5 @@ # This is a cross-platform list tracking distribution packages needed by tests; -# see http://docs.openstack.org/infra/bindep/ for additional information. +# see https://docs.openstack.org/infra/bindep/ for additional information. gettext libssl-dev diff --git a/doc/source/conf.py b/doc/source/conf.py index 170210551..cda0c77ea 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -227,9 +227,9 @@ latex_documents = [ # If false, no module index is generated. #latex_use_modindex = True -keystoneauth_url = 'http://docs.openstack.org/developer/keystoneauth/' +keystoneauth_url = 'https://docs.openstack.org/developer/keystoneauth/' intersphinx_mapping = { - 'python': ('http://docs.python.org/', None), - 'osloconfig': ('http://docs.openstack.org/developer/oslo.config/', None), + 'python': ('https://docs.python.org/', None), + 'osloconfig': ('https://docs.openstack.org/developer/oslo.config/', None), 'keystoneauth1': (keystoneauth_url, None), } diff --git a/doc/source/index.rst b/doc/source/index.rst index c5f526094..74613cdc8 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -21,8 +21,8 @@ Related Identity Projects In addition to creating the Python client library, the Keystone team also provides `Identity Service`_, as well as `WSGI Middleware`_. -.. _`Identity Service`: http://docs.openstack.org/developer/keystone/ -.. _`WSGI Middleware`: http://docs.openstack.org/developer/keystonemiddleware/ +.. _`Identity Service`: https://docs.openstack.org/developer/keystone/ +.. _`WSGI Middleware`: https://docs.openstack.org/developer/keystonemiddleware/ Release Notes ============= @@ -41,7 +41,7 @@ using `Gerrit`_. .. _on GitHub: https://github.com/openstack/python-keystoneclient .. _Launchpad: https://launchpad.net/python-keystoneclient -.. _Gerrit: http://docs.openstack.org/infra/manual/developers.html#development-workflow +.. _Gerrit: https://docs.openstack.org/infra/manual/developers.html#development-workflow Run tests with ``tox``. diff --git a/keystoneclient/i18n.py b/keystoneclient/i18n.py index fc9a52b3d..a196472ee 100644 --- a/keystoneclient/i18n.py +++ b/keystoneclient/i18n.py @@ -14,7 +14,7 @@ """oslo.i18n integration module. -See http://docs.openstack.org/developer/oslo.i18n/usage.html . +See https://docs.openstack.org/developer/oslo.i18n/usage.html . """ diff --git a/keystoneclient/tests/unit/generic/test_client.py b/keystoneclient/tests/unit/generic/test_client.py index ffd3a5207..5c27b6eb9 100644 --- a/keystoneclient/tests/unit/generic/test_client.py +++ b/keystoneclient/tests/unit/generic/test_client.py @@ -22,7 +22,8 @@ BASE_HOST = 'http://keystone.example.com' BASE_URL = "%s:5000/" % BASE_HOST V2_URL = "%sv2.0" % BASE_URL -EXTENSION_NAMESPACE = "http://docs.openstack.org/identity/api/ext/OS-FAKE/v1.0" +EXTENSION_NAMESPACE = ("https://docs.openstack.org/identity/api/ext/OS-FAKE/" + "v1.0") EXTENSION_DESCRIBED = {"href": "https://github.com/openstack/identity-api", "rel": "describedby", "type": "text/html"} diff --git a/keystoneclient/tests/unit/v2_0/test_discovery.py b/keystoneclient/tests/unit/v2_0/test_discovery.py index 5afe59ab1..a3700e0e1 100644 --- a/keystoneclient/tests/unit/v2_0/test_discovery.py +++ b/keystoneclient/tests/unit/v2_0/test_discovery.py @@ -29,11 +29,11 @@ class DiscoverKeystoneTests(utils.UnauthenticatedTestCase): "href": "http://127.0.0.1:5000/v2.0/", }, {"rel": "describedby", "type": "text/html", - "href": "http://docs.openstack.org/api/" + "href": "https://docs.openstack.org/api/" "openstack-identity-service/2.0/content/", }, {"rel": "describedby", "type": "application/pdf", - "href": "http://docs.openstack.org/api/" + "href": "https://docs.openstack.org/api/" "openstack-identity-service/2.0/" "identity-dev-guide-2.0.pdf", }, {"rel": "describedby", diff --git a/keystoneclient/tests/unit/v2_0/test_extensions.py b/keystoneclient/tests/unit/v2_0/test_extensions.py index 662d380e7..3927bc07c 100644 --- a/keystoneclient/tests/unit/v2_0/test_extensions.py +++ b/keystoneclient/tests/unit/v2_0/test_extensions.py @@ -22,7 +22,7 @@ class ExtensionTests(utils.ClientTestCase): "values": [ { 'name': 'OpenStack Keystone User CRUD', - 'namespace': 'http://docs.openstack.org/' + 'namespace': 'https://docs.openstack.org/' 'identity/api/ext/OS-KSCRUD/v1.0', 'updated': '2013-07-07T12:00:0-00:00', 'alias': 'OS-KSCRUD', @@ -36,7 +36,7 @@ class ExtensionTests(utils.ClientTestCase): }, { 'name': 'OpenStack EC2 API', - 'namespace': 'http://docs.openstack.org/' + 'namespace': 'https://docs.openstack.org/' 'identity/api/ext/OS-EC2/v1.0', 'updated': '2013-09-07T12:00:0-00:00', 'alias': 'OS-EC2', diff --git a/keystoneclient/tests/unit/v3/test_discover.py b/keystoneclient/tests/unit/v3/test_discover.py index 898d46b0d..f54b2f9c4 100644 --- a/keystoneclient/tests/unit/v3/test_discover.py +++ b/keystoneclient/tests/unit/v3/test_discover.py @@ -27,12 +27,12 @@ class DiscoverKeystoneTests(utils.UnauthenticatedTestCase): "href": "http://127.0.0.1:5000/v3.0/", }, {"rel": "describedby", "type": "text/html", - "href": "http://docs.openstack.org/api/" + "href": "https://docs.openstack.org/api/" "openstack-identity-service/3/" "content/", }, {"rel": "describedby", "type": "application/pdf", - "href": "http://docs.openstack.org/api/" + "href": "https://docs.openstack.org/api/" "openstack-identity-service/3/" "identity-dev-guide-3.pdf", }, ]}, @@ -44,12 +44,12 @@ class DiscoverKeystoneTests(utils.UnauthenticatedTestCase): "href": "http://127.0.0.1:5000/v2.0/", }, {"rel": "describedby", "type": "text/html", - "href": "http://docs.openstack.org/api/" + "href": "https://docs.openstack.org/api/" "openstack-identity-service/2.0/" "content/", }, {"rel": "describedby", "type": "application/pdf", - "href": "http://docs.openstack.org/api/" + "href": "https://docs.openstack.org/api/" "openstack-identity-service/2.0/" "identity-dev-guide-2.0.pdf", } ]}], diff --git a/releasenotes/notes/deprecated_auth-d2a2bf537bdb88d3.yaml b/releasenotes/notes/deprecated_auth-d2a2bf537bdb88d3.yaml index 82a723dc6..fbb3a473f 100644 --- a/releasenotes/notes/deprecated_auth-d2a2bf537bdb88d3.yaml +++ b/releasenotes/notes/deprecated_auth-d2a2bf537bdb88d3.yaml @@ -3,10 +3,10 @@ deprecations: - > [`blueprint deprecate-to-ksa `_] Several modules related to authentication in keystoneclient have been - deprecated in favor of [`keystoneauth `_] + deprecated in favor of [`keystoneauth `_] These modules include: ``keystoneclient.session``, ``keystoneclient.adapter``, ``keystoneclient.httpclient``, ``keystoneclient.auth.base``, ``keystoneclient.auth.cli``, ``keystoneclient.auth.conf``, ``keystoneclient.auth.identity.base``, and ``keystoneclient.auth.token_endpoint``. Tips for migrating to `keystoneauth` have been - [`documented `_]. + [`documented `_]. diff --git a/setup.cfg b/setup.cfg index a2525a8b7..9e913a716 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ description-file = README.rst author = OpenStack author-email = openstack-dev@lists.openstack.org -home-page = http://docs.openstack.org/developer/python-keystoneclient +home-page = https://docs.openstack.org/developer/python-keystoneclient classifier = Environment :: OpenStack Intended Audience :: Information Technology