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/etcd/meta/main.yml | 1 + roles/etcd/tasks/system_container.yml | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'roles/etcd') diff --git a/roles/etcd/meta/main.yml b/roles/etcd/meta/main.yml index 532f9e313..e0c70a181 100644 --- a/roles/etcd/meta/main.yml +++ b/roles/etcd/meta/main.yml @@ -16,6 +16,7 @@ galaxy_info: - cloud - system dependencies: +- role: lib_openshift - role: os_firewall os_firewall_allow: - service: etcd diff --git a/roles/etcd/tasks/system_container.yml b/roles/etcd/tasks/system_container.yml index 3b80164cc..72ffadbd2 100644 --- a/roles/etcd/tasks/system_container.yml +++ b/roles/etcd/tasks/system_container.yml @@ -1,8 +1,4 @@ --- -- name: Load lib_openshift modules - include_role: - name: lib_openshift - - name: Pull etcd system container command: atomic pull --storage=ostree {{ openshift.etcd.etcd_image }} register: pull_result -- cgit v1.2.1