Turn all pungi configs into a single one

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>

roles/bodhi2/backend/files/pungi.module.conf.j2

@@ -1,15 +1,20 @@
 # PRODUCT INFO
-release_name = '{{ release.id_prefix.title() }}'
+release_name = '[[ release.id_prefix.title() ]]'
-release_short = '{{ release.id_prefix.title() }}'
+release_short = '[[ release.id_prefix.title() ]]'
-release_version = '{{ release.version_int }}'
+release_version = '[[ release.version_int ]]'
-release_type = 'updates{% if request.name == 'testing' %}-testing{% endif %}'
+release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
 release_is_layered = False
 
 # GENERAL SETTINGS
 bootable = False
 
 variants_file='module-variants.xml'
-sigkeys = ['a3cc4e62', None]
+sigkeys = [
+	'a3cc4e62',
+{% if env == "staging" %}
+	None
+{% endif %}
+]
 
 hashed_directories = True
 
@@ -17,7 +22,7 @@ hashed_directories = True
 runroot = False
 
 # PDC settings
-pdc_url = 'https://pdc.stg.fedoraproject.org/rest_api/v1'
+pdc_url = 'https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1'
 pdc_insecure = False
 pdc_develop = True
 
@@ -52,7 +57,7 @@ skip_phases= ["live_media", "ostree"]
 
 
 translate_paths = [
-   ('/mnt/koji/compose/', 'http://kojipkgs.stg.fedoraproject.org/compose/'),
+   ('/mnt/koji/compose/', 'http://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/'),
 ]
 
 createiso_skip = [

roles/bodhi2/backend/files/pungi.rpm.conf.j2

@@ -1,9 +1,9 @@
 # PRODUCT INFO
 skip_phases= ["buildinstall"]
-release_name = '{{ release.id_prefix.title() }}'
+release_name = '[[ release.id_prefix.title() ]]'
-release_short = '{{ release.id_prefix.title() }}'
+release_short = '[[ release.id_prefix.title() ]]'
-release_version = '{{ release.version_int }}'
+release_version = '[[ release.version_int ]]'
-release_type = 'updates{% if request.name == 'testing' %}-testing{% endif %}'
+release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
 release_is_layered = False
 
 # GENERAL SETTINGS
@@ -11,22 +11,22 @@ comps_file = {
     'scm': 'git',
     'repo': 'https://pagure.io/fedora-comps.git',
     'branch': None, # defaults to cvs/HEAD or git/master
-    'file': 'comps-{{ release.branch }}.xml',
+    'file': 'comps-[[ release.branch ]].xml',
     'command': 'make',
 }
 variants_file='variants.xml'
 sigkeys = [
-{% if release.version_int == 25 %}
+[% if release.version_int == 25 %]
 	'fdb19c98',
-{% elif release.version_int == 26 %}
+[% elif release.version_int == 26 %]
 	'64dab85d',
-{% elif release.version_int == 27 %}
+[% elif release.version_int == 27 %]
 	'f5282ee4',
-{% elif release.version_int == 6 %}
+[% elif release.version_int == 6 %]
 	'0608b895',
-{% elif release.version_int == 7 %}
+[% elif release.version_int == 7 %]
 	'352C64E5',
-{% endif %}
+[% endif %]
 	None
 ]
 hashed_directories = True
@@ -34,11 +34,11 @@ hashed_directories = True
 # RUNROOT settings
 runroot = True
 runroot_channel = 'compose'
-runroot_tag = '{{ release.dist_tag }}-build'
+runroot_tag = '[[ release.dist_tag ]]-build'
 
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = '{{ id }}'
+pkgset_koji_tag = '[[ id ]]'
 pkgset_koji_inherit = False
 filter_system_release_packages = False
 
@@ -101,27 +101,27 @@ createiso_skip = [
         }),
     ]
 
-{% if release.id_prefix == 'FEDORA' %}
+[% if release.id_prefix == 'FEDORA' %]
 ostree = [
     ("^Everything$", {
         "x86_64": {
             "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
             "treefile": "fedora-atomic-host.json",
             "config_url": "https://pagure.io/fedora-atomic.git",
-            "config_branch": "f{{ release.version }}",
+            "config_branch": "f[[ release.version ]]",
             "repo": [
                 "Everything",
-                {% if request.name == 'testing' %}
+                [% if request.name == 'testing' %]
                     # In the case of testing, also inject the last stable updates
-                    "https://kojipkgs.stg.fedoraproject.org/compose/updates/f{{ release.version }}-updates/compose/Everything/x86_64/os/"
+                    "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version ]]-updates/compose/Everything/x86_64/os/"
-                {% endif %}
+                [% endif %]
-                "https://dl.fedoraproject.org/pub/fedora/linux/releases/{{ release.version_int }}/Everything/x86_64/os/"
+                "https://dl.fedoraproject.org/pub/fedora/linux/releases/[[ release.version_int ]]/Everything/x86_64/os/"
             ]
             "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
         }
     })
 ]
-{% endif %}
+[% endif %]
 
 translate_paths = [
    ('/mnt/koji/compose/', 'https://kojipkgs.stg.fedoraproject.org/compose/'),

roles/bodhi2/backend/files/variants.module.xml.j2

@@ -6,9 +6,9 @@
 			<arch>x86_64</arch>
 		</arches>
 		<modules>
-			{% for module in modules %}
+			[% for module in modules %]
-				<module>{{ module }}</module>
+				<module>[[ module ]]</module>
-			{% endfor %}
+			[% endfor %]
 		</modules>
 	</variant>
 </variants>

roles/bodhi2/backend/tasks/main.yml

@@ -110,7 +110,7 @@
   - config
 
 - name: Put pungi configurations in place
-  copy: src="{{env}}-{{item}}" dest=/etc/bodhi/{{item}}
+  template: src="{{item}}" dest=/etc/bodhi/{{item}}
   with_items:
   - pungi.module.conf.j2
   - pungi.rpm.conf.j2