summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-08-14 07:46:35 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-08-14 07:46:35 -0400
commit52952a7c0f8f9324704dcc60014dc0bb09fb8a2b (patch)
tree00ec5ef167609e04ecc5a6945ca755f0fe3b7fd6
parent2cbba20205318b3c16b7aa8cd2693e2838c547c1 (diff)
parente59348bc7e8ece270be2fa75954e765c0eb554d7 (diff)
downloadopenshift-52952a7c0f8f9324704dcc60014dc0bb09fb8a2b.tar.gz
openshift-52952a7c0f8f9324704dcc60014dc0bb09fb8a2b.tar.bz2
openshift-52952a7c0f8f9324704dcc60014dc0bb09fb8a2b.tar.xz
openshift-52952a7c0f8f9324704dcc60014dc0bb09fb8a2b.zip
Merge pull request #407 from aveshagarwal/ae-ansible-merge-auth
Enable htpasswd by default in the example hosts file.
-rw-r--r--inventory/byo/hosts.example2
1 files changed, 1 insertions, 1 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example
index dd5c02b77..646790c42 100644
--- a/inventory/byo/hosts.example
+++ b/inventory/byo/hosts.example
@@ -33,7 +33,7 @@ deployment_type=enterprise
#openshift_additional_repos=[{'id': 'openshift-origin-copr', 'name': 'OpenShift Origin COPR', 'baseurl': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/epel-7-$basearch/', 'enabled': 1, 'gpgcheck': 1, gpgkey: 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/pubkey.gpg'}]
# htpasswd auth
-#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/openshift/htpasswd'}]
+openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/openshift/htpasswd'}]
# Allow all auth
#openshift_master_identity_providers=[{'name': 'allow_all', 'login': 'true', 'challenge': 'true', 'kind': 'AllowAllPasswordIdentityProvider'}]