From 57601d915e5fb00d433a9bf5e1982a2abbba3223 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 4 Dec 2015 19:01:53 -0800
Subject: [PATCH] check-compose: apparently no dashes in variable names?
 WHATEVS

---
 inventory/group_vars/openqa                      |  6 +++---
 roles/check-compose/tasks/main.yml               | 12 ++++++------
 .../templates/check-compose.conf.j2              | 16 ++++++++--------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/inventory/group_vars/openqa b/inventory/group_vars/openqa
index a7f54cea77..873ee96a32 100644
--- a/inventory/group_vars/openqa
+++ b/inventory/group_vars/openqa
@@ -17,9 +17,9 @@ openqa_secret: "{{ prod_openqa_apisecret }}"
 wikitcms_user: coconut
 wikitcms_password: "{{ prod_wikitcms_password }}"
 
-check-compose_email-from: rawhide@fedoraproject.org
-check-compose_email-to: "test@lists.fedoraproject.org devel@lists.fedoraproject.org"
-check-compose_smtp: bastion.phx2.fedoraproject.org
+checkcompose_emailfrom: rawhide@fedoraproject.org
+checkcompose_emailto: "test@lists.fedoraproject.org devel@lists.fedoraproject.org"
+checkcompose_smtp: bastion.phx2.fedoraproject.org
 
 deployment_type: prod
 
diff --git a/roles/check-compose/tasks/main.yml b/roles/check-compose/tasks/main.yml
index bdb0453dbc..c7ecf09c5f 100644
--- a/roles/check-compose/tasks/main.yml
+++ b/roles/check-compose/tasks/main.yml
@@ -1,18 +1,18 @@
 # Optional vars
-# - check-compose_wait
+# - checkcompose_wait
 ##      string - (digits) time in minutes to wait for openQA tests to complete
 ##               before sending the report (defaults to 480)
-# - check-compose_email-from
+# - checkcompose_emailfrom
 ##      string - Email address to send report from (if not set, no report sent)
-# - check-compose_email-to
+# - checkcompose_emailto
 ##      string - Email address to send report to (if not set but email-from
 ##               set, report will go to email-from, for testing usually)
 ##               Split multiple addresses with spaces
-# - check-compose_smtp
+# - checkcompose_smtp
 ##      string - SMTP server to use for sending the report
-# - check-compose_json
+# - checkcompose_json
 ##      string - File to append JSON-formatted report summary to
-# - check-compose_loglevel
+# - checkcompose_loglevel
 ##      string - log level
 #
 # NOTE: this is missing /etc/openqa/client.conf configuration, for now;
diff --git a/roles/check-compose/templates/check-compose.conf.j2 b/roles/check-compose/templates/check-compose.conf.j2
index 3f22dd36e2..70f719b279 100644
--- a/roles/check-compose/templates/check-compose.conf.j2
+++ b/roles/check-compose/templates/check-compose.conf.j2
@@ -1,19 +1,19 @@
 [main]
-{% if check-compose_wait is defined %}
+{% if checkcompose_wait is defined %}
 wait: {{ check-compose_wait }}
 {% endif %}
-{% if check-compose_email-from is defined %}
-email-from: {{ check-compose_email-from }}
+{% if checkcompose_emailfrom is defined %}
+email-from: {{ check-compose_emailfrom }}
 {% endif %}
-{% if check-compose_email-to is defined %}
-email-to: {{ check-compose_email-to }}
+{% if checkcompose_emailto is defined %}
+email-to: {{ check-compose_emailto }}
 {% endif %}
-{% if check-compose_smtp is defined %}
+{% if checkcompose_smtp is defined %}
 smtp: {{ check-compose_smtp }}
 {% endif %}
-{% if check-compose_json is defined %}
+{% if checkcompose_json is defined %}
 json: {{ check-compose_json }}
 {% endif %}
-{% if check-compose_loglevel is defined %}
+{% if checkcompose_loglevel is defined %}
 loglevel: {{ check-compose_loglevel }}
 {% endif %}