diff --git a/README.rst b/README.rst index c9bfbf3708..80bcbd7d9e 100644 --- a/README.rst +++ b/README.rst @@ -70,7 +70,7 @@ volumes, etc.) these will have to be deployed by an OpenDev administrator before your code is committed. Thus if you know you will need new resources, it is best to coordinate this before review. -The `#opendev `__ IRC +The `#opendev` IRC on OFTC channel is the main place for interactive discussion. Feel free to ask any questions and someone will try to help ASAP. The `OpenDev meeting `__ is a diff --git a/doc/source/github.rst b/doc/source/github.rst index 337ec9d9ce..07e75a1df3 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: - * #opendev on freenode + * #opendev on OFTC Overview ======== diff --git a/doc/source/irc.rst b/doc/source/irc.rst index dd0a051258..4edee69285 100644 --- a/doc/source/irc.rst +++ b/doc/source/irc.rst @@ -2,6 +2,9 @@ .. _irc: +.. + TODO this entire doc shoudl be reevaluated in light of IRC changes + IRC Services ############ diff --git a/doc/source/letsencrypt.rst b/doc/source/letsencrypt.rst index 7dda8006cd..48757475c2 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: - * #opendev on freenode + * #opendev on OFTC Overview ======== diff --git a/doc/source/third_party.rst b/doc/source/third_party.rst index 98971b822f..d30a0cc482 100644 --- a/doc/source/third_party.rst +++ b/doc/source/third_party.rst @@ -361,7 +361,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 -#opendev irc channel on freenode to discuss your situation. +#opendev irc channel on OFTC 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/doc/source/zuul.rst b/doc/source/zuul.rst index 10c63414c3..375f6ecc8e 100644 --- a/doc/source/zuul.rst +++ b/doc/source/zuul.rst @@ -26,7 +26,7 @@ At a Glance :Resources: * `Zuul Reference Manual`_ :Chat: - * #zuul on freenode + * #zuul on OFTC Overview ======== diff --git a/manifests/eavesdrop.pp b/manifests/eavesdrop.pp index 7e8b33bfea..122f7d7dd6 100644 --- a/manifests/eavesdrop.pp +++ b/manifests/eavesdrop.pp @@ -3,9 +3,9 @@ node /^eavesdrop\d*\.open.*\.org$/ { $group = "eavesdrop" class { 'openstack_project::eavesdrop': nickpass => hiera('openstack_meetbot_password'), - statusbot_nick => hiera('statusbot_nick', 'username'), + statusbot_nick => 'opendevstatus', statusbot_password => hiera('statusbot_nick_password'), - statusbot_server => 'chat.freenode.net', + statusbot_server => 'irc.oftc.net', statusbot_channels => hiera_array('statusbot_channels', ['openstack_infra']), statusbot_auth_nicks => hiera_array('statusbot_auth_nicks'), statusbot_wiki_user => hiera('statusbot_wiki_username', 'username'), diff --git a/playbooks/roles/gerritbot/defaults/main.yaml b/playbooks/roles/gerritbot/defaults/main.yaml index b61c23490e..680df8fbec 100644 --- a/playbooks/roles/gerritbot/defaults/main.yaml +++ b/playbooks/roles/gerritbot/defaults/main.yaml @@ -1,4 +1,4 @@ -gerritbot_irc_nick: openstackgerrit -gerritbot_irc_server: irc.freenode.net +gerritbot_irc_nick: opendevreview +gerritbot_irc_server: irc.oftc.net gerritbot_gerrit_user: gerritbot gerritbot_gerrit_host: review.openstack.org