From bb8b4bf5a56fda34cd9ea6debbc730fe7a9db8fe Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 9 Mar 2019 13:25:36 +0000 Subject: [PATCH] Swap human-facing links to use opendev.org While we should not start using this for cloning things in the gate yet, the opendev.org links provide for a nicer browsing experience already even though the service is in beta. Go ahead and swap our browsing links. While in there, remove some masakari references to github links to the source code. Masakari now publishes api docs to developer.openstack.org so there is no need to point people to source code for api docs. Change-Id: I14afa3476f9832ef433ec744e888348fc9a359e3 --- CONTRIBUTING.rst | 2 +- doc/source/contributor/local.conf | 2 +- doc/source/contributor/setup.rst | 9 +++------ doc/source/contributor/testing.rst | 6 +++--- doc/source/user/guides/baremetal.rst | 4 ++-- doc/source/user/guides/clustering/action.rst | 2 +- doc/source/user/guides/clustering/cluster.rst | 2 +- doc/source/user/guides/clustering/event.rst | 2 +- doc/source/user/guides/clustering/node.rst | 2 +- doc/source/user/guides/clustering/policy.rst | 2 +- doc/source/user/guides/clustering/policy_type.rst | 2 +- doc/source/user/guides/clustering/profile.rst | 2 +- doc/source/user/guides/clustering/profile_type.rst | 2 +- doc/source/user/guides/clustering/receiver.rst | 2 +- doc/source/user/guides/compute.rst | 6 +++--- doc/source/user/guides/connect.rst | 2 +- doc/source/user/guides/connect_from_config.rst | 2 +- doc/source/user/guides/identity.rst | 2 +- doc/source/user/guides/image.rst | 10 +++++----- doc/source/user/guides/network.rst | 8 ++++---- doc/source/user/multi-cloud-demo.rst | 2 +- openstack/config/schema.json | 2 +- openstack/config/vendor-schema.json | 2 +- openstack/instance_ha/v1/host.py | 5 ----- openstack/instance_ha/v1/notification.py | 5 ----- openstack/instance_ha/v1/segment.py | 5 ----- .../notes/removed-glanceclient-105c7fba9481b9be.yaml | 2 +- 27 files changed, 38 insertions(+), 56 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index db02b70fb..9cd75cae1 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -39,7 +39,7 @@ Mailing list (prefix subjects with ``[sdk]`` for faster responses) http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss Code Hosting - https://git.openstack.org/cgit/openstack/openstacksdk + https://opendev.org/openstack/openstacksdk Code Review https://review.openstack.org/#/q/status:open+project:openstack/openstacksdk,n,z diff --git a/doc/source/contributor/local.conf b/doc/source/contributor/local.conf index 2ce95caae..3b66d569f 100644 --- a/doc/source/contributor/local.conf +++ b/doc/source/contributor/local.conf @@ -9,7 +9,7 @@ SWIFT_HASH=DEVSTACK_PASSWORD # Configure the stable OpenStack branches used by DevStack # For stable branches see -# http://git.openstack.org/cgit/openstack-dev/devstack/refs/ +# http://opendev.org/openstack-dev/devstack CINDER_BRANCH=stable/OPENSTACK_VERSION CEILOMETER_BRANCH=stable/OPENSTACK_VERSION GLANCE_BRANCH=stable/OPENSTACK_VERSION diff --git a/doc/source/contributor/setup.rst b/doc/source/contributor/setup.rst index 7aee35416..8275da02d 100644 --- a/doc/source/contributor/setup.rst +++ b/doc/source/contributor/setup.rst @@ -88,13 +88,10 @@ Getting the Source Code for details on how to use the continuous integration and code review systems that we use. -The canonical Git repository is hosted on openstack.org at -http://git.openstack.org/cgit/openstack/openstacksdk/, with a -mirror on GitHub at https://github.com/openstack/openstacksdk. -Because of how Git works, you can create a local clone from either of those, -or your own personal fork.:: +The canonical Git repository is hosted on opendev.org at +http://opendev.org/openstack/openstacksdk/:: - (sdk3)$ git clone https://git.openstack.org/openstack/openstacksdk.git + (sdk3)$ git clone https://opendev.org/openstack/openstacksdk (sdk3)$ cd openstacksdk Installing Dependencies diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst index 3d2d02713..c72946c9b 100644 --- a/doc/source/contributor/testing.rst +++ b/doc/source/contributor/testing.rst @@ -57,14 +57,14 @@ This is the ``local.conf`` file we use to configure DevStack. Replace ``DEVSTACK_PASSWORD`` with a password of your choice. -Replace ``OPENSTACK_VERSION`` with a `stable branch `_ +Replace ``OPENSTACK_VERSION`` with a `stable branch `_ of OpenStack (without the ``stable/`` prefix on the branch name). os-client-config **************** To connect the functional tests to an OpenStack cloud we use -`os-client-config `_. +`os-client-config `_. To setup os-client-config create a ``clouds.yaml`` file in the root of your source checkout. @@ -113,7 +113,7 @@ public or private OpenStack cloud that you can run the tests against. In practice, this means that the tests should initially be run against a stable branch of `DevStack `_. And like the functional tests, the examples tests connect to an OpenStack cloud -using `os-client-config `_. +using `os-client-config `_. See the functional tests instructions for information on setting up DevStack and os-client-config. diff --git a/doc/source/user/guides/baremetal.rst b/doc/source/user/guides/baremetal.rst index 7189511a1..c32553125 100644 --- a/doc/source/user/guides/baremetal.rst +++ b/doc/source/user/guides/baremetal.rst @@ -59,6 +59,6 @@ for deployment. Full example: `baremetal provisioning`_ -.. _baremetal resource list: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/baremetal/list.py -.. _baremetal provisioning: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/baremetal/provisioning.py +.. _baremetal resource list: http://opendev.org/openstack/openstacksdk/src/branch/master/examples/baremetal/list.py +.. _baremetal provisioning: http://opendev.org/openstack/openstacksdk/src/branch/master/examples/baremetal/provisioning.py .. _Bare Metal service states documentation: https://docs.openstack.org/ironic/latest/contributor/states.html diff --git a/doc/source/user/guides/clustering/action.rst b/doc/source/user/guides/clustering/action.rst index 2cf661bb5..1be15eca3 100644 --- a/doc/source/user/guides/clustering/action.rst +++ b/doc/source/user/guides/clustering/action.rst @@ -44,4 +44,4 @@ To get a action based on its name or ID: .. literalinclude:: ../../examples/clustering/action.py :pyobject: get_action -.. _manage action: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/clustering/action.py +.. _manage action: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/clustering/action.py diff --git a/doc/source/user/guides/clustering/cluster.rst b/doc/source/user/guides/clustering/cluster.rst index 280de5bab..6fd798668 100644 --- a/doc/source/user/guides/clustering/cluster.rst +++ b/doc/source/user/guides/clustering/cluster.rst @@ -189,5 +189,5 @@ To restore a specified cluster, members in the cluster will be checked. :pyobject: recover_cluster -.. _manage cluster: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/clustering/cluster.py +.. _manage cluster: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/clustering/cluster.py diff --git a/doc/source/user/guides/clustering/event.rst b/doc/source/user/guides/clustering/event.rst index 80896f76f..da958e318 100644 --- a/doc/source/user/guides/clustering/event.rst +++ b/doc/source/user/guides/clustering/event.rst @@ -44,4 +44,4 @@ To get a event based on its name or ID: .. literalinclude:: ../../examples/clustering/event.py :pyobject: get_event -.. _manage event: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/clustering/event.py +.. _manage event: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/clustering/event.py diff --git a/doc/source/user/guides/clustering/node.rst b/doc/source/user/guides/clustering/node.rst index 3d68396bf..99b59939d 100644 --- a/doc/source/user/guides/clustering/node.rst +++ b/doc/source/user/guides/clustering/node.rst @@ -117,4 +117,4 @@ To restore a specified node. .. literalinclude:: ../../examples/clustering/node.py :pyobject: recover_node -.. _manage node: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/clustering/node.py +.. _manage node: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/clustering/node.py diff --git a/doc/source/user/guides/clustering/policy.rst b/doc/source/user/guides/clustering/policy.rst index 5bdcbb61c..bf282b214 100644 --- a/doc/source/user/guides/clustering/policy.rst +++ b/doc/source/user/guides/clustering/policy.rst @@ -99,4 +99,4 @@ still in use, you will get an error message. :pyobject: delete_policy -.. _manage policy: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/clustering/policy.py +.. _manage policy: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/clustering/policy.py diff --git a/doc/source/user/guides/clustering/policy_type.rst b/doc/source/user/guides/clustering/policy_type.rst index d294028e1..eb7bc623c 100644 --- a/doc/source/user/guides/clustering/policy_type.rst +++ b/doc/source/user/guides/clustering/policy_type.rst @@ -42,4 +42,4 @@ it. Full example: `manage policy type`_ -.. _manage policy type: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/clustering/policy_type.py +.. _manage policy type: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/clustering/policy_type.py diff --git a/doc/source/user/guides/clustering/profile.rst b/doc/source/user/guides/clustering/profile.rst index 228fa4232..79137844d 100644 --- a/doc/source/user/guides/clustering/profile.rst +++ b/doc/source/user/guides/clustering/profile.rst @@ -102,4 +102,4 @@ still in use, you will get an error message. :pyobject: delete_profile -.. _manage profile: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/clustering/profile.py +.. _manage profile: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/clustering/profile.py diff --git a/doc/source/user/guides/clustering/profile_type.rst b/doc/source/user/guides/clustering/profile_type.rst index 2a15d19e9..4f8d3645c 100644 --- a/doc/source/user/guides/clustering/profile_type.rst +++ b/doc/source/user/guides/clustering/profile_type.rst @@ -41,4 +41,4 @@ To get the details about a profile type, you need to provide the name of it. Full example: `manage profile type`_ -.. _manage profile type: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/clustering/profile_type.py +.. _manage profile type: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/clustering/profile_type.py diff --git a/doc/source/user/guides/clustering/receiver.rst b/doc/source/user/guides/clustering/receiver.rst index 587b37c18..c3c71dce0 100644 --- a/doc/source/user/guides/clustering/receiver.rst +++ b/doc/source/user/guides/clustering/receiver.rst @@ -97,4 +97,4 @@ use, you will get an error message. :pyobject: delete_receiver -.. _manage receiver: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/clustering/receiver.py +.. _manage receiver: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/clustering/receiver.py diff --git a/doc/source/user/guides/compute.rst b/doc/source/user/guides/compute.rst index a31295bf9..bac8a106d 100644 --- a/doc/source/user/guides/compute.rst +++ b/doc/source/user/guides/compute.rst @@ -83,7 +83,7 @@ for it to become active. Full example: `compute resource create`_ -.. _compute resource list: https://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/compute/list.py -.. _network resource list: https://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/network/list.py -.. _compute resource create: https://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/compute/create.py +.. _compute resource list: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/compute/list.py +.. _network resource list: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/network/list.py +.. _compute resource create: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/compute/create.py .. _public–key cryptography: https://en.wikipedia.org/wiki/Public-key_cryptography diff --git a/doc/source/user/guides/connect.rst b/doc/source/user/guides/connect.rst index bcf15fe02..5630bbcd8 100644 --- a/doc/source/user/guides/connect.rst +++ b/doc/source/user/guides/connect.rst @@ -18,7 +18,7 @@ To create a :class:`~openstack.connection.Connection` instance, use the .. literalinclude:: ../examples/connect.py :pyobject: create_connection -Full example at `connect.py `_ +Full example at `connect.py `_ .. note:: To enable logging, see the :doc:`logging` user guide. diff --git a/doc/source/user/guides/connect_from_config.rst b/doc/source/user/guides/connect_from_config.rst index dfa489ca6..0e0b4572e 100644 --- a/doc/source/user/guides/connect_from_config.rst +++ b/doc/source/user/guides/connect_from_config.rst @@ -6,7 +6,7 @@ In order to work with an OpenStack cloud you first need to create a :class:`~openstack.connection.Connection` can be created in 3 ways, using the class itself (see :doc:`connect`), a file, or environment variables as illustrated below. The SDK uses -`os-client-config `_ +`os-client-config `_ to handle the configuration. Create Connection From A File diff --git a/doc/source/user/guides/identity.rst b/doc/source/user/guides/identity.rst index 5041f7a3a..9d9444144 100644 --- a/doc/source/user/guides/identity.rst +++ b/doc/source/user/guides/identity.rst @@ -108,4 +108,4 @@ sub-regions with a region to make a tree-like structured hierarchy. Full example: `identity resource list`_ -.. _identity resource list: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/identity/list.py +.. _identity resource list: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/identity/list.py diff --git a/doc/source/user/guides/image.rst b/doc/source/user/guides/image.rst index 42e32118c..9065a4931 100644 --- a/doc/source/user/guides/image.rst +++ b/doc/source/user/guides/image.rst @@ -89,9 +89,9 @@ Delete an image. Full example: `image resource delete`_ -.. _image resource create: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/image/create.py -.. _image resource import: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/image/import.py -.. _image resource delete: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/image/delete.py -.. _image resource list: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/image/list.py -.. _image resource download: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/image/download.py +.. _image resource create: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/image/create.py +.. _image resource import: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/image/import.py +.. _image resource delete: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/image/delete.py +.. _image resource list: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/image/list.py +.. _image resource download: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/image/download.py .. _interoperable image import: https://docs.openstack.org/glance/latest/admin/interoperable-image-import.html diff --git a/doc/source/user/guides/network.rst b/doc/source/user/guides/network.rst index e824e9b55..fc5f4ac0f 100644 --- a/doc/source/user/guides/network.rst +++ b/doc/source/user/guides/network.rst @@ -136,7 +136,7 @@ Delete a project network and its subnets. Full example: `network resource delete`_ -.. _network resource create: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/network/create.py -.. _network resource delete: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/network/delete.py -.. _network resource list: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/network/list.py -.. _network security group create: http://git.openstack.org/cgit/openstack/openstacksdk/tree/examples/network/security_group_rules.py +.. _network resource create: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/network/create.py +.. _network resource delete: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/network/delete.py +.. _network resource list: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/network/list.py +.. _network security group create: https://opendev.org/openstack/openstacksdk/src/branch/master/examples/network/security_group_rules.py diff --git a/doc/source/user/multi-cloud-demo.rst b/doc/source/user/multi-cloud-demo.rst index c4fb90f4f..87a3dcfb9 100644 --- a/doc/source/user/multi-cloud-demo.rst +++ b/doc/source/user/multi-cloud-demo.rst @@ -45,7 +45,7 @@ What are we going to talk about? shade is Free Software ====================== -* https://git.openstack.org/cgit/openstack-infra/shade +* https://opendev.org/openstack-infra/shade * openstack-discuss@lists.openstack.org * #openstack-shade on freenode diff --git a/openstack/config/schema.json b/openstack/config/schema.json index cd430d061..7ea7d050a 100644 --- a/openstack/config/schema.json +++ b/openstack/config/schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "https://git.openstack.org/cgit/openstack/cloud-data/plain/schema.json#", + "id": "https://opendev.org/openstack/openstacksdk/raw/branch/master/openstack/config/schema.json", "type": "object", "properties": { "auth_type": { diff --git a/openstack/config/vendor-schema.json b/openstack/config/vendor-schema.json index 5847ae545..ba671023a 100644 --- a/openstack/config/vendor-schema.json +++ b/openstack/config/vendor-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "https://git.openstack.org/cgit/openstack/cloud-data/plain/vendor-schema.json#", + "id": "https://opendev.org/openstack/openstacksdk/raw/branch/master/openstack/config/vendor-schema.json#", "type": "object", "properties": { "name": { diff --git a/openstack/instance_ha/v1/host.py b/openstack/instance_ha/v1/host.py index a505a648d..6ee6a4b4f 100644 --- a/openstack/instance_ha/v1/host.py +++ b/openstack/instance_ha/v1/host.py @@ -32,11 +32,6 @@ class Host(resource.Resource): allow_commit = True allow_delete = True - # Properties - # Refer "https://github.com/openstack/masakari/blob/ - # master/masakari/api/openstack/ha/schemas/hosts.py" - # for properties of host API - #: A ID of representing this host id = resource.URI("id") #: A Uuid of representing this host diff --git a/openstack/instance_ha/v1/notification.py b/openstack/instance_ha/v1/notification.py index 42dabe6ee..c83ded92a 100644 --- a/openstack/instance_ha/v1/notification.py +++ b/openstack/instance_ha/v1/notification.py @@ -51,11 +51,6 @@ class Notification(resource.Resource): allow_commit = False allow_delete = False - # Properties - # Refer "https://github.com/openstack/masakari/tree/ - # master/masakari/api/openstack/ha/schemas/notificaions.py" - # for properties of notifications API - #: A ID of representing this notification. id = resource.Body("id") #: A Uuid of representing this notification. diff --git a/openstack/instance_ha/v1/segment.py b/openstack/instance_ha/v1/segment.py index a2668f71c..c13b01e29 100644 --- a/openstack/instance_ha/v1/segment.py +++ b/openstack/instance_ha/v1/segment.py @@ -32,11 +32,6 @@ class Segment(resource.Resource): allow_commit = True allow_delete = True - # Properties - # Refer "https://github.com/openstack/masakari/tree/ - # master/masakari/api/openstack/ha/schemas" - # for properties of each API - #: A ID of representing this segment. id = resource.Body("id") #: A Uuid of representing this segment. diff --git a/releasenotes/notes/removed-glanceclient-105c7fba9481b9be.yaml b/releasenotes/notes/removed-glanceclient-105c7fba9481b9be.yaml index dc633522d..b926f4b44 100644 --- a/releasenotes/notes/removed-glanceclient-105c7fba9481b9be.yaml +++ b/releasenotes/notes/removed-glanceclient-105c7fba9481b9be.yaml @@ -9,7 +9,7 @@ prelude: > ``openstack.auth.base.BaseAuthPlugin`` classes are no more. Profile has been replace by ``openstack.config.cloud_region.CloudRegion`` from `os-client-config - `_ + `_ ``openstack.auth.base.BaseAuthPlugin`` has been replaced with the Auth plugins from keystoneauth.