summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--ansible-provisioner.json10
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index b30a5d4..e544067 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ ifndef ANSIBLE_PROV_EXTRA_ARGS
ANSIBLE_PROV_EXTRA_ARGS :=
endif
-override ANSIBLE_PROV_EXTRA_ARGS += --scp-extra-args,"-O"
+#override ANSIBLE_PROV_EXTRA_ARGS += --scp-extra-args,"-O"
override PACKER_OPTS += -var-file=base.json
ifdef DEBUG
diff --git a/ansible-provisioner.json b/ansible-provisioner.json
index d63bf26..6ecd5e1 100644
--- a/ansible-provisioner.json
+++ b/ansible-provisioner.json
@@ -46,11 +46,11 @@
"provisioners": [{
"type": "ansible",
"playbook_file": "{{ user `playbook` }}",
- "extra_arguments": "{{ user `extra_ansible_args` }}",
+ "extra_arguments": [
+ "--ssh-extra-args", "-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa",
+ "--scp-extra-args", "\"-O\""
+ ],
"sftp_command": "/usr/libexec/openssh/sftp-server",
- "use_sftp": false,
- "ansible_ssh_extra_args": [
- "-oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedKeyTypes=+ssh-rsa"
- ]
+ "use_sftp": false
}]
}