summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-23 21:22:46 -0800
committerGitHub <noreply@github.com>2018-01-23 21:22:46 -0800
commitdd5c2a24872490f34be8516e4f03a4076be35789 (patch)
tree5adc389da9e7dfd42bf3027d6fa74e651c9a1311
parent5e2eca7d0788b06d3fbbde682fbefbec5bba801a (diff)
parent81d383a935ad81c78000bb69c97c35768a9dd876 (diff)
downloadopenshift-dd5c2a24872490f34be8516e4f03a4076be35789.tar.gz
openshift-dd5c2a24872490f34be8516e4f03a4076be35789.tar.bz2
openshift-dd5c2a24872490f34be8516e4f03a4076be35789.tar.xz
openshift-dd5c2a24872490f34be8516e4f03a4076be35789.zip
Merge pull request #6835 from mtnbikenc/fix-1537105
Automatic merge from submit-queue. [1537105] Add openshift_facts to flannel role Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537105
-rw-r--r--roles/flannel/meta/main.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/flannel/meta/main.yml b/roles/flannel/meta/main.yml
index 7634b8192..38d2f748b 100644
--- a/roles/flannel/meta/main.yml
+++ b/roles/flannel/meta/main.yml
@@ -14,3 +14,4 @@ galaxy_info:
- system
dependencies:
- role: lib_utils
+- role: openshift_facts