WarlockFish/fedora-infra_ansible
1
0
Fork 0
mirror of https://pagure.io/fedora-infra/ansible.git synced 2026-05-03 08:00:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

OSBS: define openshift_node_group_name for the nodes

Browse Source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna
2019-08-07 12:57:57 +02:00
committed by Pierre-Yves Chibon
parent 6b7b8ce28c
commit 20e10de22b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
View File

@@ -188,7 +188,7 @@ openshift_crio_systemcontainer_image_override="registry.access.redhat.com/opensh
# OSBS Specific Auth
{% 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" %}
@@ -851,10 +851,10 @@ openshift_node_env_vars={"ENABLE_HTTP2": "true"}
{{ host }} openshift_node_labels="{'region':'infra'}"
{% endfor %}
{% for host in groups[openshift_cluster_masters_group] %}
{{ host }}
{{ host }} openshift_node_group_name='node-config-master'
{% endfor %}
{% for host in groups[openshift_cluster_nodes_group] %}
{{ host }} openshift_node_labels="{'region': 'primary', 'zone': 'default', 'node-role.kubernetes.io/compute': 'true'}"
{{ host }} openshift_node_labels="{'region': 'primary', 'zone': 'default', 'node-role.kubernetes.io/compute': 'true'}" openshift_node_group_name='node-config-compute'
{% endfor %}
{% endif %}