diff options
| author | Michael Janczyk | 2023-06-15 18:27:38 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2023-06-15 18:27:38 +0200 |
| commit | ca64512d07485c11615fa8b781c1125776d488c3 (patch) | |
| tree | 41c4ba27466d33a0b400d618fc6f86a31d2f1093 | |
| parent | http: rocky: anaconda-ks: remove unused packages. (diff) | |
| download | packer-templates-ca64512d07485c11615fa8b781c1125776d488c3.tar.gz packer-templates-ca64512d07485c11615fa8b781c1125776d488c3.tar.xz packer-templates-ca64512d07485c11615fa8b781c1125776d488c3.zip | |
Makefile: remove scp extra args.
ansible-provisioner: change ssh extra args and add scp extra args.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ansible-provisioner.json | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -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 }] } |