Merge "docs: weekly meetings page"

4 files changed, 73 insertions, 1 deletions

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 091e0f0a0..a0c521be8 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -50,6 +50,9 @@ add_module_names = True
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'native'
 
+# Default highlight language to use (unset defaults to python-style)
+highlight_language = 'none'
+
 # -- Options for HTML output --------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
diff --git a/doc/source/contributor/contributing.rst b/doc/source/contributor/contributing.rst
index 1bf7cdbe1..9ae7858ea 100644
--- a/doc/source/contributor/contributing.rst
+++ b/doc/source/contributor/contributing.rst
@@ -31,7 +31,7 @@ Mailing list (prefix subjects with ``[kolla]``)
     http://lists.openstack.org/pipermail/openstack-discuss/
 
 Meeting Agenda
-    https://wiki.openstack.org/wiki/Meetings/Kolla
+    :ref:`Meeting agenda <meeting-agenda>`
 
 Whiteboard (etherpad)
     Keeping track of CI gate status, release status, stable backports,
diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst
index f8725fab1..687030e9c 100644
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -22,4 +22,5 @@ We welcome everyone to join our project!
    bug-triage
    ptl-guide
    release-management
+   meeting
    ci
diff --git a/doc/source/contributor/meeting.rst b/doc/source/contributor/meeting.rst
new file mode 100644
index 000000000..b4301d962
--- /dev/null
+++ b/doc/source/contributor/meeting.rst
@@ -0,0 +1,68 @@
+.. _meeting:
+
+=========================
+Weekly Kolla team meeting
+=========================
+
+Meeting time: Wednesdays at 15:00 UTC in #openstack-kolla (`OFTC`_).
+
+More info on how to join: https://meetings.opendev.org/#Kolla_Team_Meeting
+
+We track CI, release, and feature status in the `whiteboard`_.
+
+.. _meeting-agenda:
+
+Agenda
+======
+
+The regular agenda for the weekly meeting is as follows::
+
+    * Roll-call
+    * Agenda
+    * Announcements
+    * Review action items from the last meeting
+    * CI status
+    * Release tasks
+    * Current cycle planning
+    * Additional agenda (from whiteboard)
+    * Open discussion
+
+Anyone who would like to discuss an additional topic may post it on the
+`whiteboard`_ under "Weekly meetings additional agenda".
+
+Chairing a meeting
+==================
+
+Copy/Paste into IRC to kick the meeting off::
+
+    #startmeeting kolla
+
+Then, once the bot has caught up and everyone is settled::
+
+    #topic rollcall
+
+Once folks have checked in, run the agenda by the group present::
+
+    #topic agenda
+    copy and paste agenda from above
+
+Go through topics from agenda::
+
+    #topic something
+
+And in the end finish the meeting::
+
+    #endmeeting
+
+Copy/Paste for IRC::
+
+    https://bugs.launchpad.net/kolla
+    #link https://bugs.launchpad.net/kolla
+
+Previous meetings
+=================
+
+`IRC logs <http://meetings.opendev.org/meetings/kolla>`_
+
+.. _whiteboard: https://etherpad.opendev.org/p/KollaWhiteBoard
+.. _OFTC: https://www.oftc.net