Merge pull request #6373 from kwoodson/ami_build_container_runtime

Fix ami building.

playbooks/init/main.yml

@@ -18,8 +18,10 @@
 - import_playbook: facts.yml
 
 - import_playbook: sanity_checks.yml
+  when: not (skip_sanity_checks | default(False))
 
 - import_playbook: validate_hostnames.yml
+  when: not (skip_validate_hostnames | default(False))
 
 - import_playbook: repos.yml
 

playbooks/openshift-node/private/image_prep.yml

@@ -1,12 +1,10 @@
 ---
 - name: normalize groups
-  import_playbook: ../../init/evaluate_groups.yml
-
-- name: initialize the facts
-  import_playbook: ../../init/facts.yml
-
-- name: initialize the repositories
-  import_playbook: ../../init/repos.yml
+  import_playbook: ../../prerequisites.yml
+  vars:
+    skip_version: True
+    skip_sanity_checks: True
+    skip_validate_hostnames: True
 
 - name: run node config setup
   import_playbook: setup.yml