Merge pull request #584 from codenrhoden/ansible-cfg

Clean up and *use* the ansible.cfg file
kubernetes-sigs · Apr 12, 2021 · 3e271f5 · 3e271f5
2 parents 7496c9f + 96f269d
commit 3e271f5
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 33 deletions.
diff --git a/images/capi/.dockerignore b/images/capi/.dockerignore
@@ -3,6 +3,7 @@
 
 # Exceptions
 !ansible
+!ansible.cfg
 !cloudinit
 !hack
 !packer

diff --git a/images/capi/Dockerfile b/images/capi/Dockerfile
@@ -28,6 +28,7 @@ USER imagebuilder
 WORKDIR /home/imagebuilder/
 
 COPY --chown=imagebuilder:imagebuilder ansible ansible/
+COPY --chown=imagebuilder:imagebuilder ansible.cfg ansible.cfg
 COPY --chown=imagebuilder:imagebuilder cloudinit cloudinit/
 COPY --chown=imagebuilder:imagebuilder hack hack/
 COPY --chown=imagebuilder:imagebuilder packer packer/

diff --git a/images/capi/ansible/ansible.cfg → images/capi/ansible.cfg b/images/capi/ansible/ansible.cfg → images/capi/ansible.cfg
@@ -12,10 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-[default]
-remote_tmp = /tmp/.ansible/
-filter_plugins = ./filter_plugins
-retry_files_enabled = False
+[defaults]
+remote_tmp = /tmp/.ansible
 
 [ssh_connection]
-pipelining = True
+pipelining = False
diff --git a/images/capi/ansible/playbook.retry b/images/capi/ansible/playbook.retry
diff --git a/images/capi/packer/ami/packer-windows.json b/images/capi/packer/ami/packer-windows.json
@@ -75,9 +75,6 @@
   ],
   "provisioners": [
     {
-      "ansible_env_vars": [
-        "ANSIBLE_REMOTE_TEMP='/tmp/.ansible/'"
-      ],
       "extra_arguments": [
         "-e",
         "ansible_winrm_server_cert_validation=ignore",

diff --git a/images/capi/packer/ami/packer.json b/images/capi/packer/ami/packer.json
@@ -91,8 +91,7 @@
     },
     {
       "ansible_env_vars": [
-        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'",
-        "ANSIBLE_REMOTE_TEMP='/tmp/.ansible/'"
+        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'"
       ],
       "extra_arguments": [
         "--extra-vars",

diff --git a/images/capi/packer/azure/packer-windows.json b/images/capi/packer/azure/packer-windows.json
@@ -98,9 +98,6 @@
       "type": "powershell"
     },
     {
-      "ansible_env_vars": [
-        "ANSIBLE_REMOTE_TEMP='/tmp/.ansible/'"
-      ],
       "extra_arguments": [
         "-e",
         "ansible_winrm_server_cert_validation=ignore ansible_winrm_operation_timeout_sec=120 ansible_winrm_read_timeout_sec=150",

diff --git a/images/capi/packer/azure/packer.json b/images/capi/packer/azure/packer.json
@@ -100,8 +100,7 @@
     },
     {
       "ansible_env_vars": [
-        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'",
-        "ANSIBLE_REMOTE_TEMP='/tmp/.ansible/'"
+        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'"
       ],
       "extra_arguments": [
         "--extra-vars",

diff --git a/images/capi/packer/digitalocean/packer.json b/images/capi/packer/digitalocean/packer.json
@@ -31,8 +31,7 @@
     },
     {
       "ansible_env_vars": [
-        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'",
-        "ANSIBLE_REMOTE_TEMP='/tmp/.ansible/'"
+        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'"
       ],
       "extra_arguments": [
         "--extra-vars",

diff --git a/images/capi/packer/gce/packer.json b/images/capi/packer/gce/packer.json
@@ -33,8 +33,7 @@
     },
     {
       "ansible_env_vars": [
-        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'",
-        "ANSIBLE_REMOTE_TEMP='/tmp/.ansible/'"
+        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'"
       ],
       "extra_arguments": [
         "--extra-vars",

diff --git a/images/capi/packer/ova/packer-haproxy.json b/images/capi/packer/ova/packer-haproxy.json
@@ -143,8 +143,7 @@
   "provisioners": [
     {
       "ansible_env_vars": [
-        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'",
-        "ANSIBLE_REMOTE_TEMP='/tmp/.ansible/'"
+        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'"
       ],
       "extra_arguments": [
         "--extra-vars",

diff --git a/images/capi/packer/ova/packer-node.json b/images/capi/packer/ova/packer-node.json
@@ -332,8 +332,7 @@
   "provisioners": [
     {
       "ansible_env_vars": [
-        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'",
-        "ANSIBLE_REMOTE_TEMP='/tmp/.ansible/'"
+        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'"
       ],
       "except": [
         "vmware-iso-base",
@@ -362,8 +361,7 @@
     },
     {
       "ansible_env_vars": [
-        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'",
-        "ANSIBLE_REMOTE_TEMP='/tmp/.ansible/'"
+        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'"
       ],
       "except": [
         "vmware-iso-base",

diff --git a/images/capi/packer/ova/packer-windows.json b/images/capi/packer/ova/packer-windows.json
@@ -157,9 +157,6 @@
   ],
   "provisioners": [
     {
-      "ansible_env_vars": [
-        "ANSIBLE_REMOTE_TEMP='/tmp/.ansible/'"
-      ],
       "extra_arguments": [
         "-e",
         "ansible_winrm_server_cert_validation=ignore",

diff --git a/images/capi/packer/qemu/packer.json b/images/capi/packer/qemu/packer.json
@@ -78,8 +78,7 @@
     },
     {
       "ansible_env_vars": [
-        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'",
-        "ANSIBLE_REMOTE_TEMP='/tmp/.ansible/'"
+        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'"
       ],
       "extra_arguments": [
         "--extra-vars",

diff --git a/images/capi/packer/raw/packer.json b/images/capi/packer/raw/packer.json
@@ -83,8 +83,7 @@
     },
     {
       "ansible_env_vars": [
-        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'",
-        "ANSIBLE_REMOTE_TEMP='/tmp/.ansible/'"
+        "ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'"
       ],
       "extra_arguments": [
         "--extra-vars",