Revision d9a51679 lib/cli.py
| b/lib/cli.py | ||
|---|---|---|
| 1219 | 1219 |
try: |
| 1220 | 1220 |
client = luxi.Client() |
| 1221 | 1221 |
except luxi.NoMasterError: |
| 1222 |
master, myself = ssconf.GetMasterAndMyself() |
|
| 1222 |
ss = ssconf.SimpleStore() |
|
| 1223 |
|
|
| 1224 |
# Try to read ssconf file |
|
| 1225 |
try: |
|
| 1226 |
ss.GetMasterNode() |
|
| 1227 |
except errors.ConfigurationError: |
|
| 1228 |
raise errors.OpPrereqError("Cluster not initialized or this machine is"
|
|
| 1229 |
" not part of a cluster") |
|
| 1230 |
|
|
| 1231 |
master, myself = ssconf.GetMasterAndMyself(ss=ss) |
|
| 1223 | 1232 |
if master != myself: |
| 1224 | 1233 |
raise errors.OpPrereqError("This is not the master node, please connect"
|
| 1225 | 1234 |
" to node '%s' and rerun the command" % |
| 1226 | 1235 |
master) |
| 1227 |
else: |
|
| 1228 |
raise |
|
| 1236 |
raise |
|
| 1229 | 1237 |
return client |
| 1230 | 1238 |
|
| 1231 | 1239 |
|
Also available in: Unified diff