Merge pull request openshift#9138 from ahardin-rh/json-keys-update

Bug 157608, Removed filename key and value
dougbtv · May 11, 2018 · 4d2c0a8 · 4d2c0a8
2 parents 55497fa + 86f0d74
commit 4d2c0a8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/install_config/configuring_authentication.adoc b/install_config/configuring_authentication.adoc
@@ -89,7 +89,7 @@ xref:../install_config/install/advanced_install.adoc#advanced-install-session-op
 
 ----
 # htpasswd auth
-openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}]
+openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider'}]
 # Defining htpasswd users
 #openshift_master_htpasswd_users={'user1': '<pre-hashed password>', 'user2': '<pre-hashed password>'
 # or
@@ -1640,9 +1640,9 @@ Connect identity provider for {product-title}.
 endif::[]
 
 ifdef::openshift-enterprise[]
-You can 
+You can
 link:https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html/red_hat_single_sign-on_for_openshift/tutorials[configure Red Hat Single Sign-On]
-as an OpenID Connect identity provider for {product-title}. 
+as an OpenID Connect identity provider for {product-title}.
 endif::[]
 
 [NOTE]

diff --git a/install_config/install/advanced_install.adoc b/install_config/install/advanced_install.adoc
@@ -163,8 +163,7 @@ section. For example:
 
 openshift_master_identity_providers=[{'name': 'htpasswd_auth',
 'login': 'true', 'challenge': 'true',
-'kind': 'HTPasswdPasswordIdentityProvider',
-'filename': '/etc/origin/master/htpasswd'}]
+'kind': 'HTPasswdPasswordIdentityProvider',}]
 
 openshift_master_default_subdomain=apps.test.example.com
 ----
@@ -1937,7 +1936,7 @@ openshift_deployment_type=origin
 endif::[]
 
 # uncomment the following to enable htpasswd authentication; defaults to DenyAllPasswordIdentityProvider
-#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}]
+#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider'}]
 
 # host group for masters
 [masters]
@@ -2029,7 +2028,7 @@ openshift_deployment_type=origin
 endif::[]
 
 # uncomment the following to enable htpasswd authentication; defaults to DenyAllPasswordIdentityProvider
-#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}]
+#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider'}]
 
 # host group for masters
 [masters]
@@ -2192,7 +2191,7 @@ endif::[]
 
 # Uncomment the following to enable htpasswd authentication; defaults to
 # DenyAllPasswordIdentityProvider.
-#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}]
+#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider'}]
 
 # Native high availbility cluster method with optional load balancer.
 # If no lb group is defined installer assumes that a load balancer has
@@ -2304,7 +2303,7 @@ endif::[]
 
 # Uncomment the following to enable htpasswd authentication; defaults to
 # DenyAllPasswordIdentityProvider.
-#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}]
+#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider'}]
 
 # Native high availability cluster method with optional load balancer.
 # If no lb group is defined installer assumes that a load balancer has

diff --git a/install_config/install/stand_alone_registry.adoc b/install_config/install/stand_alone_registry.adoc
@@ -231,7 +231,7 @@ deployment_subtype=registry <1>
 openshift_hosted_infra_selector="" <2>
 
 # uncomment the following to enable htpasswd authentication; defaults to DenyAllPasswordIdentityProvider
-#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}]
+#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider'}]
 
 # host group for masters
 [masters]
@@ -270,7 +270,7 @@ openshift_master_default_subdomain=apps.test.example.com
 
 # Uncomment the following to enable htpasswd authentication; defaults to
 # DenyAllPasswordIdentityProvider.
-#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}]
+#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider'}]
 
 # Native high availability cluster method with optional load balancer.
 # If no lb group is defined installer assumes that a load balancer has

diff --git a/install_config/master_node_configuration.adoc b/install_config/master_node_configuration.adoc
@@ -134,7 +134,7 @@ ec2-52-95-5-36.compute-1.amazonaws.com  openshift_ip=172.17.3.89 openshift_publi
 +
 ----
 # htpasswd auth
-openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}]
+openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider'}]
 # Defining htpasswd users
 openshift_master_htpasswd_users={'<name>': '<hashed-password>', '<name>': '<hashed-password>'}
 # or
@@ -149,7 +149,7 @@ The following example changes the authentication method from the default `deny a
 +
 ----
 # htpasswd auth
-openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}]
+openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider'}]
 # Defining htpasswd users
 openshift_master_htpasswd_users={'jsmith': '$apr1$wIwXkFLI$bAygtKGmPOqaJftB', 'bloblaw': '7IRJ$2ODmeLoxf4I6sUEKfiA$2aDJqLJe'}
 # or