Move kojira username to config

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
puiterwijk · Mar 18, 2019 · 696065e · 696065e
1 parent 3cd5f34
commit 696065e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/components/kojira/configmap.yml b/components/kojira/configmap.yml
@@ -10,7 +10,7 @@ data:
     [kojira]
     ; Configuration authentication
     serverca = /etc/cacert/cert
-    user=kojira
+    user={{ username }}
     cert=/tmp/clientcert.combined.pem
 
     server=https://koji-hub:8443/kojihub

diff --git a/example.yml b/example.yml
@@ -12,6 +12,8 @@ storage:
 koji_hub:
   public_hostname: koji.mbox.test
   admin_username: admin
+kojira:
+  username: kojira
 builder:
   built_in: yes
 identity:

diff --git a/mbox/kojira.py b/mbox/kojira.py
@@ -23,6 +23,7 @@ def create(self):
         )
         self.state.apply_object_from_template(
             "kojira/configmap.yml",
+            username=self.state.config.get("kojira", "username"),
         )
         self.state.apply_object_from_template(
             "kojira/deploymentconfig.yml",