From 6b7b8ce28c6d77b203f03a605227623061a9f7b1 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Wed, 7 Aug 2019 12:23:03 +0200 Subject: [PATCH] OSBS: the htpasswd file path is now hardcoded in 3.11 Signed-off-by: Clement Verna --- playbooks/groups/osbs-cluster.yml | 1 - .../templates/cluster-inventory-stg.j2 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index 92d5c48ede..6ee988dd9b 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -206,7 +206,6 @@ roles: - role: ansible-ansible-openshift-ansible cluster_inventory_filename: "{{ inventory_filename }}" - openshift_htpasswd_file: "/etc/origin/master/htpasswd" openshift_master_public_api_url: "https://{{ osbs_url }}:8443" openshift_release: "v3.11" openshift_ansible_path: "/root/openshift-ansible" diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 index 3ae3b934b9..fad2c687a3 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 @@ -235,7 +235,7 @@ oreg_auth_credentials_replace=True {% if openshift_auth_profile == "osbs" %} openshift_master_manage_htpasswd=false -openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '{{ openshift_htpasswd_file }}'}] +openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider'}] {% endif %} {% if openshift_auth_profile == "fedoraidp" %}