diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-12-21 15:53:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-21 15:53:30 -0500 |
| commit | fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4 (patch) | |
| tree | 54d9187a470cd044be9406e97d47ca5989411570 /roles/openshift_node | |
| parent | 0300b611877689e9f14ad5714b1e4e2c7224ca1e (diff) | |
| parent | e3cf9edff6d0186b09b1a112592f283fab6857d0 (diff) | |
| download | openshift-fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4.tar.gz openshift-fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4.tar.bz2 openshift-fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4.tar.xz openshift-fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4.zip | |
Merge pull request #6530 from mgugino-upstream-stage/init-task-trim
Move sanity_checks into custom action plugin
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/upgrade.yml | 1 |
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 |