summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/meta
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-11-27 12:22:02 -0500
committerMichael Gugino <mgugino@redhat.com>2017-11-27 14:08:58 -0500
commit73bf3e7137d80ba5b225108f39240c43d385a1ea (patch)
tree79c46afb0932d1c3fa56c476aa8f586aaf15db8e /roles/openshift_node/meta
parente7e699a4201754fe9ccd1b9adffad5be5fff18b3 (diff)
downloadopenshift-73bf3e7137d80ba5b225108f39240c43d385a1ea.tar.gz
openshift-73bf3e7137d80ba5b225108f39240c43d385a1ea.tar.bz2
openshift-73bf3e7137d80ba5b225108f39240c43d385a1ea.tar.xz
openshift-73bf3e7137d80ba5b225108f39240c43d385a1ea.zip
Combine openshift_node and openshift_node_dnsmasq
This commit combines these two roles. This will prevent openshift_node_facts from running twice.
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)