summaryrefslogtreecommitdiffstats
path: root/roles/flannel
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-21 14:24:43 -0700
committerGitHub <noreply@github.com>2017-09-21 14:24:43 -0700
commitee8252d536c4204b9e0c4a88d0899297caf39423 (patch)
tree9c92bb13a285058e5b20bc76f33cb5d58c91ba9d /roles/flannel
parent505764651b3f8279ffe8881e9b26851d1dd14258 (diff)
parent99745a04223f2ed8111b5eb4b49d2bcfec9e678f (diff)
downloadopenshift-ee8252d536c4204b9e0c4a88d0899297caf39423.tar.gz
openshift-ee8252d536c4204b9e0c4a88d0899297caf39423.tar.bz2
openshift-ee8252d536c4204b9e0c4a88d0899297caf39423.tar.xz
openshift-ee8252d536c4204b9e0c4a88d0899297caf39423.zip
Merge pull request #5371 from ingvagabund/consolidate-etcd-certs-roles
Automatic merge from submit-queue consolidate etcd certs roles This is a starter for consolidation of all etcd like roles into a single `etcd` action-based role. I have intentionally started with the simplest one to demonstrate the steps needed to make it so and to make the review easy enough for everyone.
Diffstat (limited to 'roles/flannel')
-rw-r--r--roles/flannel/README.md2
-rw-r--r--roles/flannel/meta/main.yml5
2 files changed, 1 insertions, 6 deletions
diff --git a/roles/flannel/README.md b/roles/flannel/README.md
index 0c7347603..b9e15e6e0 100644
--- a/roles/flannel/README.md
+++ b/roles/flannel/README.md
@@ -27,8 +27,6 @@ Role Variables
Dependencies
------------
-openshift_facts
-
Example Playbook
----------------
diff --git a/roles/flannel/meta/main.yml b/roles/flannel/meta/main.yml
index 35f825586..51128dba6 100644
--- a/roles/flannel/meta/main.yml
+++ b/roles/flannel/meta/main.yml
@@ -12,7 +12,4 @@ galaxy_info:
categories:
- cloud
- system
-dependencies:
-- role: openshift_facts
-- role: openshift_etcd_client_certificates
- etcd_cert_prefix: flannel.etcd-
+dependencies: []