From 995736c6ba6bfc22891ce281eac23fda2bfa66c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Wed, 4 Jan 2012 14:15:50 +0100
Subject: [PATCH] Update the resource model DD with current state
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On my work for instance policies we decided not to overload --force
more, instead we go with a new flag --ignore-ipolicy. This is just a
small patch to reflect this decision.

Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 doc/design-resource-model.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/design-resource-model.rst b/doc/design-resource-model.rst
index 0c1f98731..a4d63c63e 100644
--- a/doc/design-resource-model.rst
+++ b/doc/design-resource-model.rst
@@ -609,10 +609,10 @@ parameters:
   request
 
 Ganeti will by default reject non-standard instance sizes (lower than
-``min_ispec`` or greater than ``max_ispec``), but as usual a ``--force``
-option on the command line or in the RAPI request will override these
-constraints. The ``std_spec`` structure will be used to fill in missing
-instance specifications on create.
+``min_ispec`` or greater than ``max_ispec``), but as usual a
+``--ignore-ipolicy`` option on the command line or in the RAPI request
+will override these constraints. The ``std_spec`` structure will be used
+to fill in missing instance specifications on create.
 
 Each of the ispec structures will be a dictionary, since the contents
 can change over time. Initially, we will define the following variables
-- 
GitLab