From 2c7a6849096a2e1e5b8799cdc07753ab3852c561 Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Thu, 23 Mar 2017 10:49:57 -0400 Subject: Use meta/main.yml for role dependencies --- roles/openshift_master/meta/main.yml | 1 + roles/openshift_master/tasks/system_container.yml | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'roles/openshift_master') 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 }} -- cgit v1.2.3