diff --git a/doc/source/_exts/projects.py b/doc/source/_exts/projects.py index 195dd4b..a411e62 100644 --- a/doc/source/_exts/projects.py +++ b/doc/source/_exts/projects.py @@ -25,7 +25,7 @@ import yamlordereddictloader LOG = logging.getLogger(__name__) -IRC_LOG_URL_BASE = 'http://eavesdrop.openstack.org/irclogs/%23' +MATRIX_LOG_URL_BASE = 'https://meetings.opendev.org/irclogs//%23' _projects_yaml = {} @@ -59,14 +59,14 @@ def _project_to_rst(name, info): yield '=' * len(title) yield '' yield ':Home Page: ' + info.get('url', '') - tl = info.get('tl', {'name': '', 'irc': '', 'email': ''}) - yield ':Technical Lead: %(name)s (``%(irc)s``) <%(email)s>' % tl - pl = info.get('pl', {'name': '', 'irc': '', 'email': ''}) - yield ':Project Lead: %(name)s (``%(irc)s``) <%(email)s>' % pl - irc_channel = info.get('irc-channel') - if irc_channel: - yield ':IRC Channel: `#%s <%s%s>`__' % ( - irc_channel, IRC_LOG_URL_BASE, irc_channel) + tl = info.get('tl', {'name': '', 'matrix': '', 'email': ''}) + yield ':Technical Lead: %(name)s (``%(matrix)s``) <%(email)s>' % tl + pl = info.get('pl', {'name': '', 'matrix': '', 'email': ''}) + yield ':Project Lead: %(name)s (``%(matrix)s``) <%(email)s>' % pl + matrix_room = info.get('matrix-room') + if matrix_room: + yield ':Matrix Room: `#%s <%s%s>`__' % ( + matrix_room, MATRIX_LOG_URL_BASE, matrix_room) service = info.get('service') if service: yield ':Service: ' + service diff --git a/reference/tsc/projects.yaml b/reference/tsc/projects.yaml index d029e3c..b382688 100644 --- a/reference/tsc/projects.yaml +++ b/reference/tsc/projects.yaml @@ -2,13 +2,13 @@ build: pl: name: - irc: + matrix: email: tl: name: Scott Little - irc: + matrix: email: scott.little@windriver.com - irc-channel: starlingx + matrix-room: starlingx-build mission: > Cloud Builders url: https://wiki.openstack.org/wiki/StarlingX/Build @@ -36,13 +36,13 @@ build: containers: pl: name: Bruce Jones - irc: + matrix: email: Bruce.Jones@windriver.com tl: name: - irc: + matrix: email: - irc-channel: starlingx + matrix-room: starlingx-containers service: Container Platform mission: > Provide container platform for StarlingX @@ -73,13 +73,13 @@ containers: distcloud: pl: name: - irc: + matrix: email: tl: name: Tee Ngo - irc: + matrix: email: tee.ngo@windriver.com - irc-channel: starlingx + matrix-room: starlingx-distcloud service: Distributed Cloud mission: > Spreading out the goodness @@ -95,13 +95,13 @@ distcloud: distro: pl: name: - irc: + matrix: email: tl: name: - irc: + matrix: email: - irc-channel: starlingx + matrix-room: starlingx-distro mission: > Maintain the StarlingX Kernel and Operating System (OS). url: https://docs.starlingx.io/ @@ -122,13 +122,13 @@ distro: docs: pl: name: Greg Waines - irc: + matrix: email: greg.waines@windriver.com tl: name: Juanita Balaraj - irc: + matrix: email: juanita.balaraj@windriver.com - irc-channel: starlingx + matrix-room: starlingx-docs mission: > Explaining us to the world url: https://docs.starlingx.io/ @@ -153,13 +153,13 @@ docs: flock-services: pl: name: - irc: + matrix: email: tl: name: John Kung - irc: + matrix: email: john.kung@windriver.com - irc-channel: starlingx + matrix-room: starlingx-flock service: StarlingX Flock Services mission: > Maintains the complete set of the StarlingX flock services @@ -183,13 +183,13 @@ flock-services: networking: pl: name: Steven Webster - irc: + matrix: email: steven.webster@windriver.com tl: name: Steven Webster - irc: + matrix: email: steven.webster@windriver.com - irc-channel: starlingx + matrix-room: starlingx-networking service: StarlingX Networking mission: > Developing features and addressing bugs related to StarlingX networking @@ -257,13 +257,13 @@ networking: openstack-distro: pl: name: Douglas Lopes Pereira - irc: + matrix: email: douglas.pereira@windriver.com tl: name: Thales Elero Cervi - irc: + matrix: email: thaleselero.cervi@windriver.com - irc-channel: starlingx + matrix-room: starlingx-openstack service: StarlingX Openstack Integration mission: > Upstreaming of OpenStack patches and OpenStack integration in StarlingX @@ -295,13 +295,13 @@ openstack-distro: release: pl: name: - irc: + matrix: email: tl: name: - irc: + matrix: email: - irc-channel: starlingx + matrix-room: starlingx-release mission: > StarlingX Release Management url: https://wiki.openstack.org/wiki/StarlingX/Releases @@ -331,13 +331,13 @@ release: security: pl: name: - irc: + matrix: email: tl: name: - irc: + matrix: email: - irc-channel: starlingx + matrix-room: starlingx-general mission: > Developing features and addressing bugs / CVEs related to StarlingX security url: https://wiki.openstack.org/wiki/StarlingX/Security @@ -392,13 +392,13 @@ security: test: pl: name: Rob Cooke - irc: + matrix: email: rob.cooke@windriver.com tl: name: Rob Cooke - irc: + matrix: email: rob.cooke@windriver.com - irc-channel: starlingx + matrix-room: starlingx-test mission: > If it is not tested it is broken url: https://docs.starlingx.io/