summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/meta
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-16 17:23:29 -0800
committerGitHub <noreply@github.com>2017-11-16 17:23:29 -0800
commitf725e46bd897efe35cb8abba7862d1482c3011f4 (patch)
tree7b5d834800b770d870d77079ee5c1885ea62b339 /roles/openshift_node/meta
parentbd289432c9b6e8b0b0a63f1f8b742e023e4b2fb8 (diff)
parentafa4fd5799b0ff43d625d061e4c2bde66b5fb86a (diff)
downloadopenshift-f725e46bd897efe35cb8abba7862d1482c3011f4.tar.gz
openshift-f725e46bd897efe35cb8abba7862d1482c3011f4.tar.bz2
openshift-f725e46bd897efe35cb8abba7862d1482c3011f4.tar.xz
openshift-f725e46bd897efe35cb8abba7862d1482c3011f4.zip
Merge pull request #6082 from mgugino-upstream-stage/combine-node-upgrade
Automatic merge from submit-queue. Combine openshift_node and openshift_node_upgrade Currently, having openshift_node and openshift_node_upgrade as two distinct roles has created a duplication across handlers, templates, and some tasks. This commit combines the roles to reduce duplication and bugs encountered by not putting code in both places.
Diffstat (limited to 'roles/openshift_node/meta')
-rw-r--r--roles/openshift_node/meta/main.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_node/meta/main.yml b/roles/openshift_node/meta/main.yml
index 5bc7b9869..c32aa1600 100644
--- a/roles/openshift_node/meta/main.yml
+++ b/roles/openshift_node/meta/main.yml
@@ -13,9 +13,15 @@ galaxy_info:
- cloud
dependencies:
- role: openshift_node_facts
+ when: not (openshift_node_upgrade_in_progress | default(False))
- role: lib_openshift
- role: lib_os_firewall
+ when: not (openshift_node_upgrade_in_progress | default(False))
- role: openshift_clock
+ when: not (openshift_node_upgrade_in_progress | default(False))
- 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)