From 5edb7debd622767a6ec7fd43adb847cd6f94dc8b Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Mon, 31 May 2021 15:26:58 +0200 Subject: [PATCH] Update our documentation to reflect the move to OFTC Change-Id: Ibc90d1b988d65fe370fd46c0e5f7b457cb84152c --- doc/source/contribute-cloud.rst | 2 +- doc/source/irc.rst | 27 ++++++++++++------------- doc/source/project.rst | 6 +++--- docker/gitea/custom/templates/home.tmpl | 2 +- hiera/common.yaml | 4 ++-- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/doc/source/contribute-cloud.rst b/doc/source/contribute-cloud.rst index 9b6bdf20a7..9e2d04acc1 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 , or in our IRC channel, -`#opendev` on Freenode. +`#opendev` on OFTC. Contribution Workflow ===================== diff --git a/doc/source/irc.rst b/doc/source/irc.rst index 4edee69285..368052f224 100644 --- a/doc/source/irc.rst +++ b/doc/source/irc.rst @@ -3,12 +3,11 @@ .. _irc: .. - TODO this entire doc shoudl be reevaluated in light of IRC changes IRC Services ############ -The infrastructure team runs a number of IRC bots that are active on +The OpenDev team runs a number of IRC bots that are active on OpenDev and OpenStack related channels. At a Glance @@ -48,12 +47,11 @@ Access ------ `Register the channel with ChanServ -`_ and give the -infrastructure team account founder access to the channel with:: +`_ and give the +infrastructure team account master access to the channel with:: /msg chanserv register #channel - /msg chanserv set #channel guard on - /msg chanserv access #channel add openstackinfra +AFRefiorstv + /msg chanserv access #channel add opendevaccess master 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 @@ -68,7 +66,7 @@ channel to gerritbot and accessbot, otherwise Zuul will fail tests. Meetbot ======= -The OpenStack Infrastructure team runs a slightly modified +The OpenDev team runs a slightly modified `Meetbot `_ to log IRC channel activity and meeting minutes. Meetbot is a plugin for `Supybot `_ which adds meeting @@ -95,10 +93,10 @@ if you don't want a prefix character). Meetbot ------- -The OpenStack Infrastructure Meetbot fork can be found at +The OpenDev Meetbot fork can be found at https://opendev.org/opendev/meetbot. Manual installation of the Meetbot plugin is straightforward and documented in that repository's README. -OpenStack Infrastructure installs and configures Meetbot through Puppet. +OpenDev installs and configures Meetbot through Puppet. Starting a Meeting ^^^^^^^^^^^^^^^^^^ @@ -113,12 +111,12 @@ characters translated to '_', so the above example will record to the ``marketing_committee`` directory. Be sure to use a consistent meeting name to ensure logs are recorded to the same location. -This feature is specific to the OpenStack Infrastructure Meetbot fork. +This feature is specific to the OpenDev Meetbot fork. Voting ^^^^^^ -The OpenStack Infrastructure Meetbot fork adds simple voting features. After +The OpenDev Meetbot fork adds simple voting features. After a meeting has been started a meeting chair can begin a voting block with the ``#startvote`` command. The command takes two arguments, a question posed to voters (ending with a ``?``), and the valid voting options. If the second @@ -195,11 +193,12 @@ listening to, including #opendev: Log a message to the wiki page. #status notice MESSAGE - Broadcast a message to all OpenStack channels, and log to the wiki - page. + Broadcast a message to all OpenDev and OpenStack channels, and + log to the wiki page. #status alert MESSAGE - Broadcast a message to all OpenStack channels and change their + Broadcast a message to all OpenDev and OpenStack channels and + change their topics, log to the wiki page, and set an alert box on the wiki page (eventually include this alert box on status.openstack.org pages). diff --git a/doc/source/project.rst b/doc/source/project.rst index 815126a733..d2632413a9 100644 --- a/doc/source/project.rst +++ b/doc/source/project.rst @@ -42,11 +42,11 @@ We welcome contributions from new contributors. Reading this documentation is the first step. You should also join our `mailing list `_. We are most active on IRC, so please join the **#opendev** -channel on Freenode. +channel on OFTC. Feel free to attend our `weekly IRC meeting `_ -on Tuesdays at 19:00 UTC in #openstack-meeting. +on Tuesdays at 19:00 UTC in #opendev-meeting on OFTC. To read about how our systems are managed and how to view or edit those configurations, see :ref:`sysadmin`. @@ -93,7 +93,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 -#opendev on Freenode. +#opendev on OFTC. Governance ========== diff --git a/docker/gitea/custom/templates/home.tmpl b/docker/gitea/custom/templates/home.tmpl index 740f02adc4..494ff1c96a 100644 --- a/docker/gitea/custom/templates/home.tmpl +++ b/docker/gitea/custom/templates/home.tmpl @@ -177,7 +177,7 @@ functionality is limited.

Contact info

    -
  • IRC #opendev on Freenode (logs)
    • +
  • IRC #opendev on OFTC (logs)
  • Mailing list: service-discuss@lists.opendev.org (subscribe)
  • Important announcements: service-announce@lists.opendev.org (subscribe)
diff --git a/hiera/common.yaml b/hiera/common.yaml index c872fc3d18..c37d95aa51 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -86,8 +86,8 @@ statusbot_channels: - tacker - tripleo - zuul -# Note that freenode only allows a single account to connect to 120 -# channel. +# Note that OFTC only allows a single account to connect to 120 +# channels. meetbot_channels: - '#airshipit' - '#cloudkitty'