From 19d10df6a0408e2c052a72d644924df3287b0d06 Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Wed, 23 May 2018 18:46:25 +0200
Subject: [PATCH] Add pdc and flatpak settings to osbs-client role

Signed-off-by: Clement Verna <cverna@tutanota.com>
---
 roles/osbs-client/defaults/main.yml      |  3 +++
 roles/osbs-client/templates/osbs.conf.j2 | 30 ++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/roles/osbs-client/defaults/main.yml b/roles/osbs-client/defaults/main.yml
index efe14942ee..1dcd99ccc2 100644
--- a/roles/osbs-client/defaults/main.yml
+++ b/roles/osbs-client/defaults/main.yml
@@ -43,3 +43,6 @@ default:
   builder_odcs_url: ""
   builder_odcs_insecure: false
   builder_odcs_openidc_secret: ""
+  builder_pdc_url: ""
+  builder_pdc_insecure: false
+  flatpak_base_image: ""
\ No newline at end of file
diff --git a/roles/osbs-client/templates/osbs.conf.j2 b/roles/osbs-client/templates/osbs.conf.j2
index 99f1f7b424..1f772cb43f 100644
--- a/roles/osbs-client/templates/osbs.conf.j2
+++ b/roles/osbs-client/templates/osbs.conf.j2
@@ -41,8 +41,9 @@ kerberos_principal = {{ default.kerberos_principal }}
 token_file = {{ default.token_file }}
 {% endif %}
 
-# Orchestrator/Worker Architecture split additions
+
 {% if default.can_orchestrate is defined %}
+# Orchestrator/Worker Architecture split additions
 can_orchestrate = {{ default.can_orchestrate }}
 {% endif %}
 {% if default.namespace is defined %}
@@ -84,6 +85,15 @@ 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 %}
+
 [scratch]
 scratch = true
 {% if default.username is defined %}
@@ -117,8 +127,9 @@ kerberos_principal = {{ default.kerberos_principal }}
 token_file = {{ default.token_file }}
 {% endif %}
 
-# Orchestrator/Worker Architecture split additions
+
 {% if default.can_orchestrate is defined %}
+# Orchestrator/Worker Architecture split additions
 can_orchestrate = {{ default.can_orchestrate }}
 {% endif %}
 {% if default.namespace is defined %}
@@ -154,3 +165,18 @@ registry_secret = {{ default.registry_secret_name }}
 {%  endif %}
 builder_openshift_url = {{ default.builder_openshift_url }}
 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 %}
\ No newline at end of file