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

Add pdc and flatpak settings to osbs-client role

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2018-05-23 18:46:25 +02:00
parent 050b670fb1
commit 19d10df6a0
2 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
roles/osbs-client/defaults/main.yml
View file

@ -43,3 +43,6 @@ default:
builder_odcs_url: "" builder_odcs_url: ""
builder_odcs_insecure: false builder_odcs_insecure: false
builder_odcs_openidc_secret: "" builder_odcs_openidc_secret: ""
builder_pdc_url: ""
builder_pdc_insecure: false
flatpak_base_image: ""

30
roles/osbs-client/templates/osbs.conf.j2
View file

@ -41,8 +41,9 @@ kerberos_principal = {{ default.kerberos_principal }}
token_file = {{ default.token_file }} token_file = {{ default.token_file }}
{% endif %} {% endif %}
# Orchestrator/Worker Architecture split additions
{% if default.can_orchestrate is defined %} {% if default.can_orchestrate is defined %}
# Orchestrator/Worker Architecture split additions
can_orchestrate = {{ default.can_orchestrate }} can_orchestrate = {{ default.can_orchestrate }}
{% endif %} {% endif %}
{% if default.namespace is defined %} {% if default.namespace is defined %}
@ -84,6 +85,15 @@ odcs_insecure = {{ default.builder_odcs_insecure }}
odcs_openidc_secret = {{ default.builder_odcs_openidc_secret }} odcs_openidc_secret = {{ default.builder_odcs_openidc_secret }}
{% endif %} {% endif %}
{% if default.builder_pdc_url %}
pdc_url = {{ default.builder_pdc_url }}
pdc_insecure = {{ default.builder_pdc_insecure }}
{% endif %}
{% if default.flatpak_base_image %}
flatpak_base_image = {{ default.flatpak_base_image }}
{% endif %}
[scratch] [scratch]
scratch = true scratch = true
{% if default.username is defined %} {% if default.username is defined %}
@ -117,8 +127,9 @@ kerberos_principal = {{ default.kerberos_principal }}
token_file = {{ default.token_file }} token_file = {{ default.token_file }}
{% endif %} {% endif %}
# Orchestrator/Worker Architecture split additions
{% if default.can_orchestrate is defined %} {% if default.can_orchestrate is defined %}
# Orchestrator/Worker Architecture split additions
can_orchestrate = {{ default.can_orchestrate }} can_orchestrate = {{ default.can_orchestrate }}
{% endif %} {% endif %}
{% if default.namespace is defined %} {% if default.namespace is defined %}
@ -154,3 +165,18 @@ registry_secret = {{ default.registry_secret_name }}
{% endif %} {% endif %}
builder_openshift_url = {{ default.builder_openshift_url }} builder_openshift_url = {{ default.builder_openshift_url }}
unique_tag_only = true unique_tag_only = true
{% if default.builder_odcs_url %}
odcs_url = {{ default.builder_odcs_url }}
odcs_insecure = {{ default.builder_odcs_insecure }}
odcs_openidc_secret = {{ default.builder_odcs_openidc_secret }}
{% endif %}
{% if default.builder_pdc_url %}
pdc_url = {{ default.builder_pdc_url }}
pdc_insecure = {{ default.builder_pdc_insecure }}
{% endif %}
{% if default.flatpak_base_image %}
flatpak_base_image = {{ default.flatpak_base_image }}
{% endif %}