diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index b70fa172a7..b3184f6099 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -19,9 +19,9 @@ the workflow documented at:
(Pull requests submitted through GitHub will be ignored.)
-Bugs should be filed on Launchpad, not GitHub:
+Bugs should be filed on Storyboard now, not GitHub:
- https://bugs.launchpad.net/trove
+ https://storyboard.openstack.org/#!/project/openstack/trove
We welcome all types of contributions, from blueprint designs to
documentation to testing to deployment scripts. The best way to get
@@ -171,17 +171,17 @@ process.
there is no available volunteer who will step up to take over the
patch set.
-Launchpad Bugs
---------------
+Storyboard Bugs
+---------------
-Bugs should be filed on Launchpad at:
+Bugs should be filed on Storyboard at:
- https://bugs.launchpad.net/trove
+ https://storyboard.openstack.org/#!/project/openstack/trove
-All changes that address a Launchpad bug should include the bug in the
-Commit Message using the Closes-Bug, Related-Bug, or Partial-Bug keyword.
+All changes that address a Storyboard bug should include the bug in the
+Commit Message using the Story and Task.
-It is not required that a Launchpad bug be filed for every change.
+It is not required that a Storyboard bug be filed for every change.
Release Notes
-------------
@@ -192,8 +192,8 @@ that are submitted as part of a change will be included in the release
notes. The failure to add a release note for a user visible change
should be identified in review, and corrected.
-If a Launchpad bug is being fixed, the release note should list the
-bug number.
+If a Storyboard bug is being fixed, the release note should list the
+story and task number.
For help using reno, the release notes tool, see:
diff --git a/README.rst b/README.rst
index 8322e79264..6e80305e39 100644
--- a/README.rst
+++ b/README.rst
@@ -24,7 +24,7 @@ CONTRIBUTING.rst_ and HACKING.rst_
* `Developer Docs `_
You can raise bugs here:
-`Bug Tracker `_
+`Bug Tracker `_
The plan for trove can be found at
`Trove Specs `_
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 2c3e360ad3..923cae16e7 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -34,9 +34,9 @@ For an in-depth look at the project's design and structure, see the
- `Trove Client`_
* `Trove Wiki`_ on OpenStack
-* `Trove API Documentation`_ on developer.openstack.org
-* `Trove Blueprints`_ on blueprints.launchpad.net
-* `Trove Bugs`_ on bugs.launchpad.net
+* `Trove API Documentation`_ on docs.openstack.org
+* `Trove Blueprints`_ on storyboard.openstack.org
+* `Trove Bugs`_ on storyboard.openstack.org
Guest Images
@@ -60,5 +60,5 @@ Search Trove Documentation
.. _Trove: https://opendev.org/openstack/trove
.. _Trove Client: https://opendev.org/openstack/python-troveclient
.. _Trove API Documentation: https://docs.openstack.org/api-ref/database/
-.. _Trove Blueprints: https://blueprints.launchpad.net/trove
-.. _Trove Bugs: https://bugs.launchpad.net/trove
+.. _Trove Blueprints: https://storyboard.openstack.org/#!/project/openstack/trove
+.. _Trove Bugs: https://storyboard.openstack.org/#!/project/openstack/trove