From 6b8e9bfdd2a88453ecab054b81e13f383d608e15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= <mkonecny@redhat.com>
Date: Tue, 11 Jun 2019 16:38:09 +0200
Subject: [PATCH] joystick: separate config files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
---
 .../joystick/templates/config.toml            | 78 ++++++++++++++++++
 .../joystick/templates/configmap.yml          | 80 +------------------
 2 files changed, 80 insertions(+), 78 deletions(-)
 create mode 100644 roles/openshift-apps/joystick/templates/config.toml

diff --git a/roles/openshift-apps/joystick/templates/config.toml b/roles/openshift-apps/joystick/templates/config.toml
new file mode 100644
index 0000000000..c14d42b438
--- /dev/null
+++ b/roles/openshift-apps/joystick/templates/config.toml
@@ -0,0 +1,78 @@
+# Example configuration for Fedora Messaging
+# For complete documentation check
+# https://fedora-messaging.readthedocs.io/en/latest/configuration.html.
+
+amqp_url = "amqps://joystick:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/%2Fpubsub"
+
+{% if env == "staging" %}
+topic_prefix = "org.fedoraproject.stg"
+{% else %}
+topic_prefix = "org.fedoraproject.prod"
+{% endif %}
+passive_declares = true
+publish_exchange = "amq.topic"
+callback = "joystick.consumers.fedora_messaging_consumer:JoyStickController"
+
+[[bindings]]
+queue = "joystick{{env_suffix}}"
+exchange = "amq.topic"
+routing_keys = ["org.fedoraproject.*.pungi.compose.status.change"]
+
+[tls]
+ca_cert = "/etc/fedora-messaging/cacert.pem"
+keyfile = "/etc/fedora-messaging/fedora-key.pem"
+certfile = "/etc/fedora-messaging/fedora-cert.pem"
+
+[client_properties]
+app = "joystick"
+
+[exchanges."amq.topic"]
+type = "topic"
+durable = true
+auto_delete = false
+arguments = {}
+
+[queues."joystick{{env_suffix}}"]
+durable = true
+auto_delete = false
+exclusive = false
+arguments = {}
+
+[qos]
+prefetch_size = 0
+prefetch_count = 25
+
+[log_config]
+version = 1
+disable_existing_loggers = true
+
+[log_config.formatters.simple]
+format = "[%(name)s %(levelname)s] %(message)s"
+
+[log_config.handlers.console]
+class = "logging.StreamHandler"
+formatter = "simple"
+stream = "ext://sys.stdout"
+
+[log_config.loggers.fedora_messaging]
+level = "INFO"
+propagate = false
+handlers = ["console"]
+
+[log_config.root]
+level = "DEBUG"
+handlers = ["console"]
+
+# joystick consumer configuration
+[consumer_config]
+topic_prefix = 'org.fedoraproject'
+{% if env == "staging" %}
+environment = 'stg'
+{% else %}
+environment = 'prod'
+{% endif %}
+{% if env == "staging" %}
+regions = ["us-east-2"]
+{% else %}
+regions = ["us-east-2"]
+{% endif %}
diff --git a/roles/openshift-apps/joystick/templates/configmap.yml b/roles/openshift-apps/joystick/templates/configmap.yml
index 8b2f6de746..d5ac3cff31 100644
--- a/roles/openshift-apps/joystick/templates/configmap.yml
+++ b/roles/openshift-apps/joystick/templates/configmap.yml
@@ -1,3 +1,4 @@
+{% macro load_file(filename) %}{% include filename %}{%- endmacro -%}
 ----
 apiVersion: v1
 kind: List
@@ -11,81 +12,4 @@ items:
         app: joystick
       data:
         config.toml: |-
-          # Example configuration for Fedora Messaging
-          # For complete documentation check
-          # https://fedora-messaging.readthedocs.io/en/latest/configuration.html.
-
-          amqp_url = "amqps://joystick:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/%2Fpubsub"
-
-{% if env == "staging" %}
-          topic_prefix = "org.fedoraproject.stg"
-{% else %}
-          topic_prefix = "org.fedoraproject.prod"
-{% endif %}
-          passive_declares = true
-          publish_exchange = "amq.topic"
-          callback = "joystick.consumers.fedora_messaging_consumer:JoyStickController"
-
-          [[bindings]]
-          queue = "joystick{{env_suffix}}"
-          exchange = "amq.topic"
-          routing_keys = ["org.fedoraproject.*.pungi.compose.status.change"]
-
-          [tls]
-          ca_cert = "/etc/fedora-messaging/cacert.pem"
-          keyfile = "/etc/fedora-messaging/fedora-key.pem"
-          certfile = "/etc/fedora-messaging/fedora-cert.pem"
-
-          [client_properties]
-          app = "joystick"
-
-          [exchanges."amq.topic"]
-          type = "topic"
-          durable = true
-          auto_delete = false
-          arguments = {}
-
-          [queues."joystick{{env_suffix}}"]
-          durable = true
-          auto_delete = false
-          exclusive = false
-          arguments = {}
-
-          [qos]
-          prefetch_size = 0
-          prefetch_count = 25
-
-          [log_config]
-          version = 1
-          disable_existing_loggers = true
-
-          [log_config.formatters.simple]
-          format = "[%(name)s %(levelname)s] %(message)s"
-
-          [log_config.handlers.console]
-          class = "logging.StreamHandler"
-          formatter = "simple"
-          stream = "ext://sys.stdout"
-
-          [log_config.loggers.fedora_messaging]
-          level = "INFO"
-          propagate = false
-          handlers = ["console"]
-
-          [log_config.root]
-          level = "DEBUG"
-          handlers = ["console"]
-
-          # joystick consumer configuration
-          [consumer_config]
-          topic_prefix = 'org.fedoraproject'
-{% if env == "staging" %}
-          environment = 'stg'
-{% else %}
-          environment = 'prod'
-{% endif %}
-{% if env == "staging" %}
-          regions = ["us-east-2"]
-{% else %}
-          regions = ["us-east-2"]
-{% endif %}
+          {{ load_file('config.toml') | indent }}