summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-12-06 21:50:32 -0500
committerGitHub <noreply@github.com>2017-12-06 21:50:32 -0500
commit2124109d3c35ac120bd41ece981eb8ca3101f00e (patch)
tree1eee7beda7df99ebd239cc30d943b2170ddf33e3 /playbooks
parent192a8c1386ada33cb797d1e7a56c38bf2d21e338 (diff)
parentde756349f48b8a7aa764387ea255dd711e4a8e95 (diff)
downloadopenshift-2124109d3c35ac120bd41ece981eb8ca3101f00e.tar.gz
openshift-2124109d3c35ac120bd41ece981eb8ca3101f00e.tar.bz2
openshift-2124109d3c35ac120bd41ece981eb8ca3101f00e.tar.xz
openshift-2124109d3c35ac120bd41ece981eb8ca3101f00e.zip
Merge pull request #6373 from kwoodson/ami_build_container_runtime
Fix ami building.
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/init/main.yml2
-rw-r--r--playbooks/openshift-node/private/image_prep.yml12
2 files changed, 7 insertions, 7 deletions
diff --git a/playbooks/init/main.yml b/playbooks/init/main.yml
index 5a7483b72..b2b972a7d 100644
--- a/playbooks/init/main.yml
+++ b/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
diff --git a/playbooks/openshift-node/private/image_prep.yml b/playbooks/openshift-node/private/image_prep.yml
index b7ac27bda..6b517197d 100644
--- a/playbooks/openshift-node/private/image_prep.yml
+++ b/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