| |
@@ -174,7 +174,7 @@
|
| |
|
| |
# The variables
|
| |
variables = {
|
| |
- "ansible_ssh_user": "root",
|
| |
+ "ansible_user": "root",
|
| |
"ansible_ssh_pass": ROOT_PASSWORD,
|
| |
"ansible_ssh_common_args": "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
|
| |
}
|
| |
@@ -186,14 +186,14 @@
|
| |
key, val = ln
|
| |
|
| |
if key == "HostName":
|
| |
- variables["ansible_ssh_host"] = val
|
| |
+ variables["ansible_host"] = val
|
| |
elif key == "Port":
|
| |
- variables["ansible_ssh_port"] = val
|
| |
+ variables["ansible_port"] = val
|
| |
elif key == "IdentityFile":
|
| |
variables["ansible_ssh_private_key_file"] = val
|
| |
|
| |
# verify we have all critical SSH configuration values
|
| |
- for key in ["ansible_ssh_host", "ansible_ssh_port", "ansible_ssh_private_key_file"]:
|
| |
+ for key in ["ansible_host", "ansible_port", "ansible_ssh_private_key_file"]:
|
| |
if key not in variables:
|
| |
raise RuntimeError("failed to retrieve vagrant SSH configuration value {0}\n".format(key))
|
| |
|
| |
@@ -259,8 +259,8 @@
|
| |
sys.stderr.write("\n")
|
| |
sys.stderr.write("DIAGNOSE: ssh -p {0} -o StrictHostKeyChecking=no"
|
| |
" -o UserKnownHostsFile=/dev/null"
|
| |
- "root@{1} # password: {2}\n".format(variables["ansible_ssh_port"],
|
| |
- variables["ansible_ssh_host"],
|
| |
+ "root@{1} # password: {2}\n".format(variables["ansible_port"],
|
| |
+ variables["ansible_host"],
|
| |
ROOT_PASSWORD))
|
| |
sys.stderr.write("DIAGNOSE: kill {0} # when finished\n".format(os.getpid()))
|
| |
|
| |
Signed-off-by: Andrei Stepanov astepano@redhat.com