diff --git a/doc/source/contribute-cloud.rst b/doc/source/contribute-cloud.rst
index 4ee433eb22..023bd8637c 100644
--- a/doc/source/contribute-cloud.rst
+++ b/doc/source/contribute-cloud.rst
@@ -96,7 +96,7 @@ If this sounds interesting, and you have some capacity to spare, it
would be very much appreciated. You are welcome to contact the
Infrastructure team on our public mailing list at
<openstack-infra@lists.openstack.org>, or in our IRC channel,
-`#openstack-infra` on Freenode. You are also welcome to privately
+`#opendev` on Freenode. You are also welcome to privately
contact the `Infrastructure Project Team lead
<https://governance.openstack.org/tc/reference/projects/infrastructure.html>`_.
@@ -166,7 +166,7 @@ Once the public review is ready, the secret values used in the review
need to be manually entered by an ``infra-root`` member into the
secret storage on ``bridge.openstack.org``. You can communicate these
via GPG encrypted mail to a ``infra-root`` member (ping ``infra-root``
-in ``#openstack-infra`` and someone will appear). If not told
+in ``#opendev`` and someone will appear). If not told
explicitly, most sign the OpenStack signing key, so you can find their
preferred key via that; if the passwords can be changed plain-text is
also fine. With those in place, the public review will be committed
diff --git a/doc/source/github.rst b/doc/source/github.rst
index 28edb3fa21..119d5f984f 100644
--- a/doc/source/github.rst
+++ b/doc/source/github.rst
@@ -22,7 +22,7 @@ At a Glance
* https://opendev.org/zuul/zuul
* https://opendev.org/opendev/jeepyb
:Chat:
- * #openstack-infra on freenode
+ * #opendev on freenode
Overview
========
diff --git a/doc/source/irc.rst b/doc/source/irc.rst
index ca2b885fa5..fcdcb27472 100644
--- a/doc/source/irc.rst
+++ b/doc/source/irc.rst
@@ -6,14 +6,14 @@ IRC Services
############
The infrastructure team runs a number of IRC bots that are active on
-OpenStack related channels.
+OpenDev and OpenStack related channels.
At a Glance
===========
:Hosts:
* http://eavesdrop.openstack.org/
- * http://review.opendev.org/
+ * https://review.opendev.org/
* https://wiki.openstack.org/wiki/Infrastructure_Status
* http://ptg.openstack.org/
:Puppet:
@@ -27,8 +27,8 @@ At a Glance
* :config:`gerritbot/channels.yaml`
* :config:`accessbot/channels.yaml`
:Projects:
- * http://wiki.debian.org/MeetBot
- * http://sourceforge.net/projects/supybot/
+ * https://wiki.debian.org/MeetBot
+ * https://sourceforge.net/projects/supybot/
* https://opendev.org/opendev/meetbot
* https://opendev.org/opendev/gerritbot
* https://opendev.org/opendev/statusbot
@@ -57,7 +57,8 @@ This is good practice project-wide to make sure we keep channels under
control and is a requirement if you want any of the project bots in
your channel.
-Join #openstack-infra if you have any trouble with any of these commands.
+Join #opendev and ask for help if you have any trouble with any of these
+commands.
NOTE: Channel admin should issue the access commands above BEFORE adding
channel to gerritbot and accessbot, otherwise Zuul will fail tests.
@@ -65,17 +66,17 @@ channel to gerritbot and accessbot, otherwise Zuul will fail tests.
Meetbot
=======
-The OpenStack Infrastructure team run a slightly modified
-`Meetbot <http://wiki.debian.org/MeetBot>`_ to log IRC channel activity and
+The OpenStack Infrastructure team runs a slightly modified
+`Meetbot <https://wiki.debian.org/MeetBot>`_ to log IRC channel activity and
meeting minutes. Meetbot is a plugin for
-`Supybot <http://sourceforge.net/projects/supybot/>`_ which adds meeting
+`Supybot <https://sourceforge.net/projects/supybot/>`_ which adds meeting
support features to the Supybot IRC bot.
Supybot
-------
In order to run Meetbot you will need to get Supybot. You can find the latest
-release `here <http://sourceforge.net/projects/supybot/files/>`_. Once you have
+release `here <https://sourceforge.net/projects/supybot/files/>`_. Once you have
extracted the release you will want to read the ``INSTALL`` and
``doc/GETTING_STARTED`` files. Those two files should have enough
information to get you going, but there are other goodies in ``doc/``.
@@ -180,13 +181,13 @@ Statusbot
=========
Statusbot is used to distribute urgent information from the
-Infrastructure team to OpenStack channels. It updates the
+Infrastructure team to OpenDev and OpenStack channels. It updates the
`Infrastructure Status wiki page
<https://wiki.openstack.org/wiki/Infrastructure_Status>`_.
It supports the following public message commands when issued by
authenticated and whitelisted users from the channels the bot is
-listening to, including #openstack-infra:
+listening to, including #opendev:
#status log MESSAGE
Log a message to the wiki page.
diff --git a/doc/source/letsencrypt.rst b/doc/source/letsencrypt.rst
index 260cb209f7..33c6c619d1 100644
--- a/doc/source/letsencrypt.rst
+++ b/doc/source/letsencrypt.rst
@@ -21,7 +21,7 @@ At a Glance
* https://letsencrypt.org
* https://github.com/Neilpang/acme.sh
:Chat:
- * #openstack-infra on freenode
+ * #opendev on freenode
Overview
========
diff --git a/doc/source/ppa.rst b/doc/source/ppa.rst
index 65fc18db79..4c9437c6be 100644
--- a/doc/source/ppa.rst
+++ b/doc/source/ppa.rst
@@ -46,7 +46,7 @@ current member of the team, or the parent `OpenStack Administrators
<https://launchpad.net/~openstack-admins>`__ group can add a person to
the PPA.
-This can be arranged via discussion in #openstack-infra, on the infra
+This can be arranged via discussion in #opendev, on the infra
mailing list or perhaps via a topic discussion in the weekly meeting.
Uploading
diff --git a/doc/source/project.rst b/doc/source/project.rst
index d6c675f48a..79f188e029 100644
--- a/doc/source/project.rst
+++ b/doc/source/project.rst
@@ -35,7 +35,7 @@ Contributing
We welcome contributions from new contributors. Reading this
documentation is the first step. You should also join our `mailing list <http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-infra>`_.
-We are most active on IRC, so please join the **#openstack-infra**
+We are most active on IRC, so please join the **#opendev**
channel on Freenode.
Feel free to attend our `weekly IRC meeting
@@ -95,7 +95,7 @@ Changes not related to priority efforts will be reviewed by the core
review team as time permits. This may mean that they spend
considerable time in review, but they will be reviewed eventually. If
a change is urgent, you might consider contacting someone in
-#openstack-infra on Freenode.
+#opendev on Freenode.
Teams
=====
diff --git a/doc/source/storyboard.rst b/doc/source/storyboard.rst
index c30044bad3..daed80cc28 100644
--- a/doc/source/storyboard.rst
+++ b/doc/source/storyboard.rst
@@ -55,7 +55,7 @@ Adding a Project to StoryBoard
.. note::
As cross-project work should be tracked in the same task-tracker,
those wishing to set up new projects in StoryBoard should check about
- their specific circumstances in #openstack-infra.
+ their specific circumstances in #opendev.
Projects loaded into StoryBoard are handled from the same file that drives our
gerrit projects. Adding a new project is as simple as modifying a single
diff --git a/doc/source/sysadmin.rst b/doc/source/sysadmin.rst
index 73896b4543..e0ec2d8d6b 100644
--- a/doc/source/sysadmin.rst
+++ b/doc/source/sysadmin.rst
@@ -406,7 +406,7 @@ these cases, use the following procedure to force-merge a change.
* Add +2 Code-Review, and +1 Workflow votes if necessary, then add +2
Verified. Also leave a review comment briefly explaining why this
- was necessary, and make sure to mention it in the #openstack-infra
+ was necessary, and make sure to mention it in the #opendev
IRC channel (ideally as a #status log entry for the benefit of
those not paying close attention to scrollback).
diff --git a/doc/source/third_party.rst b/doc/source/third_party.rst
index 8d6e2a21f0..02c0bf53ba 100644
--- a/doc/source/third_party.rst
+++ b/doc/source/third_party.rst
@@ -415,7 +415,7 @@ third-party ci system has been disabled, check the archives of the
mailing list to which you hopefully are subscribed. The email that notifies
this list that your account has been disabled will include instructions for
getting your system re-enabled. You are also welcome to join us in the
-#openstack-infra irc channel on freenode to discuss your situation.
+#opendev irc channel on freenode to discuss your situation.
In order to get your Third Party CI account to have voting permissions on
repos in gerrit in addition to ``opendev/ci-sandbox`` you have a greater
diff --git a/docker/gitea/custom/templates/home.tmpl b/docker/gitea/custom/templates/home.tmpl
index e1e28ae6e8..868d08aba5 100644
--- a/docker/gitea/custom/templates/home.tmpl
+++ b/docker/gitea/custom/templates/home.tmpl
@@ -60,7 +60,7 @@
<p>These will be updated when moved to their new OpenDev locations</p>
<ul>
<li>Mailing list: openstack-infra@lists.openstack.org</li>
- <li>IRC #openstack-infra on Freenode</li>
+ <li>IRC #opendev on Freenode</li>
</ul>
</div>
diff --git a/tools/irc_checks.py b/tools/irc_checks.py
index 21686a86fe..ba5662dbd2 100644
--- a/tools/irc_checks.py
+++ b/tools/irc_checks.py
@@ -32,7 +32,7 @@ def check_meetbot():
% len(meetbot_channels))
print("Sorry, we're at our limit and cannot add more for now.")
print("If you want to help set up another instance contact the "
- "infra team in #openstack-infra.\n")
+ "infra team in #opendev.\n")
errors = True
return errors