From b9340ada3efc1d4fee8e36d78c08786685e51642 Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Fri, 15 Apr 2016 12:10:07 +0100 Subject: [PATCH] Improve IPAM status wording --- prog/weaver/http.go | 2 +- site/ipam/troubleshooting-ipam.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/prog/weaver/http.go b/prog/weaver/http.go index 28d11893..21b5d595 100644 --- a/prog/weaver/http.go +++ b/prog/weaver/http.go @@ -171,7 +171,7 @@ var statusTemplate = defTemplate("status", `\ {{if .IPAM.Paxos.Elector}}\ Status: awaiting consensus (quorum: {{.IPAM.Paxos.Quorum}}, known: {{.IPAM.Paxos.KnownNodes}}) {{else}}\ - Status: awaiting consensus (observer) + Status: priming {{end}}\ {{else}}\ Status: idle diff --git a/site/ipam/troubleshooting-ipam.md b/site/ipam/troubleshooting-ipam.md index 63090ce8..4ea94aff 100644 --- a/site/ipam/troubleshooting-ipam.md +++ b/site/ipam/troubleshooting-ipam.md @@ -32,8 +32,8 @@ the total allocation range and default subnet. Columns are as follows: ongoing, triggered by an allocation or claim request; allocations will block. This state persists until a quorum of peers are able to communicate amongst themselves successfully. - The Status may also show '(observer)' instead of the quorum size, - if this peer has been started with the `--observer` option. + * 'priming' - peer is an observer and is waiting to receive IPAM + data from seeding or consensus elsewhere in the network * 'ready' - consensus achieved; allocations proceed normally * 'waiting for IP range grant from peers' - peer has exhausted its agreed portion of the range and is waiting to be granted some