summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-12-19 16:36:47 -0500
committerMichael Gugino <mgugino@redhat.com>2017-12-21 12:28:19 -0500
commite3cf9edff6d0186b09b1a112592f283fab6857d0 (patch)
treedf4d6cc470951890afbea563a12f98fecfe16419 /roles/openshift_node/tasks
parentedde00af6a5b811468fe2a0e9bff45346103be92 (diff)
downloadopenshift-e3cf9edff6d0186b09b1a112592f283fab6857d0.tar.gz
openshift-e3cf9edff6d0186b09b1a112592f283fab6857d0.tar.bz2
openshift-e3cf9edff6d0186b09b1a112592f283fab6857d0.tar.xz
openshift-e3cf9edff6d0186b09b1a112592f283fab6857d0.zip
Remove references to deployment_type
Move openshift_deployment_type check into sanity_check action plugin. Remove compatibility for deployment_type. deployment_type has been deprecated for some time now.
Diffstat (limited to 'roles/openshift_node/tasks')
-rw-r--r--roles/openshift_node/tasks/main.yml2
-rw-r--r--roles/openshift_node/tasks/upgrade.yml1
2 files changed, 1 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 2daa6c75f..eb362816a 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -3,7 +3,7 @@
msg: "SELinux is disabled, This deployment type requires that SELinux is enabled."
when:
- (not ansible_selinux or ansible_selinux.status != 'enabled')
- - deployment_type == 'openshift-enterprise'
+ - openshift_deployment_type == 'openshift-enterprise'
- not openshift_use_crio
- include_tasks: dnsmasq_install.yml
diff --git a/roles/openshift_node/tasks/upgrade.yml b/roles/openshift_node/tasks/upgrade.yml
index f62bde784..02e417937 100644
--- a/roles/openshift_node/tasks/upgrade.yml
+++ b/roles/openshift_node/tasks/upgrade.yml
@@ -5,7 +5,6 @@
# - node_config_hook
# - openshift_pkg_version
# - openshift_is_containerized
-# - deployment_type
# - openshift_release
# tasks file for openshift_node_upgrade