doc/governance: update based on review and CLT discussions

Clarified some parts of council that were discussed previously,
specifying the number of members and a staggered term.

Added a bit more about the steering committee - thinking the meetings
could be split between tactical (3/4 weeks) and strategic (monthly),
and still open to anyone to join the discussion, but restricted to
only members voting.

Removed the meeting section since that belongs more in a separate
place, like the ceph.io website.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/doc/governance/index.rst b/doc/governance/index.rst
index 638820fa32c5eff2dea1470d9456eb156fda9134..d1ebabff05642f5de805e2a355de6ed7864cb694 100644 (file)
--- a/doc/governance/index.rst
+++ b/doc/governance/index.rst
@@ -4,10 +4,11 @@ Ceph Governance
 Key principles
 ==============
 
-  * Decision-making is consensus-driven by those who show up.
-  * Leadership roles are defined primary by responsibility, not prestige or seniority.
-    * It is normal and healthy for these roles to be passed on to others
-  * The role of developers is ultimately to serve the users.
+ * Decision-making is consensus-driven by those who show up.
+ * Leadership roles are defined primarily by responsibility, not prestige or seniority.
+   * It is normal and healthy for these roles to be passed on to others
+ * Everyone's role is ultimately to serve the users and participation
+   is voluntary.
 
 Bodies
 ------
@@ -15,37 +16,45 @@ Bodies
 Ceph Executive Council
 ======================
 
-  * [3 or 5] people
-  * selected by steering committee during leadership summit
-    * candidates self-nominate or are nominated by other members
-    * discussion of how roles/responsibilities may be delegated
-    * propose 1 or more council sets
-    * ranked-choice vote by steering committee
-  * 1 year term (i.e., a release cycle) (or staggered longer terms?)
-
 Responsibilities
 ^^^^^^^^^^^^^^^^
- * arbiter in cases where decisions cannot be reached by consensus
- * distribute key responsibilities amongst themselves or others
- * ensure things get done
 
-Ceph Steering Committee
-=======================
+ * Arbiter in cases where decisions cannot be reached by consensus
+ * Distribute key responsibilities amongst themselves or others
+ * Point of contact for the project
+ * Representatives for Ceph foundation board meetings
+ * Ensure things get done
 
 Membership
 ^^^^^^^^^^
 
- * senior developers, users, community members
- * Target size: low 10s
- * Existing CLT members are grandfathered in
- * Members can be nominated and added/removed by existing members (2/3 majority)
- * Term is normally 2 years, at which point they can be re-added or rotate out
- * Membership reflected by a github group (should be on website,  docs, email list too)
+ * 3 people
+ * Elected by steering committee
+   * Candidates self-nominate or are nominated by other members
+   * Discussion of how roles/responsibilities may be delegated
+   * Ranked-choice vote by steering committee
+ * 2 year terms, with one member staggered
+
+Ceph Steering Committee
+=======================
 
 Responsibilities
 ^^^^^^^^^^^^^^^^
- * Select executive council
- * Amend governance model
+
+ * Elect executive council
+ * Amend governance model (by majority vote)
+ * Meet regularly to discuss and decide on tactical and strategic project
+   improvements
+
+Membership
+^^^^^^^^^^
+
+ * Developers, users, community members
+ * Voting members can be nominated and added/removed by existing
+   members (2/3 majority)
+ * Anyone may attend steering committee meetings as a non-voting participant
+ * Existing Ceph Leadership Team members are grandfathered in
+ * Membership reflected by an email list and on the Ceph website and docs
 
 Team Leads
 ==========
@@ -53,7 +62,7 @@ Team Leads
 Responsibilities
 ^^^^^^^^^^^^^^^^
 
- * manage a component team in Ceph (e.g., RADOS, RGW, RBD, CephFS, Orchestrator, ...)
+ * Manage a component team in Ceph (e.g., RADOS, RGW, RBD, CephFS, Orchestrator, ...)
  * Ensure PRs are reviewed and merged
  * Run standups
  * Bug triage, scrubs
@@ -61,56 +70,3 @@ Responsibilities
 
 Selected by the executive council, generally based on recommendation by team members and outgoing lead
 Encourage periodic rotation of lead responsibility among team members
-
-
-
-Meetings
-========
-
-Leadership weekly
-^^^^^^^^^^^^^^^^^
-
- * weekly, virtual
-
- * Component leads + executive council + any council or community members who choose to attend
-
- * Tactical: this is where the work gets done (executive council wrangles developers, discuss tactial issues of the day)
-
- * Open meeting: anyone can join and raise discussion items
-
-
-Leadership summit
-^^^^^^^^^^^^^^^^^
-
- * Yearly (coinciding with release, Cephalocon / dev summit)
- * virtual + in-person
- * Council + leads + steering committed + anyone else (open meeting)
- * This is where strategic priorities, decisions are discussed, how next council nominations are formed
-
-
-CDM
-^^^
- * monthy, virtual
-
-
-User Meetup(s)
-^^^^^^^^^^^^^^
-
- * council + leads + users + interested parties
- * monthly, virtual
-
-
-Standups
-^^^^^^^^
-
- * daily, virtual
-
-
-Community Sync
-^^^^^^^^^^^^^^
- * weekly or bi-weekly
- * who
- * community manager
- * community lead (usually a council rep)
- * community ambassadors
- * interested parties