summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-28 00:58:52 -0500
committerGitHub <noreply@github.com>2017-03-28 00:58:52 -0500
commitf324d6d1040b6af82113a1e975903ae8fd64fef8 (patch)
tree9b246b6ba585cc7eba588d3039afd435b890e4a4 /roles/openshift_master
parentd12c4dfc223b9e165def963144c80051aba504cc (diff)
parent2c7a6849096a2e1e5b8799cdc07753ab3852c561 (diff)
downloadopenshift-f324d6d1040b6af82113a1e975903ae8fd64fef8.tar.gz
openshift-f324d6d1040b6af82113a1e975903ae8fd64fef8.tar.bz2
openshift-f324d6d1040b6af82113a1e975903ae8fd64fef8.tar.xz
openshift-f324d6d1040b6af82113a1e975903ae8fd64fef8.zip
Merge pull request #3752 from mtnbikenc/openshift_node_update
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/meta/main.yml1
-rw-r--r--roles/openshift_master/tasks/system_container.yml4
2 files changed, 1 insertions, 4 deletions
diff --git a/roles/openshift_master/meta/main.yml b/roles/openshift_master/meta/main.yml
index 18e1b3a54..907f25bc5 100644
--- a/roles/openshift_master/meta/main.yml
+++ b/roles/openshift_master/meta/main.yml
@@ -12,6 +12,7 @@ galaxy_info:
categories:
- cloud
dependencies:
+- role: lib_openshift
- role: openshift_master_facts
- role: openshift_hosted_facts
- role: openshift_master_certificates
diff --git a/roles/openshift_master/tasks/system_container.yml b/roles/openshift_master/tasks/system_container.yml
index 1b3e0dba1..8f77d40ce 100644
--- a/roles/openshift_master/tasks/system_container.yml
+++ b/roles/openshift_master/tasks/system_container.yml
@@ -1,8 +1,4 @@
---
-- name: Load lib_openshift modules
- include_role:
- name: lib_openshift
-
- name: Pre-pull master system container image
command: >
atomic pull --storage=ostree {{ openshift.common.system_images_registry }}/{{ openshift.master.master_system_image }}:{{ openshift_image_tag }}