From 462a72ea061ceb8e7f194fdeb012f5406bd55d1b Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Tue, 1 Aug 2017 10:40:09 -0600
Subject: [PATCH] Update Puppet OpenStack meeting information

Recently it was decided[0] to drop the recurring meeting and switch to
a more adhoc basis. This change is to update the meeting information
and release the slot in #openstack-meeting-4

[0] http://lists.openstack.org/pipermail/openstack-dev/2017-August/120410.html

Change-Id: Icadb78dbf8cb242716c3d11f8ae236767192c220
---
 meetings/puppet-openstack-team-meeting.yaml | 6 +++---
 test-requirements.txt                       | 2 +-
 tools/check_channels.py                     | 2 ++
 tools/count_slot_usage.py                   | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/meetings/puppet-openstack-team-meeting.yaml b/meetings/puppet-openstack-team-meeting.yaml
index 6bfa7b1b..b64d409c 100644
--- a/meetings/puppet-openstack-team-meeting.yaml
+++ b/meetings/puppet-openstack-team-meeting.yaml
@@ -4,10 +4,10 @@ agenda_url: https://wiki.openstack.org/wiki/Meetings/Puppet
 schedule:
   - time:       '1500'
     day:        Tuesday
-    irc:        openstack-meeting-4
-    frequency:  weekly
+    irc:        puppet-openstack
+    frequency:  adhoc
     start_date: 20160112
-chair: Emilien Macchi (EmilienM)
+chair: Alex Schultz (mwhahaha)
 description:  >
   Team meeting for discussing Puppet OpenStack modules that help to bring
   scalable and reliable IT automation to OpenStack cloud deployments.
diff --git a/test-requirements.txt b/test-requirements.txt
index 80d97cac..b9ea16ff 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,4 +2,4 @@ hacking<0.11,>=0.10.0
 pytz>=2013.6  # MIT
 PyYAML>=3.1.0  # MIT
 requests>=2.10.0  # Apache-2.0
-yaml2ical>=0.6.1
+yaml2ical>=0.7.0
diff --git a/tools/check_channels.py b/tools/check_channels.py
index 597b68db..a3cb1026 100755
--- a/tools/check_channels.py
+++ b/tools/check_channels.py
@@ -42,6 +42,8 @@ fully functional MeetBot.
     meetings = meeting.load_meetings(args.yaml_dir)
     for m in meetings:
         for s in m.schedules:
+            if s.freq == 'adhoc':
+                continue
             if s.irc not in channels:
                 raise ValueError(("%s: IRC channel: %s not in (%s)") %
                                  (s.filefrom, s.irc,
diff --git a/tools/count_slot_usage.py b/tools/count_slot_usage.py
index cf47c990..f7700e64 100755
--- a/tools/count_slot_usage.py
+++ b/tools/count_slot_usage.py
@@ -32,7 +32,7 @@ BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), ".."))
 EAVESDROP = 'eavesdrop.openstack.org'
 MEETINGS_PATH = os.path.join(BASE_DIR, 'meetings')
 WEEKDAYS = list(calendar.day_name)
-WEEK_COUNTS = {'weekly': 2, 'biweekly-even': 1, 'biweekly-odd': 1}
+WEEK_COUNTS = {'weekly': 2, 'biweekly-even': 1, 'biweekly-odd': 1, 'adhoc': 0}
 CHANNELS = ['openstack-meeting', 'openstack-meeting-alt',
             'openstack-meeting-3', 'openstack-meeting-4',
             'openstack-meeting-5']