diff --git a/doc/source/lists.rst b/doc/source/lists.rst
index 2597dc667c..08aedbd488 100644
--- a/doc/source/lists.rst
+++ b/doc/source/lists.rst
@@ -14,9 +14,11 @@ At a Glance
 
 :Hosts:
   * http://lists.openstack.org
-:Puppet:
-  * https://opendev.org/opendev/puppet-mailman
-  * :git_file:`modules/openstack_project/manifests/lists.pp`
+:Ansible:
+  * :git_file:`playbooks/service-lists.yaml`
+  * :git_file:`playbooks/roles/mailman`
+  * :git_file:`playbooks/roles/mailman-site`
+  * :git_file:`playbooks/roles/mailman-list`
 :Projects:
   * http://www.gnu.org/software/mailman/
 :Bugs:
@@ -29,18 +31,15 @@ Adding a List
 =============
 
 A list may be added by adding it to the ``openstack-infra/system-config``
-repository in ``modules/openstack_project/manifests/lists.pp``.  For
-example:
+repository in :git_file:`inventory/service/host_vars/lists.openstack.org.yaml`.
+For example:
 
-.. code-block:: ruby
+.. code-block:: yaml
 
-  mailman_list { 'openstack-foo@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'admin@example.com',
-    password    => $listpassword,
-    description => 'Discussion of OpenStack Foo',
-  }
+        - name: Example list
+          description: 'This is an example'
+          admin: 'admin@example.com'
+          password: "{{ mailman_list_password }}"
 
 Scripted Changes to Lists
 =========================
diff --git a/modules/openstack_project/files/mailman/html-templates-en/admindbdetails.html b/modules/openstack_project/files/mailman/html-templates-en/admindbdetails.html
deleted file mode 100644
index a6b7eb96d6..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/admindbdetails.html
+++ /dev/null
@@ -1,60 +0,0 @@
-The administrative requests are displayed in one of two ways, on a <a
-href="%(summaryurl)s">summary page</a>, and on a <em>details</em> page. 
-The summary page contains pending subscription and unsubscription
-requests, as well as postings being held for your approval, grouped by
-sender email address.  The details page contains a more detailed view of
-each held message, including the all the message's headers and an
-excerpt of the message body.
-
-<p>On all the pages, the following actions are available:
-
-<ul> <li><b>Defer</b> -- Defer your decision until later.  No action is
-taken now for this pending administrative request, but for held
-postings, you can still forward or preserve the message (see below).
-
-<li><b>Approve</b> -- Approve the message, sending it on to the list.
-For membership requests, approve the change in membership status.
-
-<li><b>Reject</b> -- Reject the message, sending a rejection notice to
-the sender, and discarding the original message.  For membership
-requests, reject the change in membership status.  In either case, you
-should add a reason for the rejection in the accompanying text box.
-
-<li><b>Discard</b> -- Throw away the original message, without sending a
-rejection notice.  For membership requests, this simply discards the
-request without notice to the person making the request.  This is
-usually the action you want to take for known spam. </ul>
-
-<p>For held messages, turn on the <b>Preserve</b> option if you want to
-save a copy of the message for the site administrator.  This is useful
-for abusive messages that you want to discard, but need to keep a record
-of for later inspection.
-
-<p>Turn on the <b>Forward to</b> option, and fill in the forwarding
-address if you want to forward the message to someone else not on the
-list.  To edit a held message before it is sent on to the list, you
-should forward the message to yourself (or the list owners), and discard
-the original message.  Then, when the message shows up in your mailbox,
-make your edits and resend the message to the list, including an
-<tt>Approved:</tt> header with the list password as its value.  It is
-proper netiquette in this case to include a note in the resent message,
-explaining that you have modified the text.
-
-<p>If the sender is a list member who is being moderated, you can
-optionally clear their moderation flag.  This is useful when your list
-is configured to put new members on probation, and you've decided that
-this member can be trusted to post to the list without approval.
-
-<p>If the sender is not a list member, you can add the email address to
-a <em>sender filter</em>.  Sender filters are described on the <a
-href="%(filterurl)s">sender filter privacy page</a>, and may be one of
-<b>auto-accept</b> (Accepts), <b>auto-hold</b> (Holds),
-<b>auto-reject</b> (Rejects), or <b>auto-discard</b> (Discards).  This
-option will not be available if the address is already on one of the
-sender filters.
-
-<p>When you're finished, click on the <em>Submit All Data</em> button at
-the top or bottom of the page.  This button will submit all selected
-actions for all administrative requests that you've made a decision for.
-
-<p><a href="%(summaryurl)s">Return to the summary page</a>.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/admindbpreamble.html b/modules/openstack_project/files/mailman/html-templates-en/admindbpreamble.html
deleted file mode 100644
index 659b77e729..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/admindbpreamble.html
+++ /dev/null
@@ -1,10 +0,0 @@
-This page contains a subset of the <em>%(listname)s</em> mailing list
-postings that are being held for your approval.  It currently shows
-%(description)s
-
-<p>For each administrative request, please select the action to take,
-clicking on the <b>Submit All Data</b> when finished.  More detailed
-instructions are available <a href="%(detailsurl)s">here</a>.
-
-<p>You can also <a href="%(summaryurl)s">view a summary</a> of all
-pending requests.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/admindbsummary.html b/modules/openstack_project/files/mailman/html-templates-en/admindbsummary.html
deleted file mode 100644
index 20ffef5846..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/admindbsummary.html
+++ /dev/null
@@ -1,14 +0,0 @@
-This page contains a summary of the current set of administrative
-requests requiring your approval for the
-<a href="%(adminurl)s"><em>%(listname)s</em> mailing list</a>.
-First, you will find the list of pending
-subscription and unsubscription requests, if any, followed by any
-postings being held for your approval.
-
-<p>For each administrative request, please select the action to take,
-clicking on the <b>Submit All Data</b> button when finished.
-<a href="%(detailsurl)s">More detailed instructions</a> are also
-available.
-
-<p>You can also <a href="%(viewallurl)s">view the details</a> of all
-held postings.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/adminsubscribeack.txt b/modules/openstack_project/files/mailman/html-templates-en/adminsubscribeack.txt
deleted file mode 100644
index 388a3a2401..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/adminsubscribeack.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-%(member)s has been successfully subscribed to %(listname)s.
-
-
diff --git a/modules/openstack_project/files/mailman/html-templates-en/adminunsubscribeack.txt b/modules/openstack_project/files/mailman/html-templates-en/adminunsubscribeack.txt
deleted file mode 100644
index 2ebcfeb707..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/adminunsubscribeack.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-%(member)s has been removed from %(listname)s.
-
diff --git a/modules/openstack_project/files/mailman/html-templates-en/admlogin.html b/modules/openstack_project/files/mailman/html-templates-en/admlogin.html
deleted file mode 100644
index 4dd2574c27..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/admlogin.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html>
-<head>
-  <title>%(listname)s %(who)s Authentication</title>
-<script>function sf(){document.f.adminpw.focus();}</script>
-</head>
-<body bgcolor="#ffffff" onLoad="sf()">
-<FORM METHOD=POST ACTION="%(path)s" name="f">
-%(message)s
-  <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
-    <TR>
-      <TD COLSPAN="2" WIDTH="100%%" BGCOLOR="#99CCFF" ALIGN="CENTER">
-	<B><FONT COLOR="#000000" SIZE="+1">%(listname)s %(who)s
-	    Authentication</FONT></B>
-      </TD>
-    </TR>
-    <tr>
-      <TD><div ALIGN="Right">List %(who)s Password:</div></TD>
-      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-    </tr>
-    <tr>
-      <td colspan=2 align=middle><INPUT type="SUBMIT"
-                                        name="admlogin"
-					value="Let me in...">
-      </td>
-    </tr>
-  </TABLE>
-      <p><strong><em>Important:</em></strong> From this point on, you
-      must have cookies enabled in your browser, otherwise no
-      administrative changes will take effect.
-
-      <p>Session cookies are used in Mailman's
-      administrative interface so that you don't need to
-      re-authenticate with every administrative operation.  This
-      cookie will expire automatically when you exit your browser, or
-      you can explicitly expire the cookie by hitting the
-      <em>Logout</em> link under <em>Other Administrative
-      Activities</em> (which you'll see once you successfully log in).
-</FORM>
-</body>
-</html>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/approve.txt b/modules/openstack_project/files/mailman/html-templates-en/approve.txt
deleted file mode 100644
index dfb0dfb1e6..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/approve.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Your request to %(requestaddr)s:
-
-    %(cmd)s
-
-has been forwarded to the person running the list.
-
-This is probably because you are trying to subscribe to a 'closed'
-list.
-
-You will receive email notification of the list owner's decision about
-your subscription request.
-
-Any questions about the list owner's policy should be directed to:
-
-    %(adminaddr)s
diff --git a/modules/openstack_project/files/mailman/html-templates-en/archidxentry.html b/modules/openstack_project/files/mailman/html-templates-en/archidxentry.html
deleted file mode 100644
index f9bb57aab7..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/archidxentry.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<LI><A HREF="%(filename)s">%(subject)s
-</A><A NAME="%(sequence)i">&nbsp;</A>
-<I>%(author)s
-</I>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/archidxfoot.html b/modules/openstack_project/files/mailman/html-templates-en/archidxfoot.html
deleted file mode 100644
index 4fd6f2dc9b..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/archidxfoot.html
+++ /dev/null
@@ -1,64 +0,0 @@
-    </ul>
-    <p>
-      <a name="end"><b>Last message date:</b></a> 
-       <i>%(lastdate)s</i><br>
-    <b>Archived on:</b> <i>%(archivedate)s</i>
-    <p>
-   <ul>
-         <li> <b>Messages sorted by:</b>
-	        %(thread_ref)s
-		%(subject_ref)s
-		%(author_ref)s
-		%(date_ref)s
-	     <li><b><a href="%(listinfo)s">More info on this list...
-                    </a></b></li>
-     </ul>
-<div class="container">
- <hr>
-     <i>This archive was generated by Pipermail %(version)s.</i>
-
-        <div id="footer">
-                <div class="span-4">
-                        <h3>OpenStack</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/projects/">Projects</a></li>
-                                <li><a href="https://security.openstack.org/">OpenStack Security</a></li>
-                                <li><a href="https://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
-                                <li><a href="https://www.openstack.org/blog/">Blog</a></li>
-                                <li><a href="https://www.openstack.org/news/">News</a></li>
-                        </ul>
-                </div>
-               <div class="span-4">
-                        <h3>Community</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/community/">User Groups</a></li>
-                                <li><a href="https://www.openstack.org/events/">Events</a></li>
-                                <li><a href="https://www.openstack.org/jobs/">Jobs</a></li>
-                                <li><a href="https://www.openstack.org/foundation/companies/">Companies</a></li>
-                                <li><a href="https://docs.opendev.org/opendev/infra-manual/latest/developers.html">Contribute</a></li>
-                        </ul>
-                </div>
-                <div class="span-4">
-                        <h3>Documentation</h3>
-                        <ul>
-                                <li><a href="https://docs.openstack.org/">OpenStack Manuals</a></li>
-                                <li><a href="https://www.openstack.org/software/start/">Getting Started</a></li>
-                                <li><a href="https://developer.openstack.org">API Documentation</a></li>
-                                <li><a href="https://wiki.openstack.org/">Wiki</a></li>
-                        </ul>
-                </div>
-                <div class="span-4 last">
-                        <h3>Branding &amp; Legal</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/brand/">Logos &amp; Guidelines</a></li>
-                                <li><a href="https://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
-                                <li><a href="https://www.openstack.org/privacy/">Privacy Policy</a></li>
-                                <li><a href="https://wiki.openstack.org/CLA">OpenStack CLA</a></li>
-                        </ul>
-                </div>
-                <hr>
-        </div>
-</div>
-</div>
-  </BODY>
-</HTML>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/archidxhead.html b/modules/openstack_project/files/mailman/html-templates-en/archidxhead.html
deleted file mode 100644
index 8171deb25b..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/archidxhead.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-  <HEAD>
-     <title>OpenStack Open Source Cloud Computing Software &raquo; The %(listname)s %(archive)s Archive by %(archtype)s</title>
-     <META NAME="robots" CONTENT="noindex,follow">
-     %(encoding)s
-
-    <!-- Google Fonts -->
-        <link href='https://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
-
-    <!-- Framework CSS -->
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/screen.css" type="text/css" media="screen, projection">
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/print.css" type="text/css" media="print">
-
-    <!-- IE CSS -->
-    <!--[if lt IE 8]><link rel="stylesheet" href="https://openstack.org/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-
-    <!-- OpenStack Specific CSS -->
-
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/dropdown.css" type="text/css" media="screen, projection, print">
-
-    <!-- Page Specific CSS -->
-        <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/home.css" type="text/css" media="screen, projection, print">
-
-  <link rel="stylesheet" type="text/css" href="https://openstack.org/themes/openstack/css/main.css?m=1335457934" />
-
-  <script type="text/javascript">
-
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-1']);
-    _gaq.push(['_setDomainName', '.openstack.org']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-
-  </script>
-  </HEAD>
-  <BODY>
-   <div class="container">
-                <div id="header">
-                        <div class="span-5">
-                                <h1 id="logo"><a href="/">Open Stack</a></h1>
-                        </div>
-                        <div class="span-19 last blueLine">
-
-                                <div id="navigation" class="span-19">
-                                        <ul id="Menu1">
-                <li><a href="https://openstack.org/" title="Go to the Home page" class="link" >Home</a></li>
- 
-                <li><a href="https://openstack.org/projects/" title="Go to the OpenStack Projects page" class="link">Projects</a></li>
-
-                <li><a href="https://openstack.org/user-stories/" title="Go to the User Stories page" class="link">User Stories</a></li>
-
-                <li><a href="https://openstack.org/community/" title="Go to the Community page" class="current">Community</a></li>
-
-                                                  <li><a href="https://openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a></li>
-                                                  <li><a href="https://wiki.openstack.org/" title="Go to the OpenStack Wiki">Wiki</a></li>
-                                                  <li><a href="https://docs.openstack.org/" title="Go to OpenStack Documentation">Documentation</a></li>
-                                        </ul>
-
-
-                                </div>
-
-                        </div>
-                </div>
-        </div>
-        <!-- Page Content -->
-
-    <div class="container">
-      <a name="start"></A>
-      <h1>%(archive)s Archives by %(archtype)s</h1>
-      <ul>
-         <li> <b>Messages sorted by:</b>
-	        %(thread_ref)s
-		%(subject_ref)s
-		%(author_ref)s
-		%(date_ref)s
-
-	     <li><b><a href="%(listinfo)s">More info on this list...
-                    </a></b></li>
-      </ul>
-      <p><b>Starting:</b> <i>%(firstdate)s</i><br>
-         <b>Ending:</b> <i>%(lastdate)s</i><br>
-         <b>Messages:</b> %(size)s<p>
-     <ul>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/archlistend.html b/modules/openstack_project/files/mailman/html-templates-en/archlistend.html
deleted file mode 100644
index 9bc052ddb4..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/archlistend.html
+++ /dev/null
@@ -1 +0,0 @@
-         </table>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/archliststart.html b/modules/openstack_project/files/mailman/html-templates-en/archliststart.html
deleted file mode 100644
index cdf5d17c41..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/archliststart.html
+++ /dev/null
@@ -1,4 +0,0 @@
-	<table border=3>
-          <tr><td>Archive</td>
-          <td>View by:</td>
-          <td>Downloadable version</td></tr>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/archtoc.html b/modules/openstack_project/files/mailman/html-templates-en/archtoc.html
deleted file mode 100644
index 78e87c0155..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/archtoc.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-  <HEAD>
-     <title>OpenStack Open Source Cloud Computing Software &raquo; The %(listname)s Archives</title>
-     <META NAME="robots" CONTENT="noindex,follow">
-     %(meta)s
-
-    <!-- Google Fonts -->
-        <link href='https://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
-
-    <!-- Framework CSS -->
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/screen.css" type="text/css" media="screen, projection">
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/print.css" type="text/css" media="print">
-
-    <!-- IE CSS -->
-    <!--[if lt IE 8]><link rel="stylesheet" href="https://openstack.org/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-
-    <!-- OpenStack Specific CSS -->
-
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/dropdown.css" type="text/css" media="screen, projection, print">
-
-    <!-- Page Specific CSS -->
-        <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/home.css" type="text/css" media="screen, projection, print">
-
-  <link rel="stylesheet" type="text/css" href="https://openstack.org/themes/openstack/css/main.css?m=1335457934" />
-  <script type="text/javascript">
-
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-1']);
-    _gaq.push(['_setDomainName', '.openstack.org']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-
-  </script>
-  </HEAD>
-  <BODY>
-   <div class="container">
-                <div id="header">
-                        <div class="span-5">
-                                <h1 id="logo"><a href="/">Open Stack</a></h1>
-                        </div>
-                        <div class="span-19 last blueLine">
-
-                                <div id="navigation" class="span-19">
-                                        <ul id="Menu1">
-                <li><a href="https://openstack.org/" title="Go to the Home page" class="link" >Home</a></li>
- 
-                <li><a href="https://openstack.org/projects/" title="Go to the OpenStack Projects page" class="link">Projects</a></li>
-
-                <li><a href="https://openstack.org/user-stories/" title="Go to the User Stories page" class="link">User Stories</a></li>
-
-                <li><a href="https://openstack.org/community/" title="Go to the Community page" class="current">Community</a></li>
-
-                                                  <li><a href="https://openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a></li>
-                                                  <li><a href="https://wiki.openstack.org/" title="Go to the OpenStack Wiki">Wiki</a></li>
-                                                  <li><a href="https://docs.openstack.org/" title="Go to OpenStack Documentation">Documentation</a></li>
-                                        </ul>
-
-
-                                </div>
-
-                        </div>
-                </div>
-        </div>
-        <!-- Page Content -->
-
-    <div class="container">
-
-     <h1>The %(listname)s Archives </h1>
-     <p>
-      You can get <a href="%(listinfo)s">more information about this list</a>
-      or you can <a href="%(fullarch)s">download the full raw archive</a>
-      (%(size)s).
-     </p>
-     %(noarchive_msg)s
-     %(archive_listing_start)s
-     %(archive_listing)s
-     %(archive_listing_end)s
-<div class="container">
-        <hr>
-        <div id="footer">
-                <div class="span-4">
-                        <h3>OpenStack</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/projects/">Projects</a></li>
-                                <li><a href="https://security.openstack.org/">OpenStack Security</a></li>
-                                <li><a href="https://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
-                                <li><a href="https://www.openstack.org/blog/">Blog</a></li>
-                                <li><a href="https://www.openstack.org/news/">News</a></li>
-                        </ul>
-                </div>
-               <div class="span-4">
-                        <h3>Community</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/community/">User Groups</a></li>
-                                <li><a href="https://www.openstack.org/events/">Events</a></li>
-                                <li><a href="https://www.openstack.org/jobs/">Jobs</a></li>
-                                <li><a href="https://www.openstack.org/foundation/companies/">Companies</a></li>
-                                <li><a href="https://docs.opendev.org/opendev/infra-manual/latest/developers.html">Contribute</a></li>
-                        </ul>
-                </div>
-                <div class="span-4">
-                        <h3>Documentation</h3>
-                        <ul>
-                                <li><a href="https://docs.openstack.org/">OpenStack Manuals</a></li>
-                                <li><a href="https://www.openstack.org/software/start/">Getting Started</a></li>
-                                <li><a href="https://developer.openstack.org">API Documentation</a></li>
-                                <li><a href="https://wiki.openstack.org/">Wiki</a></li>
-                        </ul>
-                </div>
-                <div class="span-4 last">
-                        <h3>Branding &amp; Legal</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/brand/">Logos &amp; Guidelines</a></li>
-                                <li><a href="https://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
-                                <li><a href="https://www.openstack.org/privacy/">Privacy Policy</a></li>
-                                <li><a href="https://wiki.openstack.org/CLA">OpenStack CLA</a></li>
-                        </ul>
-                </div>
-                <hr>
-        </div>
-</div>
-</div>
-     </BODY>
-     </HTML>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/archtocentry.html b/modules/openstack_project/files/mailman/html-templates-en/archtocentry.html
deleted file mode 100644
index 00cf9c47d4..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/archtocentry.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-	    <tr>
-            <td>%(archivelabel)s:</td>
-            <td>
-              <A href="%(archive)s/thread.html">[ Thread ]</a>
-              <A href="%(archive)s/subject.html">[ Subject ]</a>
-              <A href="%(archive)s/author.html">[ Author ]</a>
-              <A href="%(archive)s/date.html">[ Date ]</a>
-            </td>
-            %(textlink)s
-            </tr>
-
diff --git a/modules/openstack_project/files/mailman/html-templates-en/archtocnombox.html b/modules/openstack_project/files/mailman/html-templates-en/archtocnombox.html
deleted file mode 100644
index 167adb247f..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/archtocnombox.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-  <HEAD>
-     <title>OpenStack Open Source Cloud Computing Software &raquo; The %(listname)s Archives</title>
-     <META NAME="robots" CONTENT="noindex,follow">
-     %(meta)s
-
-    <!-- Google Fonts -->
-        <link href='https://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
-
-    <!-- Framework CSS -->
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/screen.css" type="text/css" media="screen, projection">
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/print.css" type="text/css" media="print">
-
-    <!-- IE CSS -->
-    <!--[if lt IE 8]><link rel="stylesheet" href="https://openstack.org/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-
-    <!-- OpenStack Specific CSS -->
-
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/dropdown.css" type="text/css" media="screen, projection, print">
-
-    <!-- Page Specific CSS -->
-        <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/home.css" type="text/css" media="screen, projection, print">
-
-  <link rel="stylesheet" type="text/css" href="https://openstack.org/themes/openstack/css/main.css?m=1335457934" />
-  <script type="text/javascript">
-
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-1']);
-    _gaq.push(['_setDomainName', '.openstack.org']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-
-  </script>
-  </HEAD>
-  <BODY>
-   <div class="container">
-                <div id="header">
-                        <div class="span-5">
-                                <h1 id="logo"><a href="/">Open Stack</a></h1>
-                        </div>
-                        <div class="span-19 last blueLine">
-
-                                <div id="navigation" class="span-19">
-                                        <ul id="Menu1">
-                <li><a href="https://openstack.org/" title="Go to the Home page" class="link" >Home</a></li>
- 
-                <li><a href="https://openstack.org/projects/" title="Go to the OpenStack Projects page" class="link">Projects</a></li>
-
-                <li><a href="https://openstack.org/user-stories/" title="Go to the User Stories page" class="link">User Stories</a></li>
-
-                <li><a href="https://openstack.org/community/" title="Go to the Community page" class="current">Community</a></li>
-
-                                                  <li><a href="https://openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a></li>
-                                                  <li><a href="https://wiki.openstack.org/" title="Go to the OpenStack Wiki">Wiki</a></li>
-                                                  <li><a href="https://docs.openstack.org/" title="Go to OpenStack Documentation">Documentation</a></li>
-                                        </ul>
-
-
-                                </div>
-
-                        </div>
-                </div>
-        </div>
-        <!-- Page Content -->
-
-    <div class="container">
-
-     <h1>The %(listname)s Archives </h1>
-     <p>
-      You can get <a href="%(listinfo)s">more information about this list</a>.
-     </p>
-     %(noarchive_msg)s
-     %(archive_listing_start)s
-     %(archive_listing)s
-     %(archive_listing_end)s
-
-<div class="container">
-     <hr>
-
-        <div id="footer">
-                <div class="span-4">
-                        <h3>OpenStack</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/projects/">Projects</a></li>
-                                <li><a href="https://security.openstack.org/">OpenStack Security</a></li>
-                                <li><a href="https://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
-                                <li><a href="https://www.openstack.org/blog/">Blog</a></li>
-                                <li><a href="https://www.openstack.org/news/">News</a></li>
-                        </ul>
-                </div>
-               <div class="span-4">
-                        <h3>Community</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/community/">User Groups</a></li>
-                                <li><a href="https://www.openstack.org/events/">Events</a></li>
-                                <li><a href="https://www.openstack.org/jobs/">Jobs</a></li>
-                                <li><a href="https://www.openstack.org/foundation/companies/">Companies</a></li>
-                                <li><a href="https://docs.opendev.org/opendev/infra-manual/latest/developers.html">Contribute</a></li>
-                        </ul>
-                </div>
-                <div class="span-4">
-                        <h3>Documentation</h3>
-                        <ul>
-                                <li><a href="https://docs.openstack.org/">OpenStack Manuals</a></li>
-                                <li><a href="https://www.openstack.org/software/start/">Getting Started</a></li>
-                                <li><a href="https://developer.openstack.org">API Documentation</a></li>
-                                <li><a href="https://wiki.openstack.org/">Wiki</a></li>
-                        </ul>
-                </div>
-                <div class="span-4 last">
-                        <h3>Branding &amp; Legal</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/brand/">Logos &amp; Guidelines</a></li>
-                                <li><a href="https://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
-                                <li><a href="https://www.openstack.org/privacy/">Privacy Policy</a></li>
-                                <li><a href="https://wiki.openstack.org/CLA">OpenStack CLA</a></li>
-                        </ul>
-                </div>
-                <hr>
-        </div>
-</div>
-</div>
-
-     </BODY>
-     </HTML>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/article.html b/modules/openstack_project/files/mailman/html-templates-en/article.html
deleted file mode 100644
index ce2b77cdd0..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/article.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
- <HEAD>
-
-   <TITLE>OpenStack Open Source Cloud Computing Software &raquo; Message: %(title)s </TITLE>
-   <LINK REL="Index" HREF="index.html" >
-   <LINK REL="made" HREF="mailto:%(email_url)s?Subject=%(subject_url)s&In-Reply-To=%(in_reply_to_url)s">
-   <META NAME="robots" CONTENT="index,nofollow">
-
-    <!-- Google Fonts -->
-        <link href='https://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
-
-    <!-- Framework CSS -->
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/screen.css" type="text/css" media="screen, projection">
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/print.css" type="text/css" media="print">
-
-    <!-- IE CSS -->
-    <!--[if lt IE 8]><link rel="stylesheet" href="https://openstack.org/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-
-    <!-- OpenStack Specific CSS -->
-
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/dropdown.css" type="text/css" media="screen, projection, print">
-
-    <!-- Page Specific CSS -->
-        <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/home.css" type="text/css" media="screen, projection, print">
-
-  <link rel="stylesheet" type="text/css" href="https://openstack.org/themes/openstack/css/main.css?m=1335457934" />
-  <script type="text/javascript">
-
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-1']);
-    _gaq.push(['_setDomainName', '.openstack.org']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-
-  </script>
-   <style type="text/css">
-       pre {
-           white-space: pre-wrap;       /* css-2.1, curent FF, Opera, Safari */
-           }
-   </style>
-   %(encoding)s
-   %(prev)s
-   %(next)s
- </HEAD>
- <BODY>
-   <div class="container">
-                <div id="header">
-                        <div class="span-5">
-                                <h1 id="logo"><a href="/">Open Stack</a></h1>
-                        </div>
-                        <div class="span-19 last blueLine">
-
-                                <div id="navigation" class="span-19">
-                                        <ul id="Menu1">
-                <li><a href="https://openstack.org/" title="Go to the Home page" class="link" >Home</a></li>
- 
-                <li><a href="https://openstack.org/projects/" title="Go to the OpenStack Projects page" class="link">Projects</a></li>
-
-                <li><a href="https://openstack.org/user-stories/" title="Go to the User Stories page" class="link">User Stories</a></li>
-
-                <li><a href="https://openstack.org/community/" title="Go to the Community page" class="current">Community</a></li>
-
-                                                  <li><a href="https://openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a></li>
-                                                  <li><a href="https://wiki.openstack.org/" title="Go to the OpenStack Wiki">Wiki</a></li>
-                                                  <li><a href="https://docs.openstack.org/" title="Go to OpenStack Documentation">Documentation</a></li>
-                                        </ul>
-
-
-                                </div>
-
-                        </div>
-                </div>
-        </div>
-        <!-- Page Content -->
-
-    <div class="container">
-   <H1>%(subject_html)s</H1>
-    <B>%(author_html)s</B> 
-    <A HREF="mailto:%(email_url)s?Subject=%(subject_url)s&In-Reply-To=%(in_reply_to_url)s"
-       TITLE="%(subject_html)s">%(email_html)s
-       </A><BR>
-    <I>%(datestr_html)s</I>
-    <P><UL>
-        %(prev_wsubj)s
-        %(next_wsubj)s
-         <LI> <B>Messages sorted by:</B> 
-              <a href="date.html#%(sequence)s">[ date ]</a>
-              <a href="thread.html#%(sequence)s">[ thread ]</a>
-              <a href="subject.html#%(sequence)s">[ subject ]</a>
-              <a href="author.html#%(sequence)s">[ author ]</a>
-         </LI>
-       </UL>
-    <HR>  
-<!--beginarticle-->
-%(body)s
-<!--endarticle-->
-    <HR>
-    <P><UL>
-        <!--threads-->
-	%(prev_wsubj)s
-	%(next_wsubj)s
-         <LI> <B>Messages sorted by:</B> 
-              <a href="date.html#%(sequence)s">[ date ]</a>
-              <a href="thread.html#%(sequence)s">[ thread ]</a>
-              <a href="subject.html#%(sequence)s">[ subject ]</a>
-              <a href="author.html#%(sequence)s">[ author ]</a>
-         </LI>
-       </UL>
-
-<hr>
-<a href="%(listurl)s">More information about the %(listname)s
-mailing list</a><br>
-
-
-<div class="container">
-<hr>
-
-        <div id="footer">
-                <div class="span-4">
-                        <h3>OpenStack</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/projects/">Projects</a></li>
-                                <li><a href="https://security.openstack.org/">OpenStack Security</a></li>
-                                <li><a href="https://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
-                                <li><a href="https://www.openstack.org/blog/">Blog</a></li>
-                                <li><a href="https://www.openstack.org/news/">News</a></li>
-                        </ul>
-                </div>
-               <div class="span-4">
-                        <h3>Community</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/community/">User Groups</a></li>
-                                <li><a href="https://www.openstack.org/events/">Events</a></li>
-                                <li><a href="https://www.openstack.org/jobs/">Jobs</a></li>
-                                <li><a href="https://www.openstack.org/foundation/companies/">Companies</a></li>
-                                <li><a href="https://docs.opendev.org/opendev/infra-manual/latest/developers.html">Contribute</a></li>
-                        </ul>
-                </div>
-                <div class="span-4">
-                        <h3>Documentation</h3>
-                        <ul>
-                                <li><a href="https://docs.openstack.org/">OpenStack Manuals</a></li>
-                                <li><a href="https://www.openstack.org/software/start/">Getting Started</a></li>
-                                <li><a href="https://developer.openstack.org">API Documentation</a></li>
-                                <li><a href="https://wiki.openstack.org/">Wiki</a></li>
-                        </ul>
-                </div>
-                <div class="span-4 last">
-                        <h3>Branding &amp; Legal</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/brand/">Logos &amp; Guidelines</a></li>
-                                <li><a href="https://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
-                                <li><a href="https://www.openstack.org/privacy/">Privacy Policy</a></li>
-                                <li><a href="https://wiki.openstack.org/CLA">OpenStack CLA</a></li>
-                        </ul>
-                </div>
-                <hr>
-        </div>
-</div>
-</div>
-
-</body></html>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/bounce.txt b/modules/openstack_project/files/mailman/html-templates-en/bounce.txt
deleted file mode 100644
index 8e02cc7a50..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/bounce.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-This is a Mailman mailing list bounce action notice:
-
-    List:       %(listname)s
-    Member:     %(addr)s
-    Action:     Subscription %(negative)s%(did)s.
-    Reason:     Excessive or fatal bounces.
-    %(but)s
-
-%(reenable)s
-The triggering bounce notice is attached below.
-
-Questions?  
-Contact the Mailman site administrator at %(owneraddr)s.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/checkdbs.txt b/modules/openstack_project/files/mailman/html-templates-en/checkdbs.txt
deleted file mode 100644
index d53925a4d7..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/checkdbs.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-The %(real_name)s@%(host_name)s mailing list has %(count)d request(s)
-waiting for your consideration at:
-
-	%(adminDB)s
-	
-Please attend to this at your earliest convenience.  This notice of
-pending requests, if any, will be sent out daily.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/convert.txt b/modules/openstack_project/files/mailman/html-templates-en/convert.txt
deleted file mode 100644
index ae17a79e02..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/convert.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-The %(listname)s mailing list has just undergone a big change.  It is
-running on a new mailing list package called "Mailman".  This will
-hopefully solve a lot of problems that administering this list has
-presented.
-
-How does this affect you?
-
-1) Mail intended for the whole list should be sent to: %(listaddr)s.
-
-2) You have been given an arbitrary password to prevent others from
-unsubscribing you without your knowledge.  It will be mailed to you in 
-a separate email, which you may have already received.  Don't worry if 
-you forget this password; a reminder will be sent to you via email
-every month.
-
-3) If you have World Wide Web access, you can use it any time to
-unsubscribe from this list, to switch to and from digest mode, to
-check back issues of the list (which will be available after the list
-has been getting posts for a day or so), etc.  The Web address for
-these resources is:
-
-    %(listinfo_url)s
-
-4) If you do not have WWW access, you can do these same things via
-email.  Send mail to %(requestaddr)s with a subject or body containing 
-just the word "help" (without the quotes).  You will receive an
-automated reply giving you further directions.
-
-Please address any questions or problems with this new setup to:
-%(adminaddr)s.
-
-This message was auto-generated by Mailman %(version)s.  For more
-information on the Mailman software, visit the Mailman homepage at
-http://www.list.org/
diff --git a/modules/openstack_project/files/mailman/html-templates-en/cronpass.txt b/modules/openstack_project/files/mailman/html-templates-en/cronpass.txt
deleted file mode 100644
index 52ce5ea6ce..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/cronpass.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-This is a reminder, sent out once a month, about your %(hostname)s
-mailing list memberships.  It includes your subscription info and how
-to use it to change it or unsubscribe from a list.
-
-You can visit the URLs to change your membership status or
-configuration, including unsubscribing, setting digest-style delivery
-or disabling delivery altogether (e.g., for a vacation), and so on.
-
-In addition to the URL interfaces, you can also use email to make such
-changes.  For more info, send a message to the '-request' address of
-the list (for example, %(exreq)s) containing just the word 'help' in
-the message body, and an email message will be sent to you with
-instructions.
-
-If you have questions, problems, comments, etc, send them to
-%(owner)s.  Thanks!
-
-Passwords for %(useraddr)s:
-
diff --git a/modules/openstack_project/files/mailman/html-templates-en/disabled.txt b/modules/openstack_project/files/mailman/html-templates-en/disabled.txt
deleted file mode 100644
index 54998a83b7..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/disabled.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Your membership in the mailing list %(listname)s has been disabled
-%(reason)s.  You will not get any more messages from this
-list until you re-enable your membership.  You will receive
-%(noticesleft)s more reminders like this before your membership in the
-list is deleted.
-
-To re-enable your membership, you can simply respond to this message
-(leaving the Subject: line intact), or visit the confirmation page at
-
-    %(confirmurl)s
-
-You can also visit your membership page at
-
-    %(optionsurl)s
-
-On your membership page, you can change various delivery options such
-as your email address and whether you get digests or not.  As a
-reminder, your membership password is
-
-    %(password)s
-
-If you have any questions or problems, you can contact the list owner
-at
-
-    %(owneraddr)s
diff --git a/modules/openstack_project/files/mailman/html-templates-en/emptyarchive.html b/modules/openstack_project/files/mailman/html-templates-en/emptyarchive.html
deleted file mode 100644
index 533b5030c7..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/emptyarchive.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-  <HEAD>
-     <title>OpenStack Open Source Cloud Computing Software &raquo; The %(listname)s Archives</title>
-     <META NAME="robots" CONTENT="noindex,follow">
-    <!-- Google Fonts -->
-        <link href='https://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
-
-    <!-- Framework CSS -->
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/screen.css" type="text/css" media="screen, projection">
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/print.css" type="text/css" media="print">
-
-    <!-- IE CSS -->
-    <!--[if lt IE 8]><link rel="stylesheet" href="https://openstack.org/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-
-    <!-- OpenStack Specific CSS -->
-
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/dropdown.css" type="text/css" media="screen, projection, print">
-
-    <!-- Page Specific CSS -->
-        <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/home.css" type="text/css" media="screen, projection, print">
-
-  <link rel="stylesheet" type="text/css" href="https://openstack.org/themes/openstack/css/main.css?m=1335457934" />
-i<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-17511903-1']);
-  _gaq.push(['_setDomainName', '.openstack.org']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
-
-  </HEAD>
-  <BODY>
-   <div class="container">
-                <div id="header">
-                        <div class="span-5">
-                                <h1 id="logo"><a href="/">Open Stack</a></h1>
-                        </div>
-                        <div class="span-19 last blueLine">
-
-                                <div id="navigation" class="span-19">
-                                        <ul id="Menu1">
-                <li><a href="https://openstack.org/" title="Go to the Home page" class="link" >Home</a></li>
- 
-                <li><a href="https://openstack.org/projects/" title="Go to the OpenStack Projects page" class="link">Projects</a></li>
-
-                <li><a href="https://openstack.org/user-stories/" title="Go to the User Stories page" class="link">User Stories</a></li>
-
-                <li><a href="https://openstack.org/community/" title="Go to the Community page" class="current">Community</a></li>
-
-                                                  <li><a href="https://openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a></li>
-                                                  <li><a href="https://wiki.openstack.org/" title="Go to the OpenStack Wiki">Wiki</a></li>
-                                                  <li><a href="https://docs.openstack.org/" title="Go to OpenStack Documentation">Documentation</a></li>
-                                        </ul>
-
-
-                                </div>
-
-                        </div>
-                </div>
-        </div>
-        <!-- Page Content -->
-
-    <div class="container">
-     <h1>The %(listname)s Archives </h1>
-     <p>
-      No messages have been posted to this list yet, so the archives are
-      currently empty.  You can get <a href="%(listinfo)s">more information
-      about this list</a>.
-     </p>
-<div class="container">
-<hr>
-
-        <div id="footer">
-                <div class="span-4">
-                        <h3>OpenStack</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/projects/">Projects</a></li>
-                                <li><a href="https://security.openstack.org/">OpenStack Security</a></li>
-                                <li><a href="https://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
-                                <li><a href="https://www.openstack.org/blog/">Blog</a></li>
-                                <li><a href="https://www.openstack.org/news/">News</a></li>
-                        </ul>
-                </div>
-               <div class="span-4">
-                        <h3>Community</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/community/">User Groups</a></li>
-                                <li><a href="https://www.openstack.org/events/">Events</a></li>
-                                <li><a href="https://www.openstack.org/jobs/">Jobs</a></li>
-                                <li><a href="https://www.openstack.org/foundation/companies/">Companies</a></li>
-                                <li><a href="https://docs.opendev.org/opendev/infra-manual/latest/developers.html">Contribute</a></li>
-                        </ul>
-                </div>
-                <div class="span-4">
-                        <h3>Documentation</h3>
-                        <ul>
-                                <li><a href="https://docs.openstack.org/">OpenStack Manuals</a></li>
-                                <li><a href="https://www.openstack.org/software/start/">Getting Started</a></li>
-                                <li><a href="https://developer.openstack.org">API Documentation</a></li>
-                                <li><a href="https://wiki.openstack.org/">Wiki</a></li>
-                        </ul>
-                </div>
-                <div class="span-4 last">
-                        <h3>Branding &amp; Legal</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/brand/">Logos &amp; Guidelines</a></li>
-                                <li><a href="https://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
-                                <li><a href="https://www.openstack.org/privacy/">Privacy Policy</a></li>
-                                <li><a href="https://wiki.openstack.org/CLA">OpenStack CLA</a></li>
-                        </ul>
-                </div>
-                <hr>
-        </div>
-</div>
-</div>
-  </BODY>
-  </HTML>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/headfoot.html b/modules/openstack_project/files/mailman/html-templates-en/headfoot.html
deleted file mode 100644
index f2dd04e060..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/headfoot.html
+++ /dev/null
@@ -1,28 +0,0 @@
-This text can include 
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Python
-format strings</a> which are resolved against list attributes.  The
-list of substitutions allowed are:
-
-<ul>
-    <li><b>real_name</b> - The "pretty" name of the list; usually
-    the list name with capitalization.
-
-    <li><b>list_name</b> - The name by which the list is
-    identified in URLs, where case is significant.
-
-    <li><b>host_name</b> - The fully qualified domain name
-    that the list server runs on.
-
-    <li><b>web_page_url</b> - The base URL for Mailman.  This
-    can be appended with,
-    e.g. <em>listinfo/%(list_name)s</em> to yield the
-    listinfo page for the mailing list.
-
-    <li><b>description</b> - The brief description of the
-    mailing list.
-
-    <li><b>info</b> - The full description of the mailing
-    list.
-
-    <li><b>cgiext</b> - The extension added to CGI scripts.
-</ul>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/help.txt b/modules/openstack_project/files/mailman/html-templates-en/help.txt
deleted file mode 100644
index 654eda3154..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/help.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Help for %(listname)s mailing list:
-
-This is email command help for version %(version)s of the "Mailman"
-list manager.  The following describes commands you can send to get
-information about and control your subscription to Mailman lists at
-this site.  A command can be in the subject line or in the body of the
-message.
-
-Note that much of the following can also be accomplished via the World
-Wide Web, at:
-
-    %(listinfo_url)s
-
-In particular, you can use the Web site to have your password sent to
-your delivery address.
-
-List specific commands (subscribe, who, etc) should be sent to the
-*-request address for the particular list, e.g. for the 'mailman'
-list, use 'mailman-request@...'.
-
-About the descriptions - words in "<>"s signify REQUIRED items and
-words in "[]" denote OPTIONAL items.  Do not include the "<>"s or
-"[]"s when you use the commands.
-
-The following commands are valid:
-
-    %(commands)s
-
-Commands should be sent to %(requestaddr)s
-
-Questions and concerns for the attention of a person should be sent to
-
-    %(adminaddr)s
diff --git a/modules/openstack_project/files/mailman/html-templates-en/invite.txt b/modules/openstack_project/files/mailman/html-templates-en/invite.txt
deleted file mode 100644
index 920c842130..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/invite.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Your address "%(email)s" has been invited to join the %(listname)s
-mailing list at %(hostname)s by the %(listname)s mailing list owner.
-You may accept the invitation by simply replying to this message,
-keeping the Subject: header intact.
-
-You can also visit this web page:
-
-    %(confirmurl)s
-
-Or you should include the following line -- and only the following
-line -- in a message to %(requestaddr)s:
-
-    confirm %(cookie)s
-
-Note that simply sending a `reply' to this message should work from
-most mail readers.
-
-If you want to decline this invitation, please simply disregard this
-message.  If you have any questions, please send them to
-%(listowner)s.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/listinfo.html b/modules/openstack_project/files/mailman/html-templates-en/listinfo.html
deleted file mode 100644
index c9e421e6cb..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/listinfo.html
+++ /dev/null
@@ -1,254 +0,0 @@
-<!-- $Revision: 5865 $ -->
-<HTML>
-
-    <TITLE>OpenStack Open Source Cloud Computing Software &raquo; <MM-List-Name> - <MM-List-Description></TITLE>
-    
-    <!-- Google Fonts -->
-	<link href='https://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
-    
-    <!-- Framework CSS -->
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/screen.css" type="text/css" media="screen, projection">
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/print.css" type="text/css" media="print">
-    
-    <!-- IE CSS -->
-    <!--[if lt IE 8]><link rel="stylesheet" href="https://openstack.org/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-    
-    <!-- OpenStack Specific CSS -->
-    
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/dropdown.css" type="text/css" media="screen, projection, print">
-
-    <!-- Page Specific CSS -->
-	<link rel="stylesheet" href="https://openstack.org/themes/openstack/css/home.css" type="text/css" media="screen, projection, print">
-	
-  <link rel="stylesheet" type="text/css" href="https://openstack.org/themes/openstack/css/main.css?m=1335457934" />
-  
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-1']);
-    _gaq.push(['_setDomainName', '.openstack.org']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
-  </HEAD>
-  <BODY>
-   <div class="container">
-		<div id="header">
-			<div class="span-5">
-				<h1 id="logo"><a href="/">Open Stack</a></h1>
-			</div>
-			<div class="span-19 last blueLine">
-				
-				<div id="navigation" class="span-19">
-					<ul id="Menu1">
-						   		  
-  		<li><a href="https://openstack.org/" title="Go to the Home page" class="link" >Home</a></li>
-   		  
-  		<li><a href="https://openstack.org/projects/" title="Go to the OpenStack Projects page" class="link">Projects</a></li>
-   		  
-  		<li><a href="https://openstack.org/user-stories/" title="Go to the User Stories page" class="link">User Stories</a></li>
-   		  
-  		<li><a href="https://openstack.org/community/" title="Go to the Community page" class="current">Community</a></li>
-   	
-						  <li><a href="https://openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a></li>
-					  	  <li><a href="https://wiki.openstack.org/" title="Go to the OpenStack Wiki">Wiki</a></li>
-					  	  <li><a href="https://docs.openstack.org/" title="Go to OpenStack Documentation">Documentation</a></li>
- 					</ul>
-								
-
-				</div>
-				
-			</div>
-	  	</div>
-	</div>
-	<!-- Page Content -->
-
-    <div class="container">
-    <P>
-      <TABLE COLS="1" BORDER="0" CELLSPACING="4" CELLPADDING="5">
-	<TR>
-	  <TD COLSPAN="2" WIDTH="100%" BGCOLOR="#D8D8D8" ALIGN="CENTER">
-	    <B><FONT COLOR="#000000" SIZE="+1"><MM-List-Name> --
-	<MM-List-Description></FONT></B>
-	  </TD>
-	</TR>
-	<tr>
-	    <td colspan="2">
-	      <p>&nbsp;
-	    </td>
-	  </tr>
-	  <tr>
-	    <TD COLSPAN="1" WIDTH="100%" BGCOLOR="#B6D8E2">
-	      <B><FONT COLOR="#000000">About <MM-List-Name></FONT></B>
-	    </TD>
-            <TD COLSPAN="1" WIDTH="100%" BGCOLOR="#B6D8E2">
-              <MM-lang-form-start><MM-displang-box> <MM-list-langs>
-              <MM-form-end>
-    <MM-Subscribe-Form-Start>
-            </TD>
-	  </TR>
-	    <tr>
-	      <td colspan="2">
-		<P><MM-List-Info></P>
-	  <p> To see the collection of prior postings to the list,
-	      visit the <MM-Archive><MM-List-Name>
-		  Archives</MM-Archive>.
-	      <MM-Restricted-List-Message>
-	  </p>
-	</TD>
-      </TR>
-      <TR>
-	<TD COLSPAN="2" WIDTH="100%" BGCOLOR="#B6D8E2">
-	  <B><FONT COLOR="#000000">Using <MM-List-Name></FONT></B>
-	</TD>
-      </TR>
-      <tr>
-	<td colspan="2">
-	  To post a message to all the list members, send email to
-	  <A HREF="mailto:<MM-Posting-Addr>"><MM-Posting-Addr></A>.
-
-	  <p>You can subscribe to the list, or change your existing
-	    subscription, in the sections below.
-	</td>
-      </tr>
-      <TR>
-	<TD COLSPAN="2" WIDTH="100%" BGCOLOR="#B6D8E2">
-	  <B><FONT COLOR="#000000">Subscribing to <MM-List-Name></FONT></B>
-	</TD>
-      </TR>
-      <tr>
-	<td colspan="2">
-	  <P>
-	    Subscribe to <MM-List-Name> by filling out the following
-	      form.
-	  <ul>
-	  <MM-List-Subscription-Msg>
-	      <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2"
-		WIDTH="70%" HEIGHT= "112">
-		<TR>
-		  <TD BGCOLOR="#dddddd" WIDTH="55%">Your email address:</TD>
-		  <TD WIDTH="33%"><MM-Subscribe-Box>
-	</TD>
-	<TD WIDTH="12%">&nbsp;</TD></TR>
-      <tr>
-        <td bgcolor="#dddddd" width="55%">Your name (optional):</td>
-        <td width="33%"><mm-fullname-box></td>
-	<TD WIDTH="12%">&nbsp;</TD></TR>
-      <TR>
-	<TD COLSPAN="3"><FONT SIZE=-1>You may enter a
-	    privacy password below. This provides only mild security,
-	    but should prevent others from messing with your
-	    subscription.  <b>Do not use a valuable password</b> as
-	    it will occasionally be emailed back to you in cleartext.
-
-            <p>If you choose not to enter a password, one will be
-            automatically generated for you, and it will be sent to
-            you once you've confirmed your subscription.  You can
-            always request a mail-back of your password when you edit
-            your personal options.
-	    <MM-Reminder>
-	</TD>
-      </TR>  
-      <TR>
-	<TD BGCOLOR="#dddddd">Pick a password:</TD>
-	<TD><MM-New-Password-Box></TD>
-	<TD>&nbsp;</TD></TR>
-      <TR> 
-	<TD BGCOLOR="#dddddd">Reenter password to confirm:</TD>
-	<TD><MM-Confirm-Password></TD>
-	<TD>&nbsp; </TD></TR>
-      <tr>
-        <TD BGCOLOR="#dddddd">Which language do you prefer to display your messages?</TD> 
-        <TD> <MM-list-langs></TD>
-        <TD>&nbsp; </TD></TR>
-      <mm-digest-question-start>
-      <tr>
-	<td>Would you like to receive list mail batched in a daily
-	  digest?
-	  </td>
-	<td><MM-Undigest-Radio-Button> No
-	    <MM-Digest-Radio-Button>  Yes
-	</TD>
-      </tr>
-      <mm-digest-question-end>
-      <tr>
-	<td colspan="3">
-	  <center><MM-Subscribe-Button></P></center>
-    </TABLE>
-    <MM-Form-End>
-    </ul>
-    </td>
-    </tr>
-    <TR>
-      <TD COLSPAN="2" WIDTH="100%" BGCOLOR="#B6D8E2">
-	<a name="subscribers">
-        <B><FONT COLOR="#000000"><MM-List-Name> Subscribers</FONT></B></a>
-      </TD>
-    </TR>
-    <tr>
-      <TD COLSPAN="2" WIDTH="100%">
-	<MM-Roster-Form-Start>
-	<MM-Roster-Option>
-	    <MM-Form-End>
-	  <p>
-	<MM-Options-Form-Start>
-	<MM-Editing-Options>
-		<MM-Form-End>
-      </td>
-    </tr>
-  </table>
-<div class="container">
-		<MM-Mailman-Footer>
-		<hr />
-        <div id="footer">
-                <div class="span-4">
-                        <h3>OpenStack</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/projects/">Projects</a></li>
-                                <li><a href="https://security.openstack.org/">OpenStack Security</a></li>
-                                <li><a href="https://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
-                                <li><a href="https://www.openstack.org/blog/">Blog</a></li>
-                                <li><a href="https://www.openstack.org/news/">News</a></li>
-                        </ul>
-                </div>
-               <div class="span-4">
-                        <h3>Community</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/community/">User Groups</a></li>
-                                <li><a href="https://www.openstack.org/events/">Events</a></li>
-                                <li><a href="https://www.openstack.org/jobs/">Jobs</a></li>
-                                <li><a href="https://www.openstack.org/foundation/companies/">Companies</a></li>
-                                <li><a href="https://docs.opendev.org/opendev/infra-manual/latest/developers.html">Contribute</a></li>
-                        </ul>
-                </div>
-                <div class="span-4">
-                        <h3>Documentation</h3>
-                        <ul>
-                                <li><a href="https://docs.openstack.org/">OpenStack Manuals</a></li>
-                                <li><a href="https://www.openstack.org/software/start/">Getting Started</a></li>
-                                <li><a href="https://developer.openstack.org">API Documentation</a></li>
-                                <li><a href="https://wiki.openstack.org/">Wiki</a></li>
-                        </ul>
-                </div>
-                <div class="span-4 last">
-                        <h3>Branding &amp; Legal</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/brand/">Logos &amp; Guidelines</a></li>
-                                <li><a href="https://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
-                                <li><a href="https://www.openstack.org/privacy/">Privacy Policy</a></li>
-                                <li><a href="https://wiki.openstack.org/CLA">OpenStack CLA</a></li>
-                        </ul>
-                </div>
-                <hr>
-        </div>
-</div>
-
-</div>
-</BODY>
-</HTML>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/masthead.txt b/modules/openstack_project/files/mailman/html-templates-en/masthead.txt
deleted file mode 100644
index 30c526ac9d..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/masthead.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Send %(real_name)s mailing list submissions to
-	%(got_list_email)s
-
-To subscribe or unsubscribe via the World Wide Web, visit
-	%(got_listinfo_url)s
-or, via email, send a message with subject or body 'help' to
-	%(got_request_email)s
-
-You can reach the person managing the list at
-	%(got_owner_email)s
-
-When replying, please edit your Subject line so it is more specific than
-"Re: Contents of %(real_name)s digest..."
diff --git a/modules/openstack_project/files/mailman/html-templates-en/newlist.txt b/modules/openstack_project/files/mailman/html-templates-en/newlist.txt
deleted file mode 100644
index 3362887d81..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/newlist.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-The mailing list `%(listname)s' has just been created for you.  The
-following is some basic information about your mailing list.
-
-Your mailing list password is:
-
-    %(password)s
-
-You need this password to configure your mailing list.  You also need
-it to handle administrative requests, such as approving mail if you
-choose to run a moderated list.
-
-You can configure your mailing list at the following web page:
-
-    %(admin_url)s
-
-The web page for users of your mailing list is: 
-
-    %(listinfo_url)s
-
-You can even customize these web pages from the list configuration
-page.  However, you do need to know HTML to be able to do this.
-
-There is also an email-based interface for users (not administrators)
-of your list; you can get info about using it by sending a message
-with just the word `help' as subject or in the body, to:
-
-    %(requestaddr)s
-
-To unsubscribe a user: from the mailing list 'listinfo' web page,
-click on or enter the user's email address as if you were that user.
-Where that user would put in their password to unsubscribe, put in
-your admin password.  You can also use your password to change
-member's options, including digestification, delivery disabling, etc.
-
-Please address all questions to %(siteowner)s.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/nomoretoday.txt b/modules/openstack_project/files/mailman/html-templates-en/nomoretoday.txt
deleted file mode 100644
index 1019dce348..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/nomoretoday.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-We have received a message from your address `%(sender)s' requesting
-an automated response from the %(listname)s mailing list.  We have
-seen %(num)s such messages from you today.  In order to avoid problems
-such as mail loops between email robots, we will not be sending you
-any further email responses today.  Please try again tomorrow.
-
-If you believe this message is in error, or if you have any questions,
-please contact the list owner at %(owneremail)s.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/options.html b/modules/openstack_project/files/mailman/html-templates-en/options.html
deleted file mode 100644
index 6fd1476016..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/options.html
+++ /dev/null
@@ -1,422 +0,0 @@
-<html>
-<head>
-    <link rel="SHORTCUT ICON" href="<mm-favicon>">
-    <title>OpenStack Open Source Cloud Computing Software &raquo; <MM-Presentable-User> membership configuration for <MM-List-Name> </title>
-
-    <!-- Google Fonts -->
-        <link href='https://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
-
-    <!-- Framework CSS -->
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/screen.css" type="text/css" media="screen, projection">
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/print.css" type="text/css" media="print">
-
-    <!-- IE CSS -->
-    <!--[if lt IE 8]><link rel="stylesheet" href="https://openstack.org/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-
-    <!-- OpenStack Specific CSS -->
-
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/dropdown.css" type="text/css" media="screen, projection, print">
-
-    <!-- Page Specific CSS -->
-        <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/home.css" type="text/css" media="screen, projection, print">
-
-  <link rel="stylesheet" type="text/css" href="https://openstack.org/themes/openstack/css/main.css?m=1335457934" />
-  <script type="text/javascript">
-
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-1']);
-    _gaq.push(['_setDomainName', '.openstack.org']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-
-  </script>
-  </HEAD>
-<BODY>
-   <div class="container">
-                <div id="header">
-                        <div class="span-5">
-                                <h1 id="logo"><a href="/">Open Stack</a></h1>
-                        </div>
-                        <div class="span-19 last blueLine">
-
-                                <div id="navigation" class="span-19">
-                                        <ul id="Menu1">
- 			                <li><a href="https://openstack.org/" title="Go to the Home page" class="link" >Home</a></li>
-                  			<li><a href="https://openstack.org/projects/" title="Go to the OpenStack Projects page" class="link">Projects</a></li>
-                				<li><a href="https://openstack.org/user-stories/" title="Go to the User Stories page" class="link">User Stories</a></li>
-                 			<li><a href="https://openstack.org/community/" title="Go to the Community page" class="current">Community</a></li>
-                                          <li><a href="https://openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a></li>
-                                          <li><a href="https://wiki.openstack.org/" title="Go to the OpenStack Wiki">Wiki</a></li>
-                                          <li><a href="https://docs.openstack.org/" title="Go to OpenStack Documentation">Documentation</a></li>
-                                        </ul>
-
-
-                                </div>
-
-                        </div>
-                </div>
-        </div>
-        <!-- Page Content -->
-
-    <div class="container">
-
-    <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="5">
-    <TR><TD WIDTH="100%" BGCOLOR="#D8D8D8"><B>
-        <FONT COLOR="#000000" SIZE=+1>
-        <MM-List-Name> mailing list membership configuration for
-        <MM-Presentable-User>
-        </FONT></B></TD></TR>
-    </TABLE>
-<p>
-<table width="100%" border="0" cellspacing="5" cellpadding="5">
-    <tr><td>
-        <b><MM-Presentable-User></b>'s subscription status,
-        password, and options for the <MM-List-Name> mailing list.
-        </td><td><MM-Form-Start><mm-logout-button><MM-Form-End></td>
-    </tr><tr>
-        <td colspan="2">
-        <MM-Case-Preserved-User>
-
-        <MM-Disabled-Notice>
-
-        <p><mm-results>
-        </td>
-    </tr>
-</table>
-
-<MM-Form-Start>
-<p>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="5">
-    <TR><TD WIDTH="100%" BGCOLOR="#B6D8E2" colspan="2">
-        <FONT COLOR="#000000">
-        <B>Changing your <MM-List-Name> membership information</B>
-        </FONT></TD></TR>
-    <tr><td colspan="2">You can change the address that you are subscribed
-        to the mailing list with by entering the new address in the
-        fields below.  Note that a confirmation email will be sent to
-        the new address, and the change must be confirmed before it is
-        processed.
-
-        <p>Confirmations time out after about <mm-pending-days>.
-
-        <p>You can also optionally set or change your real name
-        (i.e. <em>John Smith</em>).
-
-        <p>If you want to make the membership changes for all the
-        lists that you are subscribed to at <mm-host>, turn on the
-        <em>Change globally</em> check box.
-
-        </td></tr>
-    <tr><td><center>
-        <table border="0" cellspacing="2" cellpadding="2" width="80%" cols="2">
-        <tr><td bgcolor="#dddddd"><div align="right">New address:</div></td>
-            <td><mm-new-address-box></td>
-            </tr>
-        <tr><td bgcolor="#dddddd"><div align="right">Again to
-            confirm:</div></td> 
-            <td><mm-confirm-address-box></td>
-            </tr>
-        </tr></table></center>
-        </td>
-        <td><center>
-        <table border="0" cellspacing="2" cellpadding="2" width="80%" cols="2">
-            <tr><td bgcolor="#dddddd"><div align="right">Your name
-            (optional):</div></td>
-            <td><mm-fullname-box></td>
-            </tr>
-        </table></center>
-        </td>
-        </tr>
-    <tr><td colspan="2"><center><mm-change-address-button>
-        <p><mm-global-change-of-address>Change globally</center></td>
-    </tr>
-</table>
-
-<p>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="5" CELLPADDING="5">
-    <TR><TD WIDTH="50%" BGCOLOR="#FFF0D0"><FONT COLOR="#000000">
-        <B>Unsubscribing from <MM-List-Name></B></td>
-
-        <TD WIDTH="50%" BGCOLOR="#FFF0D0"><FONT COLOR="#000000">
-        <B>Your other <MM-Host> subscriptions</B>
-        </FONT></TD></TR>
-
-    <tr><td>
-        Turn on the confirmation checkbox and hit this button to
-        unsubscribe from this mailing list.  <strong>Warning:</strong>
-        This action will be taken immediately!
-        <p>
-        <center><MM-Unsubscribe-Button></center></td>
-    <td>
-        You can view a list of all the other mailing lists at
-        <mm-host> for which you are a member.  Use this if you want to
-        make the same membership option changes to this other
-        subscriptions.
-
-        <p>
-        <center><MM-Other-Subscriptions-Submit></center>
-        </TD></TR>
-</table>
-
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="5">
-    <TR><TD COLSPAN=2 WIDTH="100%" BGCOLOR="#FFF0D0"><FONT COLOR="#000000">
-        <B>Your <MM-List-Name> Password</B>
-        </FONT></TD></TR>
-
-    <tr valign="TOP"><td WIDTH="50%">
-        <a name=reminder>
-        <center>
-        <h3>Forgotten Your Password?</h3>
-        </center>
-        Click this button to have your password emailed to your
-        membership address.
-        <p><MM-Umbrella-Notice>
-        <center>
-        <MM-Email-My-Pw>
-        </center>
-        </td>
-
-    <td WIDTH="50%">
-        <a name=changepw>
-        <center>
-        <h3>Change Your Password</h3>
-        <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2" WIDTH="70%" COLS=2>
-            <TR><TD BGCOLOR="#dddddd"><div align="right">New
-                password:</div></TD>
-                <TD><MM-New-Pass-Box></TD>
-                </TR>
-            <TR>
-                <TD BGCOLOR="#dddddd"><div align="right">Again to
-                confirm:</div></TD>
-                <TD><MM-Confirm-Pass-Box></TD>
-            </TR>
-        </table>
-
-        <MM-Change-Pass-Button>
-        <p><center><mm-global-pw-changes-button>Change globally.
-        </center>
-</TABLE>
-
-<p>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="5">
-    <TR><TD WIDTH="100%" BGCOLOR="#FFF0D0"><FONT COLOR="#000000">
-        <B>Your <MM-List-Name> Subscription Options</B>
-        </FONT></TD></TR>
-</table>
-
-<p>
-<i><strong>Current values are checked.</strong></i>
-
-<p>Note that some of the options have a <em>Set globally</em>
-checkbox.  Checking this field will cause the changes to be made to
-every mailing list that you are a member of on <mm-host>.  Click on
-<em>List my other subscriptions</em> above to see which other mailing
-lists you are subscribed to.
-<p>
-<TABLE BORDER="0" CELLSPACING="3" CELLPADDING="4" WIDTH="100%">
-    <tr><TD BGCOLOR="#cccccc">
-        <a name="disable">
-        <strong>Mail delivery</strong></a><p>
-        Set this option to <em>Enabled</em> to receive messages posted
-        to this mailing list.  Set it to <em>Disabled</em> if you want
-        to stay subscribed, but don't want mail delivered to you for a
-        while (e.g. you're going on vacation).  If you disable mail
-        delivery, don't forget to re-enable it when you come back; it
-        will not be automatically re-enabled.
-        </td><td bgcolor="#cccccc">
-        <mm-delivery-enable-button>Enabled<br>
-        <mm-delivery-disable-button>Disabled<p>
-        <mm-global-deliver-button><i>Set globally</i>
-        </td></tr>
-
-    <tr><TD BGCOLOR="#cccccc">
-        <strong>Set Digest Mode</strong><p>
-        If you turn digest mode on, you'll get posts bundled together
-        (usually one per day but possibly more on busy lists), instead
-        of singly when they're sent.  If digest mode is changed from
-        on to off, you may receive one last digest.
-        </td><td bgcolor="#cccccc">
-        <MM-Undigest-Radio-Button>Off<br>
-        <MM-Digest-Radio-Button>On
-        </td></tr>
-        
-    <tr><TD BGCOLOR="#cccccc">
-        <strong>Get MIME or Plain Text Digests?</strong><p>
-        Your mail reader may or may not support MIME digests.  In
-        general MIME digests are preferred, but if you have a problem
-        reading them, select plain text digests.
-        </td><td bgcolor="#cccccc">
-        <MM-Mime-Digests-Button>MIME<br>
-        <MM-Plain-Digests-Button>Plain Text<p>
-        <mm-global-mime-button><i>Set globally</i>
-        </td></tr>
-        
-    <tr><TD BGCOLOR="#cccccc">
-        <strong>Receive your own posts to the list?</strong><p>
-        Ordinarily, you will get a copy of every message you post to
-        the list.  If you don't want to receive this copy, set this
-        option to <em>No</em>.
-        </td><td bgcolor="#cccccc">
-        <mm-dont-receive-own-mail-button>No<br>
-        <mm-receive-own-mail-button>Yes
-        </td></tr>
-
-    <tr><TD BGCOLOR="#cccccc">
-        <strong>Receive acknowledgement mail when you send mail to
-        the list?</strong><p>
-        </td><td bgcolor="#cccccc">
-        <mm-dont-ack-posts-button>No<br>
-        <mm-ack-posts-button>Yes
-        </td></tr>
-
-    <tr><td bgcolor="#cccccc">
-        <strong>Get password reminder email for this list?</strong><p>
-        Once a month, you will get an email containing a password
-        reminder for every list at this host to which you are
-        subscribed.  You can turn this off on a per-list basis by
-        selecting <em>No</em> for this option.  If you turn off
-        password reminders for all the lists you are subscribed to, no
-        reminder email will be sent to you.
-        </td><td bgcolor="#cccccc">
-        <mm-dont-get-password-reminder-button>No<br>
-        <mm-get-password-reminder-button>Yes<p>
-        <mm-global-remind-button><i>Set globally</i>
-        </td></tr>
-
-    <tr><TD BGCOLOR="#cccccc">
-        <strong>Conceal yourself from subscriber list?</strong><p>
-        When someone views the list membership, your email address is
-        normally shown (in an obscured fashion to thwart spam
-        harvesters).  If you do not want your email address to show up
-        on this membership roster at all, select <em>Yes</em> for this option.
-        </td><td bgcolor="#cccccc">
-        <MM-Public-Subscription-Button>No<br>
-        <MM-Hide-Subscription-Button>Yes
-        </td></tr>
-
-    <tr><TD BGCOLOR="#cccccc">
-        <strong>What language do you prefer?</strong><p>
-        </td><td bgcolor="#cccccc">
-        <MM-list-langs>
-        </td></tr>
-
-    <tr><td bgcolor="#cccccc">
-        <strong>Which topic categories would you like to subscribe
-                to?</strong><p>
-                By selecting one or more topics, you can filter the
-                traffic on the mailing list, so as to receive only a
-                subset of the messages.  If a message matches one of
-                your selected topics, then you will get the message,
-                otherwise you will not.
-
-                <p>If a message does not match any topic, the delivery
-                rule depends on the setting of the option below.  If
-                you do not select any topics of interest, you will get
-                all the messages sent to the mailing list.
-        </td><td bgcolor="#cccccc">
-        <mm-topics>
-        </td></tr>
-
-    <tr><td bgcolor="#cccccc">
-        <strong>Do you want to receive messages that do not match any
-                topic filter?</strong><p>
-
-                This option only takes effect if you've subscribed to
-                at least one topic above.  It describes what the
-                default delivery rule is for messages that don't match
-                any topic filter.  Selecting <em>No</em> says that if
-                the message does not match any topic filters, then you
-                won't get the message, while selecting <em>Yes</em>
-                says to deliver such non-matching messages to you.
-
-                <p>If no topics of interest are selected above, then
-                you will receive every message sent to the mailing
-                list.
-        </td><td bgcolor="#cccccc">
-        <mm-suppress-nonmatching-topics>No<br>
-        <mm-receive-nonmatching-topics>Yes
-        </td></tr>
-
-    <tr><td bgcolor="#cccccc">
-        <strong>Avoid duplicate copies of messages?</strong><p>
-
-                When you are listed explicitly in the <tt>To:</tt> or
-                <tt>Cc:</tt> headers of a list message, you can opt to
-                not receive another copy from the mailing list.
-                Select <em>Yes</em> to avoid receiving copies from the
-                mailing list; select <em>No</em> to receive copies.
-
-                <p>If the list has member personalized messages
-                enabled, and you elect to receive copies, every copy
-                will have a <tt>X-Mailman-Copy: yes</tt> header added
-                to it.
-
-        </td><td bgcolor="#cccccc">
-        <mm-receive-duplicates-button>No<br>
-        <mm-dont-receive-duplicates-button>Yes<p>
-        <mm-global-nodupes-button><i>Set globally</i>
-        </td></tr>
-
-    <tr><TD colspan="2">
-        <center><MM-options-Submit-button></center>
-        </td></tr>
-
-</table>
-</center>
-<p>
-<MM-Form-End>
-
-<div class="container">
-<MM-Mailman-Footer>
-<hr />
-        <div id="footer">
-                <div class="span-4">
-                        <h3>OpenStack</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/projects/">Projects</a></li>
-                                <li><a href="https://security.openstack.org/">OpenStack Security</a></li>
-                                <li><a href="https://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
-                                <li><a href="https://www.openstack.org/blog/">Blog</a></li>
-                                <li><a href="https://www.openstack.org/news/">News</a></li>
-                        </ul>
-                </div>
-               <div class="span-4">
-                        <h3>Community</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/community/">User Groups</a></li>
-                                <li><a href="https://www.openstack.org/events/">Events</a></li>
-                                <li><a href="https://www.openstack.org/jobs/">Jobs</a></li>
-                                <li><a href="https://www.openstack.org/foundation/companies/">Companies</a></li>
-                                <li><a href="https://docs.opendev.org/opendev/infra-manual/latest/developers.html">Contribute</a></li>
-                        </ul>
-                </div>
-                <div class="span-4">
-                        <h3>Documentation</h3>
-                        <ul>
-                                <li><a href="https://docs.openstack.org/">OpenStack Manuals</a></li>
-                                <li><a href="https://www.openstack.org/software/start/">Getting Started</a></li>
-                                <li><a href="https://developer.openstack.org">API Documentation</a></li>
-                                <li><a href="https://wiki.openstack.org/">Wiki</a></li>
-                        </ul>
-                </div>
-                <div class="span-4 last">
-                        <h3>Branding &amp; Legal</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/brand/">Logos &amp; Guidelines</a></li>
-                                <li><a href="https://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
-                                <li><a href="https://www.openstack.org/privacy/">Privacy Policy</a></li>
-                                <li><a href="https://wiki.openstack.org/CLA">OpenStack CLA</a></li>
-                        </ul>
-                </div>
-                <hr>
-        </div>
-</div>
-</div>
-
-</body>
-</html>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/postack.txt b/modules/openstack_project/files/mailman/html-templates-en/postack.txt
deleted file mode 100644
index 7402e4c2a4..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/postack.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Your message entitled
-
-    %(subject)s
-
-was successfully received by the %(listname)s mailing list.
-
-List info page: %(listinfo_url)s
-Your preferences: %(optionsurl)s
diff --git a/modules/openstack_project/files/mailman/html-templates-en/postauth.txt b/modules/openstack_project/files/mailman/html-templates-en/postauth.txt
deleted file mode 100644
index a10727716a..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/postauth.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-As list administrator, your authorization is requested for the
-following mailing list posting:
-
-    List:    %(listname)s@%(hostname)s
-    From:    %(sender)s
-    Subject: %(subject)s
-    Reason:  %(reason)s
-
-At your convenience, visit:
-
-    %(admindb_url)s
-        
-to approve or deny the request.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/postheld.txt b/modules/openstack_project/files/mailman/html-templates-en/postheld.txt
deleted file mode 100644
index 877bb40503..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/postheld.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Your mail to '%(listname)s' with the subject
-
-    %(subject)s
-
-Is being held until the list moderator can review it for approval.
-
-The reason it is being held:
-
-    %(reason)s
-
-Either the message will get posted to the list, or you will receive
-notification of the moderator's decision.  If you would like to cancel
-this posting, please visit the following URL:
-
-    %(confirmurl)s
diff --git a/modules/openstack_project/files/mailman/html-templates-en/private.html b/modules/openstack_project/files/mailman/html-templates-en/private.html
deleted file mode 100644
index ba0db1faf0..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/private.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-<head>
-    <title>%(realname)s Private Archives Authentication</title>
-<script>function sf(){document.f.username.focus();}</script>
-</head>
-<body bgcolor="#ffffff" onLoad="sf()">
-<FORM METHOD=POST ACTION="%(action)s" name="f">
-%(message)s
-  <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
-    <TR>
-      <TD COLSPAN="2" WIDTH="100%%" BGCOLOR="#99CCFF" ALIGN="CENTER">
-	<B><FONT COLOR="#000000" SIZE="+1">%(realname)s Private
-	    Archives Authentication</FONT></B>
-      </TD>
-    </TR>
-    <tr>
-        <TD><div ALIGN="Right">Email address:</div></TD>
-        <TD><INPUT TYPE="text" NAME="username" SIZE="30"></TD>
-    </tr>
-    <tr>
-      <TD><div ALIGN="Right">Password:</div></TD>
-      <TD><INPUT TYPE="password" NAME="password" SIZE="30"></TD>
-    </tr>
-    <tr>
-      <td colspan=2 align="middle"><INPUT type="SUBMIT"
-                                          name="submit"
-					  value="Let me in...">
-      </td>
-    </tr>
-  </TABLE>
-      <p><strong><em>Important:</em></strong> From this point on, you
-      must have cookies enabled in your browser, otherwise
-      you will have to re-authenticate with every operation.
-
-      <p>Session cookies are used in Mailman's
-      private archive interface so that you don't need to
-      re-authenticate with every operation.  This
-      cookie will expire automatically when you exit your browser, or
-      you can explicitly expire the cookie by visiting your
-      member options page and clicking the
-      <em>Log out</em> button.
-</FORM>
-</body>
-</html>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/probe.txt b/modules/openstack_project/files/mailman/html-templates-en/probe.txt
deleted file mode 100644
index e0ae4ff576..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/probe.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-This is a probe message.  You can ignore this message.
-
-The %(listname)s mailing list has received a number of bounces from you,
-indicating that there may be a problem delivering messages to %(address)s.
-A bounce sample is attached below.  Please examine this message to make sure
-there are no problems with your email address.  You may want to check with
-your mail administrator for more help.
-
-If you are reading this, you don't need to do anything to remain an enabled
-member of the mailing list.  If this message had bounced, you would not be
-reading it, and your membership would have been disabled.  Normally when you
-are disabled, you receive occasional messages asking you to re-enable your
-subscription.
-
-You can also visit your membership page at
-
-    %(optionsurl)s
-
-On your membership page, you can change various delivery options such
-as your email address and whether you get digests or not.
-
-If you have any questions or problems, you can contact the list owner
-at
-
-    %(owneraddr)s
diff --git a/modules/openstack_project/files/mailman/html-templates-en/refuse.txt b/modules/openstack_project/files/mailman/html-templates-en/refuse.txt
deleted file mode 100644
index 9b6d9bb9cb..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/refuse.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Your request to the %(listname)s mailing list
-
-    %(request)s
-
-has been rejected by the list moderator.  The moderator gave the
-following reason for rejecting your request:
-
-"%(reason)s"
-
-Any questions or comments should be directed to the list administrator 
-at:
-
-    %(adminaddr)s
diff --git a/modules/openstack_project/files/mailman/html-templates-en/roster.html b/modules/openstack_project/files/mailman/html-templates-en/roster.html
deleted file mode 100644
index 42831cee41..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/roster.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- $Revision: 3394 $ -->
-<HTML>
-  <HEAD>
-
-    <!-- Google Fonts -->
-        <link href='https://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
-
-    <!-- Framework CSS -->
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/screen.css" type="text/css" media="screen, projection">
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/print.css" type="text/css" media="print">
-
-    <!-- IE CSS -->
-    <!--[if lt IE 8]><link rel="stylesheet" href="https://openstack.org/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-
-    <!-- OpenStack Specific CSS -->
-
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/dropdown.css" type="text/css" media="screen, projection, print">
-
-    <!-- Page Specific CSS -->
-        <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/home.css" type="text/css" media="screen, projection, print">
-
-  <link rel="stylesheet" type="text/css" href="https://openstack.org/themes/openstack/css/main.css?m=1335457934" />
-  <script type="text/javascript">
-
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-1']);
-    _gaq.push(['_setDomainName', '.openstack.org']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-
-  </script>
-    <TITLE>OpenStack Open Source Cloud Computing Software &raquo; <MM-List-Name> Subscribers</TITLE>
-  
-  </HEAD>
-  <BODY>
-   <div class="container">
-                <div id="header">
-                        <div class="span-5">
-                                <h1 id="logo"><a href="/">Open Stack</a></h1>
-                        </div>
-                        <div class="span-19 last blueLine">
-
-                                <div id="navigation" class="span-19">
-                                        <ul id="Menu1">
- 			                <li><a href="https://openstack.org/" title="Go to the Home page" class="link" >Home</a></li>
-                  			<li><a href="https://openstack.org/projects/" title="Go to the OpenStack Projects page" class="link">Projects</a></li>
-                				<li><a href="https://openstack.org/user-stories/" title="Go to the User Stories page" class="link">User Stories</a></li>
-                 			<li><a href="https://openstack.org/community/" title="Go to the Community page" class="current">Community</a></li>
-                                          <li><a href="https://openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a></li>
-                                          <li><a href="https://wiki.openstack.org/" title="Go to the OpenStack Wiki">Wiki</a></li>
-                                          <li><a href="https://docs.openstack.org/" title="Go to OpenStack Documentation">Documentation</a></li>
-                                        </ul>
-
-
-                                </div>
-
-                        </div>
-                </div>
-        </div>
-        <!-- Page Content -->
-
-    <div class="container">
-
-    <P>
-    <TABLE WIDTH="100%" COLS="1" BORDER="0" CELLSPACING="4" CELLPADDING="5">
-      <TR>
-	<TD COLSPAN="2" WIDTH="100%" BGCOLOR="#D8D8D8" ALIGN="CENTER">
-	  <B><FONT COLOR="#000000" SIZE="+1"><MM-List-Name>
-		Subscribers</FONT></B>
-	</TD>
-      </TR>
-      <TR>
-	<TD COLSPAN="2" WIDTH="100%" ALIGN="CENTER">
-	    
-          <P align = "right"> <MM-lang-form-start><MM-displang-box>
-                       <MM-list-langs><MM-form-end></p>        
-
-	  <P>Click on your address to visit your subscription
-	      options page.<br><I>(Parenthesized entries have list delivery 
-	      disabled.)</I></P>
-	</TD>
-      </TR>
-      <TR WIDTH="100%" VALIGN="top">
-	<TD BGCOLOR="#B6D8E2" WIDTH="50%">
-	  <center>
-	    <B><FONT COLOR="#000000"><MM-Num-Reg-Users>
-		  Non-digested Members of <MM-List-Name>:</FONT></B>
-	  </center>
-	</TD>
-	<TD BGCOLOR="#B6D8E2" WIDTH="50%">
-	  <center>
-	    <B><FONT COLOR="#000000"><MM-Num-Digesters> Digested
-		  Members of <MM-List-Name>:</FONT></B> 
-	  </center>
-	</TD>
-      </TR>
-      <TR VALIGN="top">
-	<td>
-	  <P><MM-Regular-Users>
-	</td>
-	<td>
-	  <P><MM-Digest-Users>
-	</td>
-      </tr>
-    </table>
-
-<div class="container">
-<MM-Mailman-Footer>
-<hr />
-        <div id="footer">
-                <div class="span-4">
-                        <h3>OpenStack</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/projects/">Projects</a></li>
-                                <li><a href="https://security.openstack.org/">OpenStack Security</a></li>
-                                <li><a href="https://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
-                                <li><a href="https://www.openstack.org/blog/">Blog</a></li>
-                                <li><a href="https://www.openstack.org/news/">News</a></li>
-                        </ul>
-                </div>
-               <div class="span-4">
-                        <h3>Community</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/community/">User Groups</a></li>
-                                <li><a href="https://www.openstack.org/events/">Events</a></li>
-                                <li><a href="https://www.openstack.org/jobs/">Jobs</a></li>
-                                <li><a href="https://www.openstack.org/foundation/companies/">Companies</a></li>
-                                <li><a href="https://docs.opendev.org/opendev/infra-manual/latest/developers.html">Contribute</a></li>
-                        </ul>
-                </div>
-                <div class="span-4">
-                        <h3>Documentation</h3>
-                        <ul>
-                                <li><a href="https://docs.openstack.org/">OpenStack Manuals</a></li>
-                                <li><a href="https://www.openstack.org/software/start/">Getting Started</a></li>
-                                <li><a href="https://developer.openstack.org">API Documentation</a></li>
-                                <li><a href="https://wiki.openstack.org/">Wiki</a></li>
-                        </ul>
-                </div>
-                <div class="span-4 last">
-                        <h3>Branding &amp; Legal</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/brand/">Logos &amp; Guidelines</a></li>
-                                <li><a href="https://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
-                                <li><a href="https://www.openstack.org/privacy/">Privacy Policy</a></li>
-                                <li><a href="https://wiki.openstack.org/CLA">OpenStack CLA</a></li>
-                        </ul>
-                </div>
-                <hr>
-        </div>
-</div>
-</div>
-
-</BODY>
-</HTML>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/subauth.txt b/modules/openstack_project/files/mailman/html-templates-en/subauth.txt
deleted file mode 100644
index 9c20c3dac3..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/subauth.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Your authorization is required for a mailing list subscription request
-approval:
-
-    For:  %(username)s
-    List: %(listname)s@%(hostname)s
-
-At your convenience, visit:
-
-    %(admindb_url)s
-	
-to process the request.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/subscribe.html b/modules/openstack_project/files/mailman/html-templates-en/subscribe.html
deleted file mode 100644
index 310d655747..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/subscribe.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!-- $Revision: 3550 $ -->
-<html>
-<head><title>OpenStack Open Source Cloud Computing Software &raquo; <MM-List-Name> Subscription results</title></head>
-
-    <!-- Google Fonts -->
-        <link href='https://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
-
-    <!-- Framework CSS -->
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/screen.css" type="text/css" media="screen, projection">
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/blueprint/print.css" type="text/css" media="print">
-
-    <!-- IE CSS -->
-    <!--[if lt IE 8]><link rel="stylesheet" href="https://openstack.org/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-
-    <!-- OpenStack Specific CSS -->
-
-    <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/dropdown.css" type="text/css" media="screen, projection, print">
-
-    <!-- Page Specific CSS -->
-        <link rel="stylesheet" href="https://openstack.org/themes/openstack/css/home.css" type="text/css" media="screen, projection, print">
-
-  <link rel="stylesheet" type="text/css" href="https://openstack.org/themes/openstack/css/main.css?m=1335457934" />
-  <script type="text/javascript">
-
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-17511903-1']);
-    _gaq.push(['_setDomainName', '.openstack.org']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-
-  </script>
-  </HEAD>
-<BODY>
-   <div class="container">
-                <div id="header">
-                        <div class="span-5">
-                                <h1 id="logo"><a href="/">Open Stack</a></h1>
-                        </div>
-                        <div class="span-19 last blueLine">
-
-                                <div id="navigation" class="span-19">
-                                        <ul id="Menu1">
- 			                <li><a href="https://openstack.org/" title="Go to the Home page" class="link" >Home</a></li>
-                  			<li><a href="https://openstack.org/projects/" title="Go to the OpenStack Projects page" class="link">Projects</a></li>
-                				<li><a href="https://openstack.org/user-stories/" title="Go to the User Stories page" class="link">User Stories</a></li>
-                 			<li><a href="https://openstack.org/community/" title="Go to the Community page" class="current">Community</a></li>
-                                          <li><a href="https://openstack.org/blog/" title="Go to the OpenStack Blog">Blog</a></li>
-                                          <li><a href="https://wiki.openstack.org/" title="Go to the OpenStack Wiki">Wiki</a></li>
-                                          <li><a href="https://docs.openstack.org/" title="Go to OpenStack Documentation">Documentation</a></li>
-                                        </ul>
-
-
-                                </div>
-
-                        </div>
-                </div>
-        </div>
-        <!-- Page Content -->
-
-    <div class="container">
-<h1><MM-List-Name> Subscription results</h1>
-<MM-Results>
-
-<div class="container">
-
-<MM-Mailman-Footer>
-<hr />
-        <div id="footer">
-                <div class="span-4">
-                        <h3>OpenStack</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/projects/">Projects</a></li>
-                                <li><a href="https://security.openstack.org/">OpenStack Security</a></li>
-                                <li><a href="https://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
-                                <li><a href="https://www.openstack.org/blog/">Blog</a></li>
-                                <li><a href="https://www.openstack.org/news/">News</a></li>
-                        </ul>
-                </div>
-               <div class="span-4">
-                        <h3>Community</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/community/">User Groups</a></li>
-                                <li><a href="https://www.openstack.org/events/">Events</a></li>
-                                <li><a href="https://www.openstack.org/jobs/">Jobs</a></li>
-                                <li><a href="https://www.openstack.org/foundation/companies/">Companies</a></li>
-                                <li><a href="https://docs.opendev.org/opendev/infra-manual/latest/developers.html">Contribute</a></li>
-                        </ul>
-                </div>
-                <div class="span-4">
-                        <h3>Documentation</h3>
-                        <ul>
-                                <li><a href="https://docs.openstack.org/">OpenStack Manuals</a></li>
-                                <li><a href="https://www.openstack.org/software/start/">Getting Started</a></li>
-                                <li><a href="https://developer.openstack.org">API Documentation</a></li>
-                                <li><a href="https://wiki.openstack.org/">Wiki</a></li>
-                        </ul>
-                </div>
-                <div class="span-4 last">
-                        <h3>Branding &amp; Legal</h3>
-                        <ul>
-                                <li><a href="https://www.openstack.org/brand/">Logos &amp; Guidelines</a></li>
-                                <li><a href="https://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
-                                <li><a href="https://www.openstack.org/privacy/">Privacy Policy</a></li>
-                                <li><a href="https://wiki.openstack.org/CLA">OpenStack CLA</a></li>
-                        </ul>
-                </div>
-                <hr>
-        </div>
-</div>
-</div>
-</body>
-</html>
diff --git a/modules/openstack_project/files/mailman/html-templates-en/subscribeack.txt b/modules/openstack_project/files/mailman/html-templates-en/subscribeack.txt
deleted file mode 100644
index fad433f280..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/subscribeack.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Welcome to the %(real_name)s@%(host_name)s mailing list!
-%(welcome)s
-To post to this list, send your email to:
-
-  %(emailaddr)s
-
-General information about the mailing list is at:
-
-  %(listinfo_url)s
-
-If you ever want to unsubscribe or change your options (eg, switch to or
-from digest mode, change your password, etc.), visit your subscription
-page at:
-
-  %(optionsurl)s
-%(umbrella)s
-You can also make such adjustments via email by sending a message to:
-
-  %(real_name)s-request@%(host_name)s
-
-with the word `help' in the subject or body (don't include the
-quotes), and you will get back a message with instructions.
-
-You must know your password to change your options (including changing
-the password, itself) or to unsubscribe.  It is:
-
-  %(password)s
-
-Normally, Mailman will remind you of your %(host_name)s mailing list
-passwords once every month, although you can disable this if you
-prefer.  This reminder will also include instructions on how to
-unsubscribe or change your account options.  There is also a button on
-your options page that will email your current password to you.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/unsub.txt b/modules/openstack_project/files/mailman/html-templates-en/unsub.txt
deleted file mode 100644
index b08f65bae2..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/unsub.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Mailing list removal confirmation notice for mailing list %(listname)s
-
-We have received a request%(remote)s for the removal of your email
-address, "%(email)s" from the %(listaddr)s mailing list.  To confirm
-that you want to be removed from this mailing list, simply reply to
-this message, keeping the Subject: header intact.  Or visit this web
-page:
-
-    %(confirmurl)s
-
-Or include the following line -- and only the following line -- in a
-message to %(requestaddr)s:
-
-    confirm %(cookie)s
-
-Note that simply sending a `reply' to this message should work from
-most mail readers, since that usually leaves the Subject: line in
-the right form (additional "Re:" text in the Subject: is okay).
-
-If you do not wish to be removed from this list, please simply
-disregard this message.  If you think you are being maliciously
-removed from the list, or have any other questions, send them to
-%(listadmin)s.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/unsubauth.txt b/modules/openstack_project/files/mailman/html-templates-en/unsubauth.txt
deleted file mode 100644
index 920f6c1b61..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/unsubauth.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Your authorization is required for a mailing list unsubscription
-request approval:
-
-    By:   %(username)s
-    From: %(listname)s@%(hostname)s
-
-At your convenience, visit:
-
-    %(admindb_url)s
-
-to process the request.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/userpass.txt b/modules/openstack_project/files/mailman/html-templates-en/userpass.txt
deleted file mode 100644
index 2a53a846ea..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/userpass.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-You, or someone posing as you, has requested a password reminder for
-your membership on the mailing list %(fqdn_lname)s.  You will need
-this password in order to change your membership options (e.g. do you
-want regular delivery or digest delivery), and having this password
-makes it easier for you to unsubscribe from the mailing list.
-
-You are subscribed with the address: %(user)s
-
-Your %(listname)s password is: %(password)s
-
-To make changes to your membership options, log in and visit your
-options web page:
-
-    %(options_url)s
-
-You can also make such changes via email by sending a message to:
-
-    %(requestaddr)s
-
-with the text "help" in the subject or body.  The automatic reply will
-contain more detailed instructions.
-
-Questions or comments?  Please send them to the %(listname)s mailing
-list administrator at %(owneraddr)s.
diff --git a/modules/openstack_project/files/mailman/html-templates-en/verify.txt b/modules/openstack_project/files/mailman/html-templates-en/verify.txt
deleted file mode 100644
index 8e767f0723..0000000000
--- a/modules/openstack_project/files/mailman/html-templates-en/verify.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Mailing list subscription confirmation notice for mailing list %(listname)s
-
-We have received a request%(remote)s for subscription of your email
-address, "%(email)s", to the %(listaddr)s mailing list.  To confirm
-that you want to be added to this mailing list, simply reply to this
-message, keeping the Subject: header intact.  Or visit this web page:
-
-    %(confirmurl)s
-
-Or include the following line -- and only the following line -- in a
-message to %(requestaddr)s:
-
-    confirm %(cookie)s
-
-Note that simply sending a `reply' to this message should work from
-most mail readers, since that usually leaves the Subject: line in
-the right form (additional "Re:" text in the Subject: is okay).
-
-If you do not wish to be subscribed to this list, please simply
-disregard this message.  If you think you are being maliciously
-subscribed to the list, or have any other questions, send them to
-%(listadmin)s.
diff --git a/modules/openstack_project/files/mailman/mk-archives-index b/modules/openstack_project/files/mailman/mk-archives-index
deleted file mode 100755
index a814ad8a0c..0000000000
--- a/modules/openstack_project/files/mailman/mk-archives-index
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-for site in `cut -d: -f1 /etc/mailman/sites | sort`; do
-    echo "$site:"
-    dir=`grep ^${site}: /etc/mailman/sites | cut -d' ' -f2`
-    for ml in `ls ${dir}/archives/public/ | sort`; do
-        echo "  - $ml"
-    done
-done
diff --git a/modules/openstack_project/files/mailman/robots.txt b/modules/openstack_project/files/mailman/robots.txt
deleted file mode 100644
index a0ab15bd9c..0000000000
--- a/modules/openstack_project/files/mailman/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: SemrushBot
-Disallow: /
diff --git a/modules/openstack_project/manifests/kata_lists.pp b/modules/openstack_project/manifests/kata_lists.pp
deleted file mode 100644
index 1a139c1f76..0000000000
--- a/modules/openstack_project/manifests/kata_lists.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# == Class: openstack_project::kata_lists
-#
-class openstack_project::kata_lists(
-  $listpassword = ''
-) {
-
-  $listdomain = 'lists.katacontainers.io'
-
-  class { 'mailman':
-    vhost_name => $listdomain,
-  }
-
-  Maillist {
-    provider    => 'noaliasmailman',
-  }
-
-  maillist { 'kata-dev':
-    ensure      => present,
-    admin       => 'jonathan@openstack.org',
-    password    => $listpassword,
-    description => 'Kata Containers Development Mailing List (not for usage questions)',
-    webserver   => $listdomain,
-    mailserver  => $listdomain,
-  }
-
-  maillist { 'kata-hypervisor':
-    ensure      => present,
-    admin       => 'jonathan@openstack.org',
-    password    => $listpassword,
-    description => 'Discussion of security and virtualization targeted at container use cases',
-    webserver   => $listdomain,
-    mailserver  => $listdomain,
-  }
-
-  maillist { 'embargo-notice':
-    ensure      => present,
-    admin       => 'jonathan@openstack.org',
-    password    => $listpassword,
-    description => 'Announcements of embargoed notices for the Kata Containers project',
-    webserver   => $listdomain,
-    mailserver  => $listdomain,
-  }
-}
diff --git a/modules/openstack_project/manifests/lists.pp b/modules/openstack_project/manifests/lists.pp
deleted file mode 100644
index ffbb2bc737..0000000000
--- a/modules/openstack_project/manifests/lists.pp
+++ /dev/null
@@ -1,566 +0,0 @@
-# == Class: openstack_project::lists
-#
-class openstack_project::lists(
-  $listpassword = ''
-) {
-
-  class { 'mailman':
-    multihost => true,
-  }
-
-  file { '/var/www/robots.txt':
-    ensure  => present,
-    source  => 'puppet:///modules/openstack_project/mailman/robots.txt',
-    owner   => 'root',
-    group   => 'root',
-    replace => true,
-    mode    => '0444',
-  }
-
-  file { '/usr/local/sbin/mk-archives-index':
-    ensure  => present,
-    source  => 'puppet:///modules/openstack_project/mailman/mk-archives-index',
-    owner   => 'root',
-    group   => 'root',
-    replace => true,
-    mode    => '0744',
-  }
-
-  cron { 'mk-archives-index':
-    user        => root,
-    hour        => '0',
-    minute      => '0',
-    command     => 'mk-archives-index > /var/www/archives.yaml',
-    environment =>
-      'PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin',
-    require     => File['/usr/local/sbin/mk-archives-index',
-    ],
-  }
-
-
-  # Disable inactive admins
-  user::virtual::disable { 'oubiwann': }
-  user::virtual::disable { 'rockstar': }
-
-  # Begin user servicable parts
-
-  mailman::site { 'openstack':
-    default_email_host => 'lists.openstack.org',
-    default_url_host   => 'lists.openstack.org',
-    # en has customized templates, don't install it here
-    install_languages  => ['de', 'fr', 'it', 'ko', 'ru', 'vi', 'zh_TW'],
-  }
-
-  file { '/srv/mailman/openstack/templates/en':
-    ensure  => directory,
-    owner   => 'root',
-    group   => 'list',
-    mode    => '0644',
-    recurse => true,
-    require => File['/srv/mailman/openstack/templates'],
-    source  => 'puppet:///modules/openstack_project/mailman/html-templates-en',
-  }
-
-  mailman::site { 'zuul':
-    default_email_host => 'lists.zuul-ci.org',
-    default_url_host   => 'lists.zuul-ci.org',
-  }
-
-  mailman::site { 'airship':
-    default_email_host => 'lists.airshipit.org',
-    default_url_host   => 'lists.airshipit.org',
-  }
-
-  mailman::site { 'starlingx':
-    default_email_host => 'lists.starlingx.io',
-    default_url_host   => 'lists.starlingx.io',
-  }
-
-  mailman::site { 'opendev':
-    default_email_host => 'lists.opendev.org',
-    default_url_host   => 'lists.opendev.org',
-  }
-
-  # Add new mailing lists below this line
-
-  mailman_list { 'mailman@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'nobody@openstack.org',
-    password    => $listpassword,
-    description => 'The mailman site list',
-  }
-
-  mailman_list { 'openstack-es@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'flavio@redhat.com',
-    password    => $listpassword,
-    description => 'Lista de correo acerca de OpenStack en español',
-  }
-
-  mailman_list { 'openstack-fr@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'erwan@erwan.com',
-    password    => $listpassword,
-    description => 'List of the OpenStack french user group',
-  }
-
-  mailman_list { 'openstack-de@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'christian@berendt.io',
-    password    => $listpassword,
-    description => 'List for German-speaking OpenStack users',
-  }
-
-  mailman_list { 'openstack-i18n@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'guoyingc@cn.ibm.com',
-    password    => $listpassword,
-    description => 'List of the OpenStack Internationalization team.',
-  }
-
-  mailman_list { 'openstack-i18n-de@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'robert.simai@suse.com',
-    password    => $listpassword,
-    description => 'List of the German OpenStack Internationalization team.',
-  }
-
-  mailman_list { 'openstack-ir@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'Roozbeh.Shafiee@Gmail.Com',
-    password    => $listpassword,
-    description => 'OpenStack IRAN Community Discussions in Persian/Farsi',
-  }
-
-  mailman_list { 'openstack-it@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'stefano@openstack.org',
-    password    => $listpassword,
-    description => 'Discussioni su OpenStack in italiano',
-  }
-
-  mailman_list { 'openstack-el@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'aparathyras@stackmasters.eu',
-    password    => $listpassword,
-    description => 'List of the OpenStack Greek User Group',
-  }
-
-  mailman_list { 'openstack-travel-committee@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'communitymngr@openstack.org',
-    password    => $listpassword,
-    description => 'Private discussions for the OpenStack Travel Program Committee for Hong Kong Summit 2013.',
-  }
-
-  mailman_list { 'openstack-personas@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'pieter.c.kruithof-jr@hp.com',
-    password    => $listpassword,
-    description => 'A group of designers, researchers, developers, writers and users that are creating a set of personas for OpenStack that are intended to help drive development around the needs of our users.',
-  }
-
-  mailman_list { 'openstack-vi@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'hang.tran@dtt.vn',
-    password    => $listpassword,
-    description => 'Discussions in Vietnamese - please add Vietnamese translation here',
-  }
-
-  mailman_list { 'openstack-tw@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'macjacktw@hotmail.com',
-    password    => $listpassword,
-    description => 'OpenStack Taiwan User Group 臺灣使用者郵件群組)',
-  }
-
-  mailman_list { 'openstack-ko@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'ianyrchoi@gmail.com',
-    password    => $listpassword,
-    description => 'OpenStack Korea Community Discussions in Korean (오픈스택 한국 커뮤니티 메일링리스트)',
-  }
-
-  mailman_list { 'openstack-ru@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'ilyaalekseyev@acm.org',
-    password    => $listpassword,
-    description => 'Рассылка для обсуждения OpenStack на русском',
-  }
-
-  mailman_list { 'openstack-zh@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'yeluaiesec@gmail.com',
-    password    => $listpassword,
-    description => 'OpenStack社区中文讨论群组',
-  }
-
-  mailman_list { 'nov-2013-track-chairs@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'claire@openstack.org',
-    password    => $listpassword,
-    description => 'Coordination of tracks at OpenStack Summit April 2013',
-  }
-
-  mailman_list { 'openstack-track-chairs@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'claire@openstack.org',
-    password    => $listpassword,
-    description => 'Coordination of tracks at OpenStack Summits',
-  }
-
-  mailman_list { 'summitsponsors@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'claire@openstack.org',
-    password    => $listpassword,
-    description => 'Coordination among OpenStack Summit event sponsors',
-  }
-
-  mailman_list { 'openstack-sos@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'dms@danplanet.com',
-    password    => $listpassword,
-    description => 'Coordination of activities for Significant Others at Summits',
-  }
-
-  mailman_list { 'defcore-committee@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'josh@openstack.org',
-    password    => $listpassword,
-    description => 'Discussions of the OpenStack Foundation Core Definition Committee',
-  }
-
-  mailman_list { 'ambassadors@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'tom@openstack.org',
-    password    => $listpassword,
-    description => 'Private discussions between OpenStack Ambassadors',
-  }
-
-  mailman_list { 'superuser@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'lauren@openstack.org',
-    password    => $listpassword,
-    description => 'Discussions for Superuser editorial advisors to collaborate, and for readers to be able to contact the editorial team to make suggestions, provide feedback',
-  }
-
-  mailman_list { 'admin-cert-wg@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'heidi@openstack.org',
-    password    => $listpassword,
-    description => 'Collaboration workspace for members of the Certified OpenStack Administrator Working Group of the User Commitee/Board.',
-  }
-
-  mailman_list { 'openstack-api-consumers@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'mordred@inaugust.com',
-    password    => $listpassword,
-    description => 'Discussions around consuming the OpenStack REST APIs and development of API-consuming SDKs and frameworks',
-  }
-
-  mailman_list { 'enterprise-wg@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'carol.l.barrett@intel.com',
-    password    => $listpassword,
-    description => 'Collaboration workspace for members of the Win The Enterprise Working Group of the User Commitee/Board.',
-  }
-
-  mailman_list { 'product-wg@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'stefano@openstack.org',
-    password    => $listpassword,
-    description => 'Collaboration workspace for OpenStack-related Product Managers working group.',
-  }
-
-  mailman_list { 'tax-affairs@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'seanroberts66@gmail.com',
-    password    => $listpassword,
-    description => 'board committee focused on tax issues.',
-  }
-
-  mailman_list { 'third-party-announce@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'anteaya@anteaya.info',
-    password    => $listpassword,
-    description => 'Announcements for third party CI operators.',
-  }
-
-  mailman_list { 'foundation-testing-standards@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'seanroberts66@gmail.com',
-    password    => $listpassword,
-    description => 'OpenStack Foundation test standards (for humans, not
-    drivers) working group list.',
-  }
-
-  mailman_list { 'analyst-relations@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'lauren@openstack.org',
-    password    => $listpassword,
-    description => 'Coordination of Analyst Relations Working Group.',
-  }
-
-  mailman_list { 'app-catalog-admin@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'doc@aedo.net',
-    password    => $listpassword,
-    description => 'Coordinate admin details for OpenStack Community App Catalog.',
-  }
-
-  mailman_list { 'openstack-i18n-fr@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'jftalta@gmail.com',
-    password    => $listpassword,
-    description => 'List of the OpenStack Internationalization team, french local group.',
-  }
-
-  mailman_list { 'release-job-failures@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'doug@doughellmann.com',
-    password    => $listpassword,
-    description => 'Notification messages for failures from release-related build jobs.',
-  }
-
-  mailman_list { 'embargo-notice@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'jeremy@openstack.org',
-    password    => $listpassword,
-    description => 'Announcements to stakeholders for embargoed security vulnerabilities.',
-  }
-
-  mailman_list { 'release-announce@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'thierry@openstack.org',
-    password    => $listpassword,
-    description => 'Announcement of official OpenStack releases.',
-  }
-
-  mailman_list { 'edge-computing@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'claire@openstack.org',
-    password    => $listpassword,
-    description => 'Organizing efforts around the edge-computing focus area.',
-  }
-
-  mailman_list { 'openstack-mentoring@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'amy@demarco.com',
-    password    => $listpassword,
-    description => 'List to coordinate interactions between mentors and mentees of the OpenStack mentoring program. Also for questions about the mentoring program (i.e. how to get involved, how it works, etc.',
-  }
-
-  mailman_list { 'mailman@zuul':
-    require     => Mailman::Site['zuul'],
-    ensure      => present,
-    admin       => 'nobody@openstack.org',
-    password    => $listpassword,
-    description => 'The mailman site list',
-  }
-
-  mailman_list { 'zuul-announce@zuul':
-    require     => Mailman::Site['zuul'],
-    ensure      => present,
-    admin       => 'corvus@inaugust.com',
-    password    => $listpassword,
-    description => 'Announcements of Zuul releases and other important information.',
-  }
-
-  mailman_list { 'zuul-discuss@zuul':
-    require     => Mailman::Site['zuul'],
-    ensure      => present,
-    admin       => 'corvus@inaugust.com',
-    password    => $listpassword,
-    description => 'Discussion of Zuul usage and development.',
-  }
-
-  mailman_list { 'zuul-jobs-failures@zuul':
-    require     => Mailman::Site['zuul'],
-    ensure      => present,
-    admin       => 'ssbarnea@redhat.com',
-    password    => $listpassword,
-    description => 'Gets notifications about zuul-jobs periodic job failures.',
-  }
-
-  mailman_list { 'mailman@airship':
-    require     => Mailman::Site['airship'],
-    ensure      => present,
-    admin       => 'nobody@openstack.org',
-    password    => $listpassword,
-    description => 'The mailman site list',
-  }
-
-  mailman_list { 'airship-announce@airship':
-    require     => Mailman::Site['airship'],
-    ensure      => present,
-    admin       => 'jonathan@openstack.org',
-    password    => $listpassword,
-    description => 'Announcements of Airship releases and other important information.',
-  }
-
-  mailman_list { 'airship-discuss@airship':
-    require     => Mailman::Site['airship'],
-    ensure      => present,
-    admin       => 'jonathan@openstack.org',
-    password    => $listpassword,
-    description => 'Discussion of Airship usage and development.',
-  }
-
-  mailman_list { 'airship-job-failures@airship':
-    require     => Mailman::Site['airship'],
-    ensure      => present,
-    admin       => 'roman.gorshunov@att.com',
-    password    => $listpassword,
-    description => 'Notification messages for failures from CICD jobs.',
-  }
-
-  mailman_list { 'airship-security@airship':
-    require     => Mailman::Site['airship'],
-    ensure      => present,
-    admin       => 'andrew.walters@att.com',
-    password    => $listpassword,
-    description => 'Public Airship security advisories.',
-  }
-
-  mailman_list { 'airship-embargo-notice@airship':
-    require     => Mailman::Site['airship'],
-    ensure      => present,
-    admin       => 'andrew.walters@att.com',
-    password    => $listpassword,
-    description => 'Embargoed security vulnerability announcements for Airship consumers.',
-  }
-
-  mailman_list { 'mailman@starlingx':
-    require     => Mailman::Site['starlingx'],
-    ensure      => present,
-    admin       => 'nobody@openstack.org',
-    password    => $listpassword,
-    description => 'The mailman site list',
-  }
-
-  mailman_list { 'starlingx-announce@starlingx':
-    require     => Mailman::Site['starlingx'],
-    ensure      => present,
-    admin       => 'jonathan@openstack.org',
-    password    => $listpassword,
-    description => 'Announcements of StarlingX releases and other important information.',
-  }
-
-  mailman_list { 'starlingx-discuss@starlingx':
-    require     => Mailman::Site['starlingx'],
-    ensure      => present,
-    admin       => 'jonathan@openstack.org',
-    password    => $listpassword,
-    description => 'Discussion of StarlingX usage and development.',
-  }
-
-  mailman_list { 'openstack-discuss@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'fungi@yuggoth.org',
-    password    => $listpassword,
-    description => 'Discussion of OpenStack usage and development.',
-  }
-
-  mailman_list { 'mailman@opendev':
-    require     => Mailman::Site['opendev'],
-    ensure      => present,
-    admin       => 'nobody@openstack.org',
-    password    => $listpassword,
-    description => 'The mailman site list',
-  }
-
-  mailman_list { 'rust-vmm@opendev':
-    require     => Mailman::Site['opendev'],
-    ensure      => present,
-    admin       => 'claire@openstack.org',
-    password    => $listpassword,
-    description => 'Collaborating on Rust-based virtual machine monitors.',
-  }
-
-  mailman_list { 'rustyk8s@opendev':
-    require     => Mailman::Site['opendev'],
-    ensure      => present,
-    admin       => 'allison@lohutok.net',
-    password    => $listpassword,
-    description => 'Collaborating on Rust-based Kubernetes API.',
-  }
-
-  mailman_list { 'nbmp-discuss@opendev':
-    require     => Mailman::Site['opendev'],
-    ensure      => present,
-    admin       => 'ildiko@openstack.org',
-    password    => $listpassword,
-    description => 'Collaborating on Network Based Media Processing related platform and infrastructure systems usage and development.',
-  }
-
-  mailman_list { 'service-announce@opendev':
-    require     => Mailman::Site['opendev'],
-    ensure      => present,
-    admin       => 'cboylan@sapwetik.org',
-    password    => $listpassword,
-    description => 'Announcement list for OpenDev services.',
-  }
-
-  mailman_list { 'service-discuss@opendev':
-    require     => Mailman::Site['opendev'],
-    ensure      => present,
-    admin       => 'cboylan@sapwetik.org',
-    password    => $listpassword,
-    description => 'Discussion list for OpenDev services.',
-  }
-
-  mailman_list { 'service-incident@opendev':
-    require     => Mailman::Site['opendev'],
-    ensure      => present,
-    admin       => 'cboylan@sapwetik.org',
-    password    => $listpassword,
-    description => 'Private list for OpenDev incident coordination.',
-  }
-
-  mailman_list { 'openinfralabs@opendev':
-    require     => Mailman::Site['opendev'],
-    ensure      => present,
-    admin       => 'mnaser@vexxhost.com',
-    password    => $listpassword,
-    description => 'Discussion of the OpenInfra Labs academic and research resource sharing effort',
-  }
-}