From b27c79740abcf39efc4e2defb9cf3327df3834c5 Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Thu, 12 Mar 2020 12:24:58 +0100
Subject: [PATCH] Consolidate meeting channels

There is no need for 4 meeting channels, especially now that
we allow meetings to happen in team channels.

Let's remove #openstack-meeting-4 by moving the few meetings
still happening there to other available meeting channels.

Assuming it gets the required +1s, this change will be merged
Thursday, Mar 19 at 15utc (after the Glance meeting completes)

Once this merges, we can retire #openstack-meeting-4.

Change-Id: I96890de13083c09bdd677bf44b6eee535e6fde20
---
 meetings/cinder-team-meeting.yaml         | 2 +-
 meetings/glance-team-meeting.yaml         | 2 +-
 meetings/openstack-charms.yaml            | 4 ++--
 meetings/openstack-helm-team-meeting.yaml | 2 +-
 meetings/vitrage-team-meeting.yaml        | 2 +-
 tools/count_slot_usage.py                 | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/meetings/cinder-team-meeting.yaml b/meetings/cinder-team-meeting.yaml
index 7a6d9781..9e93e6fb 100644
--- a/meetings/cinder-team-meeting.yaml
+++ b/meetings/cinder-team-meeting.yaml
@@ -4,7 +4,7 @@ agenda_url: https://wiki.openstack.org/wiki/CinderMeetings
 schedule:
   - time:       '1400'
     day:        Wednesday
-    irc:        openstack-meeting-4
+    irc:        openstack-meeting-alt
     frequency:  weekly
     start_date: 20191204
 chair:  Brian Rosmaita (rosmaita)
diff --git a/meetings/glance-team-meeting.yaml b/meetings/glance-team-meeting.yaml
index 53f9ce4c..9a12c0e0 100644
--- a/meetings/glance-team-meeting.yaml
+++ b/meetings/glance-team-meeting.yaml
@@ -4,7 +4,7 @@ agenda_url: https://etherpad.openstack.org/p/glance-team-meeting-agenda
 schedule:
   - time:       '1400'
     day:        Thursday
-    irc:        openstack-meeting-4
+    irc:        openstack-meeting
     frequency:  weekly
     start_date: 20160107
 chair: Erno Kuvaja (jokke_)
diff --git a/meetings/openstack-charms.yaml b/meetings/openstack-charms.yaml
index 3c0640e1..39fcfe79 100644
--- a/meetings/openstack-charms.yaml
+++ b/meetings/openstack-charms.yaml
@@ -4,12 +4,12 @@ agenda_url: https://etherpad.openstack.org/p/openstack-charms-weekly-meeting
 schedule:
   - time:       '1700'
     day:        Monday
-    irc:        openstack-meeting-4
+    irc:        openstack-meeting
     frequency:  biweekly-even
     start_date: 20160711
   - time:       '1000'
     day:        Monday
-    irc:        openstack-meeting-4
+    irc:        openstack-meeting
     frequency:  biweekly-odd
     start_date: 20161205
 chair: Liam young (gnuoy), Alex Kavanagh (tinwood), David Ames (thedac), James Page (jamespage), Carlos Gonzales (cargonza)
diff --git a/meetings/openstack-helm-team-meeting.yaml b/meetings/openstack-helm-team-meeting.yaml
index e41dcf5d..57dfaba7 100644
--- a/meetings/openstack-helm-team-meeting.yaml
+++ b/meetings/openstack-helm-team-meeting.yaml
@@ -4,7 +4,7 @@ agenda_url: https://etherpad.openstack.org/p/openstack-helm-meeting-agenda
 schedule:
   - time:       '1500'
     day:        Tuesday
-    irc:        openstack-meeting-4
+    irc:        openstack-meeting-alt
     frequency:  weekly
     start_date: 20160502
 chair: Matt McEuen (mattmceuen)
diff --git a/meetings/vitrage-team-meeting.yaml b/meetings/vitrage-team-meeting.yaml
index a96aeb0d..1048848c 100644
--- a/meetings/vitrage-team-meeting.yaml
+++ b/meetings/vitrage-team-meeting.yaml
@@ -4,7 +4,7 @@ agenda_url: https://wiki.openstack.org/wiki/Meetings/Vitrage
 schedule:
   - time:       '0800'
     day:        Wednesday
-    irc:        openstack-meeting-4
+    irc:        openstack-meeting
     frequency:  weekly
     start_date: 20160106
 chair:  Ifat Afek (ifat_afek)
diff --git a/tools/count_slot_usage.py b/tools/count_slot_usage.py
index 11c6c1e0..5bbb978a 100755
--- a/tools/count_slot_usage.py
+++ b/tools/count_slot_usage.py
@@ -36,7 +36,7 @@ WEEK_COUNTS = {'first-thursday': 2, 'first-friday': 2, 'weekly': 2,
                'biweekly-even': 1, 'biweekly-odd': 1,
                'quadweekly': 1, 'quadweekly-alternate': 1, 'adhoc': 0}
 CHANNELS = ['openstack-meeting', 'openstack-meeting-alt',
-            'openstack-meeting-3', 'openstack-meeting-4']
+            'openstack-meeting-3']
 
 
 def main():