summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-12-07 12:19:40 -0500
committerGitHub <noreply@github.com>2017-12-07 12:19:40 -0500
commit33b127157d3339caa690e6b238a81f7fe83f1383 (patch)
treee307026abdee8e76c1b7df0edbc62a0e43049731 /roles/openshift_master
parent54175f4b668cc1e6108b7d0af13275fcda9f586f (diff)
parent2249ba3d08d1e6c55bf008609c9e4eace16bd917 (diff)
downloadopenshift-33b127157d3339caa690e6b238a81f7fe83f1383.tar.gz
openshift-33b127157d3339caa690e6b238a81f7fe83f1383.tar.bz2
openshift-33b127157d3339caa690e6b238a81f7fe83f1383.tar.xz
openshift-33b127157d3339caa690e6b238a81f7fe83f1383.zip
Merge pull request #6362 from mgugino-upstream-stage/crt-plays
Implement container_runtime playbooks and changes
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/tasks/system_container.yml4
1 files changed, 0 insertions, 4 deletions
diff --git a/roles/openshift_master/tasks/system_container.yml b/roles/openshift_master/tasks/system_container.yml
index 23386f11b..450f6d803 100644
--- a/roles/openshift_master/tasks/system_container.yml
+++ b/roles/openshift_master/tasks/system_container.yml
@@ -1,8 +1,4 @@
---
-- name: Ensure proxies are in the atomic.conf
- include_role:
- name: openshift_atomic
- tasks_from: proxy
- name: Pre-pull master system container image
command: >