Merge pull request #1830 from sriramandev/topic/ssriraman/1826

Make sure all references to builder user is deleted - OVA

Author: k8s-ci-robot

images/capi/packer/ova/packer-node.json

@@ -16,7 +16,7 @@
       "remote_password": "{{user `remote_password`}}",
       "remote_type": "{{user `remote_type`}}",
       "remote_username": "{{user `remote_username`}}",
-      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'userdel -f -r {{user `ssh_username`}} && rm -f /etc/sudoers.d/{{user `ssh_username` }} && {{user `shutdown_command`}}'",
+      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'userdel -f -r {{user `ssh_username`}} && rm -f /etc/sudoers.d/{{user `ssh_username` }} && rm -f /etc/sudoers.d/90-cloud-init-users && {{user `shutdown_command`}}'",
       "skip_compaction": "{{user `skip_compaction`}}",
       "source_path": "{{ user `source_path`}}",
       "ssh_password": "{{user `ssh_password`}}",
@@ -114,7 +114,7 @@
       "remote_password": "{{user `remote_password`}}",
       "remote_type": "{{user `remote_type`}}",
       "remote_username": "{{user `remote_username`}}",
-      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'userdel -f -r {{user `ssh_username`}} && rm -f /etc/sudoers.d/{{user `ssh_username` }} && {{user `shutdown_command`}}'",
+      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'userdel -f -r {{user `ssh_username`}} && rm -f /etc/sudoers.d/{{user `ssh_username` }} && rm -f /etc/sudoers.d/90-cloud-init-users && {{user `shutdown_command`}}'",
       "skip_compaction": "{{user `skip_compaction`}}",
       "ssh_password": "{{user `ssh_password`}}",
       "ssh_timeout": "4h",
@@ -244,7 +244,7 @@
       "remote_cache_cleanup": "true",
       "remove_cdrom": "true",
       "resource_pool": "{{user `resource_pool`}}",
-      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'userdel -f -r {{user `ssh_username`}} && rm -f /etc/sudoers.d/{{user `ssh_username` }} && {{user `shutdown_command`}}'",
+      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'userdel -f -r {{user `ssh_username`}} && rm -f /etc/sudoers.d/{{user `ssh_username` }} && rm -f /etc/sudoers.d/90-cloud-init-users && {{user `shutdown_command`}}'",
       "ssh_password": "{{user `ssh_password`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "ssh_proxy_port": "{{user `ssh_proxy_port`}}",
@@ -287,7 +287,7 @@
       "network": "{{user `network`}}",
       "password": "{{user `password`}}",
       "resource_pool": "{{user `resource_pool`}}",
-      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'userdel -f -r {{user `ssh_username`}} && rm -f /etc/sudoers.d/{{user `ssh_username` }} && {{user `shutdown_command`}}'",
+      "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'userdel -f -r {{user `ssh_username`}} && rm -f /etc/sudoers.d/{{user `ssh_username` }} && rm -f /etc/sudoers.d/90-cloud-init-users && {{user `shutdown_command`}}'",
       "ssh_password": "{{user `ssh_password`}}",
       "ssh_timeout": "4h",
       "ssh_username": "{{user `ssh_username`}}",