Merge "Fix cloud-init detection rules"

common/deploy-steps-tasks-step-0.j2.yaml

@@ -12,6 +12,11 @@
   failed_when: false
   become: true
   register: cloud_init_enabled
+- name: Check if cloud-init is disabled via kernel args
+  shell: cat /proc/cmdline | grep -q cloud-init=disabled
+  failed_when: false
+  check_mode: false
+  register: cloud_init_vendor_disabled
 - name: Wait for cloud-init to finish, if enabled
   community.general.cloud_init_data_facts:
     filter: status
@@ -24,6 +29,7 @@
   when:
     - cloud_init_enabled.rc is defined
     - cloud_init_enabled.rc == 0
+    - cloud_init_vendor_disabled.rc is not defined or cloud_init_vendor_disabled.rc != 0
 - name: Create /var/lib/container-puppet
   become: true
   no_log: True