Merge "Add email template for direct reminder about CIVS"

README.rst

@@ -144,6 +144,12 @@ When PTL Election begins:
 
   * ``tox -e venv -- template-emails voting_kickoff``
 
+* Optionally send direct *voting opt-in CIVS direct reminder* email to the members
+  who are not activated to CIVS voting system
+
+  * ``tox -evenv -- template-emails voting_optin_civs_direct_reminder -p
+    <project_name>``
+
 A couple of days before the PTL Election ends:
 
 * Send *PTL Voting Last Days* email
@@ -287,6 +293,13 @@ When TC Election begins:
 
   * ``tox -e venv -- template-emails voting_kickoff``
 
+* Optionally send direct *voting opt-in CIVS direct reminder* email to the members
+  who are not activated to CIVS voting system
+  (for combined election, put -p argument as 'tc' value)
+
+  * ``tox -evenv -- template-emails voting_optin_civs_direct_reminder -p
+    <project_name>``
+
 A couple of days before the TC Election ends:
 
 * Send *TC Voting Last Days* email

openstack_election/cmds/template_emails.py

@@ -20,7 +20,7 @@ start_release, _, end_release = conf['timeframe']['name'].partition('-')
 
 template_names = ['election_season', 'nominations_kickoff',
                   'nominations_last_days', 'nominations_direct_reminder',
-                  'end_nominations',
+                  'end_nominations', 'voting_optin_civs_direct_reminder',
                   'voting_optin_civs', 'voting_kickoff', 'voting_last_days']
 fmt_args = dict(
     email_deadline=conf['timeframe']['email_deadline'],
@@ -112,6 +112,21 @@ def main():
             contributors=contributors
         ))
 
+    if args.template == 'voting_optin_civs_direct_reminder':
+        if not args.project_name:
+            print("Project name is required for the "
+                  "'voting_optin_civs_direct_reminder' template to be "
+                  "generated", file=sys.stderr)
+            return 1
+
+        # Note: purposely set election_type as tc for combined election
+        if args.project_name == 'tc':
+            conf['election_type'] = 'tc'
+
+        fmt_args.update(dict(
+            project_name=args.project_name.title()
+        ))
+
     func_name = ('%(election_type)s_%(template)s' %
                  (dict(election_type=conf['election_type'],
                        template=args.template)))

openstack_election/templates/combined_voting_optin_civs_direct_reminder.j2

@@ -0,0 +1,17 @@
+BCC: (e-mails from CIVS which are not been activated by the recipient)
+Subject: Opt in to CIVS voting system for OpenStack {{ project_name }} PTL {{ release }} cycle Election
+
+You are a contributor to the OpenStack {{ project_name }} project,
+and eligible for voting to the current {{ project_name }} PTL election.
+
+The election uses the Condorcet Internet Voting Service (CIVS).
+Due to CIVS policy, to vote in private CIVS polls, you must opt in to email
+communication.
+
+To opt in, please enter your Gerrit email address in the following page, and
+confirm with the code that will sent to you via email.
+
+https://civs1.civs.us/cgi-bin/opt_in.pl
+
+If you have any question, please contact the election officials.
+https://governance.openstack.org/election/#election-officials

openstack_election/templates/ptl_voting_optin_civs_direct_reminder.j2

@@ -0,0 +1,17 @@
+BCC: (e-mails from CIVS which are not been activated by the recipient)
+Subject: Opt in to CIVS voting system for OpenStack {{ project_name }} PTL {{ release }} cycle Election
+
+You are a contributor to the OpenStack {{ project_name }} project,
+and eligible for voting to the current {{ project_name }} PTL election.
+
+The election uses the Condorcet Internet Voting Service (CIVS).
+Due to CIVS policy, to vote in private CIVS polls, you must opt in to email
+communication.
+
+To opt in, please enter your Gerrit email address in the following page, and
+confirm with the code that will sent to you via email.
+
+https://civs1.civs.us/cgi-bin/opt_in.pl
+
+If you have any question, please contact the election officials.
+https://governance.openstack.org/election/#election-officials

openstack_election/templates/tc_voting_optin_civs_direct_reminder.j2

@@ -0,0 +1,17 @@
+BCC: (e-mails from CIVS which are not been activated by the recipient)
+Subject: Opt in to CIVS voting system for OpenStack TC {{ release }} cycle Election
+
+You are a contributor to the OpenStack project, and eligible for voting to the
+current TC election.
+
+The election uses the Condorcet Internet Voting Service (CIVS).
+Due to CIVS policy, to vote in private CIVS polls, you must opt in to email
+communication.
+
+To opt in, please enter your Gerrit email address in the following page, and
+confirm with the code that will sent to you via email.
+
+https://civs1.civs.us/cgi-bin/opt_in.pl
+
+If you have any question, please contact the election officials.
+https://governance.openstack.org/election/#election-officials