diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-08-26 22:15:02 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2015-11-04 19:57:22 -0500 |
| commit | 6571fd9d220b7cc67ae5738149164104d5662902 (patch) | |
| tree | 140f2c1c1ba5af841088d941f8784f0d9df9162e /roles | |
| parent | a6dd87452379403704fb5cd1d8647ef3cf978e28 (diff) | |
| download | openshift-6571fd9d220b7cc67ae5738149164104d5662902.tar.gz openshift-6571fd9d220b7cc67ae5738149164104d5662902.tar.bz2 openshift-6571fd9d220b7cc67ae5738149164104d5662902.tar.xz openshift-6571fd9d220b7cc67ae5738149164104d5662902.zip | |
Atomic Enterprise/OpenShift Enterprise merge update
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 24ae5183e..41c7ff1de 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -407,7 +407,7 @@ def set_identity_providers_if_unset(facts): name='allow_all', challenge=True, login=True, kind='AllowAllPasswordIdentityProvider' ) - if deployment_type == 'enterprise': + if deployment_type in ['enterprise', 'atomic-enterprise', 'openshift-enterprise']: identity_provider = dict( name='deny_all', challenge=True, login=True, kind='DenyAllPasswordIdentityProvider' diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index fbeba823e..c455a09f1 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -8,7 +8,7 @@ when: osn_cluster_dns_ip is not defined or not osn_cluster_dns_ip - 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'] + when: (not ansible_selinux or ansible_selinux.status != 'enabled') and deployment_type in ['enterprise', 'online', 'atomic-enterprise', 'openshift-enterprise'] - name: Set node facts openshift_facts: |