summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamil Páral <kparal@redhat.com>2017-08-21 15:47:15 +0200
committerKamil Páral <kparal@redhat.com>2017-08-21 15:47:15 +0200
commit2c245cf7c2493116ac476f5b56f60e671f811c38 (patch)
tree65c617d1a615a0cf65d9ccb2f5d5f9b0d56128aa
parentd8598e074f8e46268607ec66b1108f54b862fe80 (diff)
downloadansible-2c245cf7c2493116ac476f5b56f60e671f811c38.tar.gz
ansible-2c245cf7c2493116ac476f5b56f60e671f811c38.tar.xz
ansible-2c245cf7c2493116ac476f5b56f60e671f811c38.zip
taskotron/imagefactory: set rawhide to F28 for production
-rw-r--r--roles/taskotron/imagefactory-client/templates/config.ini.j22
-rw-r--r--roles/taskotron/imagefactory-client/templates/config.ini.j2.dev4
-rw-r--r--roles/taskotron/imagefactory/templates/config_server.ini.j22
-rw-r--r--roles/taskotron/imagefactory/templates/config_server.ini.j2.dev10
4 files changed, 2 insertions, 16 deletions
diff --git a/roles/taskotron/imagefactory-client/templates/config.ini.j2 b/roles/taskotron/imagefactory-client/templates/config.ini.j2
index a0a4e8bc6..19552397b 100644
--- a/roles/taskotron/imagefactory-client/templates/config.ini.j2
+++ b/roles/taskotron/imagefactory-client/templates/config.ini.j2
@@ -1,4 +1,4 @@
[default]
imgfac_base_url={{imagefactory_baseurl}}
-rawhide=27
+rawhide=28
diff --git a/roles/taskotron/imagefactory-client/templates/config.ini.j2.dev b/roles/taskotron/imagefactory-client/templates/config.ini.j2.dev
deleted file mode 100644
index 19552397b..000000000
--- a/roles/taskotron/imagefactory-client/templates/config.ini.j2.dev
+++ /dev/null
@@ -1,4 +0,0 @@
-[default]
-imgfac_base_url={{imagefactory_baseurl}}
-rawhide=28
-
diff --git a/roles/taskotron/imagefactory/templates/config_server.ini.j2 b/roles/taskotron/imagefactory/templates/config_server.ini.j2
index 41f7cd102..a37f58513 100644
--- a/roles/taskotron/imagefactory/templates/config_server.ini.j2
+++ b/roles/taskotron/imagefactory/templates/config_server.ini.j2
@@ -1,6 +1,6 @@
[default]
imgfac_base_url=http://127.0.0.1:8075/imagefactory
-rawhide=27
+rawhide=28
mail_from={{deployment_type}}.imagefactory@qa.fedoraproject.org
mail_to=jskladan@redhat.com tflink@redhat.com
diff --git a/roles/taskotron/imagefactory/templates/config_server.ini.j2.dev b/roles/taskotron/imagefactory/templates/config_server.ini.j2.dev
deleted file mode 100644
index a37f58513..000000000
--- a/roles/taskotron/imagefactory/templates/config_server.ini.j2.dev
+++ /dev/null
@@ -1,10 +0,0 @@
-[default]
-imgfac_base_url=http://127.0.0.1:8075/imagefactory
-rawhide=28
-
-mail_from={{deployment_type}}.imagefactory@qa.fedoraproject.org
-mail_to=jskladan@redhat.com tflink@redhat.com
-mail_subject=Images that failed to build for Taskotron in ImageFactory on {{deployment_type}}
-smtp_server=bastion.phx2.fedoraproject.org
-
-deployment_type={{deployment_type}}