diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 9c24e6d679..efa4616bfa 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -15,6 +15,6 @@ 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, not GitHub:
- https://bugs.launchpad.net/sahara
+ https://storyboard.openstack.org/#!/project/935
diff --git a/README.rst b/README.rst
index ca37ff7233..34b3a4630e 100644
--- a/README.rst
+++ b/README.rst
@@ -12,7 +12,7 @@ OpenStack Data Processing ("Sahara") project
Sahara at wiki.openstack.org: https://wiki.openstack.org/wiki/Sahara
-Launchpad project: https://launchpad.net/sahara
+Storyboard project: https://storyboard.openstack.org/#!/project/935
Sahara docs site: https://docs.openstack.org/sahara/latest/
@@ -24,7 +24,7 @@ How to participate: https://docs.openstack.org/sahara/latest/contributor/how-to-
Source: https://git.openstack.org/cgit/openstack/sahara
-Bugs and feature requests: https://bugs.launchpad.net/sahara
+Bugs and feature requests: https://storyboard.openstack.org/#!/project/935
License
-------
diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index 6e8bc2abc5..d7580249d8 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -34,7 +34,7 @@ extensions = [
# openstackdocstheme options
repository_name = 'openstack/sahara'
-bug_project = 'sahara'
+bug_project = '935'
bug_tag = 'api-ref'
html_last_updated_fmt = '%Y-%m-%d %H:%M'
diff --git a/doc/source/_templates/sidebarlinks.html b/doc/source/_templates/sidebarlinks.html
index af88d86175..09ad156cb3 100644
--- a/doc/source/_templates/sidebarlinks.html
+++ b/doc/source/_templates/sidebarlinks.html
@@ -1,7 +1,7 @@
Useful Links
{% if READTHEDOCS %}
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 425188c20c..85a81e32c8 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -43,7 +43,7 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo', 'sp
# openstackdocstheme options
repository_name = 'openstack/sahara'
-bug_project = 'sahara'
+bug_project = '935'
bug_tag = 'doc'
html_last_updated_fmt = '%Y-%m-%d %H:%M'
diff --git a/doc/source/contributor/how-to-participate.rst b/doc/source/contributor/how-to-participate.rst
index c1d89e614b..dbda4fcfe7 100644
--- a/doc/source/contributor/how-to-participate.rst
+++ b/doc/source/contributor/how-to-participate.rst
@@ -7,7 +7,7 @@ Getting started
* Make sure that your local git is properly configured by executing
``git config --list``. If not, configure ``user.name``, ``user.email``
-* Create account on `Launchpad `_
+* Create account on `Launchpad `_
(if you don't have one)
* Subscribe to `OpenStack general mail-list `_
diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst
index d07cfec0d9..a07b2354ba 100644
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -26,6 +26,6 @@ Other Resources
.. toctree::
:maxdepth: 2
- launchpad
+ project
gerrit
jenkins
diff --git a/doc/source/contributor/launchpad.rst b/doc/source/contributor/project.rst
similarity index 56%
rename from doc/source/contributor/launchpad.rst
rename to doc/source/contributor/project.rst
index c7af262548..ce97cf1c0b 100644
--- a/doc/source/contributor/launchpad.rst
+++ b/doc/source/contributor/project.rst
@@ -1,8 +1,8 @@
Project hosting
===============
-`Launchpad`_ hosts the Sahara project. The Sahara project homepage on
-Launchpad is http://launchpad.net/sahara.
+`Storyboard`_ hosts the Sahara project. The Sahara project group homepage on
+Storyboard is https://storyboard.openstack.org/#!/project_group/74.
Launchpad credentials
---------------------
@@ -26,20 +26,17 @@ http://lists.openstack.org/cgi-bin/mailman/listinfo
Bug tracking
------------
-Report Sahara bugs at https://bugs.launchpad.net/sahara
+Report Sahara bugs/stories at the various project under the Sahara project
+group https://storyboard.openstack.org/#!/project_group/74
-Feature requests (Blueprints)
+Feature requests (Specs)
-----------------------------
-Sahara uses specs to track feature requests. Blueprints are at
-https://blueprints.launchpad.net/sahara. They provide a high-level summary of
-proposed changes and track associated commits. Sahara also uses specs for
+Sahara uses specs to track feature requests. They provide a high-level summary
+of proposed changes and track associated commits. Sahara also uses specs for
in-depth descriptions and discussions of blueprints. Specs follow a defined
format and are submitted as change requests to the openstack/sahara-specs
-repository. Every blueprint should have an associated spec that is agreed
-on and merged to the sahara-specs repository before it is approved, unless the
-whole team agrees that the implementation path for the feature described in
-the blueprint is completely understood.
+repository.
Technical support
-----------------
@@ -47,8 +44,6 @@ Technical support
Sahara uses `Ask OpenStack`_ to track Sahara technical support questions.
Questions related to Sahara should be tagged with 'sahara'.
-.. _Launchpad: http://launchpad.net
+.. _Storyboard: https://storyboard.openstack.org
.. _Wiki: http://wiki.openstack.org/sahara
-.. _Sahara Drivers: https://launchpad.net/~sahara-drivers
-.. _Sahara Bug Team: https://launchpad.net/~sahara-bugs
.. _Ask OpenStack: https://ask.openstack.org
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 264524b1f1..d7b6574e08 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -21,7 +21,7 @@ extensions = [
# openstackdocstheme options
repository_name = 'openstack/sahara'
-bug_project = 'sahara'
+bug_project = '935'
bug_tag = 'releasenotes'
html_last_updated_fmt = '%Y-%m-%d %H:%M'