OSBS: move the flatpak base image from osbs.conf to the configmap.

Fixes https://pagure.io/fedora-infrastructure/issue/7614

Signed-off-by: Clement Verna <cverna@tutanota.com>

inventory/group_vars/osbs-masters

@@ -102,6 +102,9 @@ _osbs_reactor_config_map:
     pdc:
         api_url: "https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1/"
 
+    flatpak:
+        base_image: "registry.fedoraproject.org/fedora:latest"
+
     image_labels:
       vendor: "Fedora Project"
       authoritative-source-url: "{{ source_registry }}"

inventory/group_vars/osbs-masters-stg

@@ -97,6 +97,9 @@ _osbs_reactor_config_map:
     pdc:
         api_url: "https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1/"
 
+    flatpak:
+        base_image: "registry.fedoraproject.org/fedora:latest"
+
     image_labels:
       vendor: "Fedora Project"
       authoritative-source-url: "{{ source_registry }}"

playbooks/groups/buildvm.yml

@@ -21,7 +21,12 @@
   roles:
     - base
     - hosts
-  - { role: nfs/client, mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: "{{ koji_hub_nfs }}", when: "env == 'staging' or createrepo" }
+    - {
+        role: nfs/client,
+        mnt_dir: "/mnt/fedora_koji",
+        nfs_src_dir: "{{ koji_hub_nfs }}",
+        when: "env == 'staging' or createrepo",
+      }
     - { role: fas_client, when: not inventory_hostname.startswith('bkernel') }
     - { role: sudo, when: not inventory_hostname.startswith('bkernel') }
     - koji_builder
@@ -80,85 +85,86 @@
     - {
         role: osbs-client,
         when: env == 'staging' and ansible_architecture == 'x86_64',
-        general: {
+        general:
+          {
             verbose: 0,
-          build_json_dir: '/usr/share/osbs/',
+            build_json_dir: "/usr/share/osbs/",
             openshift_required_version: 1.1.0,
           },
-        default: {
+        default:
+          {
             username: "{{ osbs_koji_stg_username }}",
             password: "{{ osbs_koji_stg_password }}",
             koji_use_kerberos: True,
             koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab",
             koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
-          openshift_url: 'https://{{ osbs_url }}/',
-          build_host: '{{ osbs_url }}',
-          koji_root: 'http://{{ koji_root }}',
-          koji_hub: 'https://koji.stg.fedoraproject.org/kojihub',
-          sources_command: 'fedpkg sources',
-          build_type: 'prod',
+            openshift_url: "https://{{ osbs_url }}/",
+            build_host: "{{ osbs_url }}",
+            koji_root: "http://{{ koji_root }}",
+            koji_hub: "https://koji.stg.fedoraproject.org/kojihub",
+            sources_command: "fedpkg sources",
+            build_type: "prod",
             verify_ssl: true,
             use_auth: true,
             builder_use_auth: true,
-          registry_api_versions: 'v2',
-          builder_openshift_url: 'https://{{osbs_url}}',
-          client_config_secret: 'client-config-secret',
-          reactor_config_secret: 'reactor-config-secret',
-          token_secrets: 'x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-orchestrator',
-          token_file: '/etc/osbs/x86-64-osbs-koji',
-          namespace: 'osbs-fedora',
+            registry_api_versions: "v2",
+            builder_openshift_url: "https://{{osbs_url}}",
+            client_config_secret: "client-config-secret",
+            reactor_config_secret: "reactor-config-secret",
+            token_secrets: "x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-orchestrator",
+            token_file: "/etc/osbs/x86-64-osbs-koji",
+            namespace: "osbs-fedora",
             can_orchestrate: true,
             builder_odcs_url: "https://odcs{{ env_suffix }}.fedoraproject.org",
             builder_odcs_openidc_secret: "odcs-oidc-secret",
             builder_pdc_url: "https://pdc.stg.fedoraproject.org/api/1",
-          flatpak_base_image: "registry.stg.fedoraproject.org/fedora:28",
             reactor_config_map: "reactor-config-map",
             reactor_config_map_scratch: "reactor-config-map-scratch",
-          build_from: "image:buildroot:latest"
-        }
+            build_from: "image:buildroot:latest",
+          },
       }
     - {
         role: osbs-client,
         when: env == 'production' and ansible_architecture == 'x86_64',
-        general: {
+        general:
+          {
             verbose: 0,
-          build_json_dir: '/usr/share/osbs/',
+            build_json_dir: "/usr/share/osbs/",
             openshift_required_version: 1.1.0,
           },
-        default: {
+        default:
+          {
             username: "{{ osbs_koji_prod_username }}",
             password: "{{ osbs_koji_prod_password }}",
             koji_use_kerberos: True,
             koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab",
             koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
-          openshift_url: 'https://{{ osbs_url }}/',
-          build_host: '{{ osbs_url }}',
-          koji_root: 'http://{{ koji_root }}',
-          koji_hub: 'https://koji.fedoraproject.org/kojihub',
-          sources_command: 'fedpkg sources',
-          build_type: 'prod',
+            openshift_url: "https://{{ osbs_url }}/",
+            build_host: "{{ osbs_url }}",
+            koji_root: "http://{{ koji_root }}",
+            koji_hub: "https://koji.fedoraproject.org/kojihub",
+            sources_command: "fedpkg sources",
+            build_type: "prod",
             verify_ssl: true,
             use_auth: true,
             builder_use_auth: true,
-          registry_api_versions: 'v2',
-          builder_openshift_url: 'https://{{osbs_url}}',
-          token_secrets: 'x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-orchestrator',
-          token_file: '/etc/osbs/x86-64-osbs-koji',
-          namespace: 'osbs-fedora',
+            registry_api_versions: "v2",
+            builder_openshift_url: "https://{{osbs_url}}",
+            token_secrets: "x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-orchestrator",
+            token_file: "/etc/osbs/x86-64-osbs-koji",
+            namespace: "osbs-fedora",
             can_orchestrate: true,
             builder_odcs_url: "https://odcs{{ env_suffix }}.fedoraproject.org",
             builder_odcs_openidc_secret: "odcs-oidc-secret",
             builder_pdc_url: "https://pdc.fedoraproject.org/api/1",
-          flatpak_base_image: "registry.fedoraproject.org/fedora:latest",
             reactor_config_map: "reactor-config-map",
             reactor_config_map_scratch: "reactor-config-map-scratch",
-          build_from: "image:buildroot:latest"
-        }
+            build_from: "image:buildroot:latest",
+          },
       }
   handlers:
     - import_tasks: "{{ handlers_path }}/restart_services.yml"
 
-
 - name: configure varnish cache
   hosts: buildvm-s390x-07.s390.fedoraproject.org:buildvm-s390x-01.stg.s390.fedoraproject.org
   tags:
@@ -191,7 +197,8 @@
 
   tasks:
     - name: Put sshfs key in place
-    copy: src="{{ private }}/files/releng/sshkeys/primary-s390x-sshfs{{ '-staging' if env == 'staging' else '' }}"
+      copy:
+        src="{{ private }}/files/releng/sshkeys/primary-s390x-sshfs{{ '-staging' if env == 'staging' else '' }}"
         dest="/etc/primary-s390x-sshfs"
         owner=root group=root mode=0600
       tags:

roles/osbs-client/templates/osbs.conf.j2

@@ -82,10 +82,6 @@ pdc_url = {{ default.builder_pdc_url }}
 pdc_insecure = {{ default.builder_pdc_insecure }}
 {% endif %}
 
-{% if default.flatpak_base_image %}
-flatpak_base_image = {{ default.flatpak_base_image }}
-{% endif %}
-
 {% if default.reactor_config_map is defined %}
 reactor_config_map = {{ default.reactor_config_map }}
 {% endif %}
@@ -175,10 +171,6 @@ pdc_url = {{ default.builder_pdc_url }}
 pdc_insecure = {{ default.builder_pdc_insecure }}
 {% endif %}
 
-{% if default.flatpak_base_image %}
-flatpak_base_image = {{ default.flatpak_base_image }}
-{% endif %}
-
 {% if default.reactor_config_map_scratch is defined %}
 reactor_config_map = {{ default.reactor_config_map_scratch }}
 {% endif %}