diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-20 13:45:52 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-20 13:45:52 -0700 |
commit | 457e0f80784820b9ff0fb6a7407c271731f5b1d9 (patch) | |
tree | 0f6bab549ae71ae7dd073381e3f7ff8545d3c8a5 /roles/openshift_node/tasks | |
parent | 4f5839e585a78243eae2d215176047299c52a1eb (diff) | |
parent | 4b8f66c37b865c7be59310854f5f9bd3de3e01bb (diff) | |
download | openshift-457e0f80784820b9ff0fb6a7407c271731f5b1d9.tar.gz openshift-457e0f80784820b9ff0fb6a7407c271731f5b1d9.tar.bz2 openshift-457e0f80784820b9ff0fb6a7407c271731f5b1d9.tar.xz openshift-457e0f80784820b9ff0fb6a7407c271731f5b1d9.zip |
Merge pull request #5378 from mgugino-upstream-stage/cleanup-deployment-types
Automatic merge from submit-queue
Cleanup old deployment types
Previously, openshift-ansible supported various
types of deployments using the variable "openshift_deployment_type"
Currently, openshift-ansible only supports two deployment types,
"origin" and "openshift-enterprise".
This commit removes all logic and references to deprecated
deployment types.
Diffstat (limited to 'roles/openshift_node/tasks')
-rw-r--r-- | roles/openshift_node/tasks/main.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index ef79b6ac0..e82fb42b8 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -2,7 +2,8 @@ - fail: msg: "SELinux is disabled, This deployment type requires that SELinux is enabled." when: - - (not ansible_selinux or ansible_selinux.status != 'enabled') and deployment_type in ['enterprise', 'online', 'atomic-enterprise', 'openshift-enterprise'] + - (not ansible_selinux or ansible_selinux.status != 'enabled') + - deployment_type == 'openshift-enterprise' - not openshift_use_crio | default(false) - name: setup firewall |