summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/meta
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2017-11-28 10:34:12 -0500
committerGitHub <noreply@github.com>2017-11-28 10:34:12 -0500
commitb9ab765528ff2e7f9aa46b6942d74027ef9b6799 (patch)
tree446766a541618590b79ff263e5edc5de580ec25a /roles/openshift_node/meta
parentc7645af60a5411af83b04fb6a5617887d3b39183 (diff)
parent73bf3e7137d80ba5b225108f39240c43d385a1ea (diff)
downloadopenshift-b9ab765528ff2e7f9aa46b6942d74027ef9b6799.tar.gz
openshift-b9ab765528ff2e7f9aa46b6942d74027ef9b6799.tar.bz2
openshift-b9ab765528ff2e7f9aa46b6942d74027ef9b6799.tar.xz
openshift-b9ab765528ff2e7f9aa46b6942d74027ef9b6799.zip
Merge pull request #6268 from mgugino-upstream-stage/combine-dnsmasq-with-node
Combine openshift_node and openshift_node_dnsmasq
Diffstat (limited to 'roles/openshift_node/meta')
-rw-r--r--roles/openshift_node/meta/main.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/roles/openshift_node/meta/main.yml b/roles/openshift_node/meta/main.yml
index c32aa1600..373e0e1bd 100644
--- a/roles/openshift_node/meta/main.yml
+++ b/roles/openshift_node/meta/main.yml
@@ -22,6 +22,5 @@ dependencies:
- role: openshift_docker
- role: openshift_cloud_provider
when: not (openshift_node_upgrade_in_progress | default(False))
-- role: openshift_node_dnsmasq
- role: lib_utils
when: openshift_node_upgrade_in_progress | default(False)