On Mon, Oct 7, 2013 at 12:18 PM, Klaus Aehlig <[email protected]> wrote: > On Mon, Oct 07, 2013 at 11:05:04AM +0200, Michele Tartara wrote: >> On Mon, Oct 7, 2013 at 9:55 AM, Klaus Aehlig <[email protected]> wrote: >> > During a Ganeti upgrade, 'gnt-cluster upgrade --to' documents the >> > fact that an upgrade is going on in a file, in case of a power failure >> > on the master node. Specify the full file name in pathutils. >> > >> > Signed-off-by: Klaus Aehlig <[email protected]> >> > --- >> > lib/pathutils.py | 1 + >> > 1 file changed, 1 insertion(+) >> > >> > diff --git a/lib/pathutils.py b/lib/pathutils.py >> > index 2a85f19..1a475bf 100644 >> > --- a/lib/pathutils.py >> > +++ b/lib/pathutils.py >> > @@ -93,6 +93,7 @@ CLUSTER_DOMAIN_SECRET_FILE = DATA_DIR + >> > "/cluster-domain-secret" >> > SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts" >> > RAPI_USERS_FILE = DATA_DIR + "/rapi/users" >> > QUEUE_DIR = DATA_DIR + "/queue" >> > +INTENT_TO_UPGRADE = DATA_DIR + "/intend-to-upgrade" >> >> What's the actual name supposed to be? Intent or intend? >> Both of them sound good to me, but this line is using them both. > > It should be intent, as in the design document. > > Interdiff > > diff --git a/lib/pathutils.py b/lib/pathutils.py > index 1a475bf..3620ca6 100644 > --- a/lib/pathutils.py > +++ b/lib/pathutils.py > @@ -93,7 +93,7 @@ CLUSTER_DOMAIN_SECRET_FILE = DATA_DIR + > "/cluster-domain-secret" > SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts" > RAPI_USERS_FILE = DATA_DIR + "/rapi/users" > QUEUE_DIR = DATA_DIR + "/queue" > -INTENT_TO_UPGRADE = DATA_DIR + "/intend-to-upgrade" > +INTENT_TO_UPGRADE = DATA_DIR + "/intent-to-upgrade" > CONF_DIR = SYSCONFDIR + "/ganeti" > USER_SCRIPTS_DIR = CONF_DIR + "/scripts" > VNC_PASSWORD_FILE = CONF_DIR + "/vnc-cluster-password" > > -- > Klaus Aehlig > Google Germany GmbH, Dienerstr. 12, 80331 Muenchen > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
LGTM, thanks. Michele -- Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
