Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

OSBS: the htpasswd file path is now hardcoded in 3.11

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2019-08-07 12:23:03 +02:00 • committed by Pierre-Yves Chibon
parent 81da6f2e69
commit 6b7b8ce28c
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
playbooks/groups/osbs-cluster.yml
View file

@ -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"

2
roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2
View file

@ -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" %}