From 1ea43ac3464ea6b93677d16df4de826916d5484b Mon Sep 17 00:00:00 2001
From: Tom Barron <tpb@dyncloud.net>
Date: Tue, 13 Mar 2018 11:55:36 -0400
Subject: [PATCH] Add Manila project deadlines for Rocky

Change-Id: I65e10ec63d9ada91fd556d5368156e352a5e16b0
---
 doc/source/rocky/schedule.rst  | 32 +++++++++++++++++++++++++++++++-
 doc/source/rocky/schedule.yaml |  6 ++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/doc/source/rocky/schedule.rst b/doc/source/rocky/schedule.rst
index 14434016d1..a1e2ff7f44 100644
--- a/doc/source/rocky/schedule.rst
+++ b/doc/source/rocky/schedule.rst
@@ -57,7 +57,7 @@ Rocky Community Goals Acknowledgement
 -------------------------------------
 
 Teams should prepare their acknowledgement of `the community-wide
-goals for 
+goals for
 <https://governance.openstack.org/tc/goals/queens/index.html>`__.
 
 .. _r-summit:
@@ -216,3 +216,33 @@ Project-specific events
 
 Elections
 ---------
+
+Manila
+------
+
+.. _r-manila-spec-freeze:
+
+Manila Spec Freeze
+^^^^^^^^^^^^^^^^^^
+
+All Manila specs must be approved by 19 Apr 2018 (23:59 UTC).
+
+.. _r-manila-driver-deadline:
+
+Manila New Driver Submission Deadline
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The deadline for submitting new backend drivers to to Manila is 4 Jun 2018
+(23:59 UTC). New drivers must be substantially complete, with unit tests, and
+passing 3rd party CI by this date. Drivers do not need to be merged until the
+feature freeze date, but drivers that don't meet this deadline will not be
+considered at all for Rocky.
+
+
+.. _r-manila-fp-freeze:
+
+Manila Feature Proposal Freeze
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+All new Manila features must be proposed and substantially complete, with unit
+tests by 9 Jul 2018 (23:59 UTC).
diff --git a/doc/source/rocky/schedule.yaml b/doc/source/rocky/schedule.yaml
index 180bfca9e2..d5960f3710 100644
--- a/doc/source/rocky/schedule.yaml
+++ b/doc/source/rocky/schedule.yaml
@@ -29,6 +29,8 @@ cycle:
     start: '2018-04-16'
     x-project:
       - r-1
+    project-specific:
+      - r-manila-spec-freeze
   - end: '2018-04-27'
     name: R-18
     start: '2018-04-23'
@@ -55,6 +57,8 @@ cycle:
     x-project:
       - r-2
       - r-mf
+    project-specific:
+      - r-manila-driver-deadline
   - end: '2018-06-15'
     name: R-11
     start: '2018-06-11'
@@ -72,6 +76,8 @@ cycle:
     start: '2018-07-09'
     x-project:
       - r-extra-atcs
+    project-specific:
+      - r-manila-fp-freeze
   - end: '2018-07-20'
     name: R-6
     start: '2018-07-16'