From 46ce53c208b20bab94d0900ca6c13054b706f48c Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: May 30 2017 13:10:20 +0000 Subject: atomic: update lorax passed vars Add new ostree_install_repo and ostree_update_repo vars so that we can tell lorax where to pull from during the pungi compose and also where to configure an installed system to pull from. i.e. where a user is going to pull from over time. This is related to https://pagure.io/fedora-lorax-templates/pull-request/19 Signed-off-by: Dusty Mabe --- diff --git a/fedora-atomic.conf b/fedora-atomic.conf index fc822a0..feb5593 100644 --- a/fedora-atomic.conf +++ b/fedora-atomic.conf @@ -270,7 +270,8 @@ ostree_installer = [ "add_template": ["atomic-installer/lorax-configure-repo.tmpl", "atomic-installer/lorax-embed-repo.tmpl"], "add_template_var": [ - "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", + "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", + "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/", "ostree_osname=fedora-atomic", "ostree_install_ref=fedora/rawhide/x86_64/atomic-host", "ostree_update_ref=fedora/rawhide/x86_64/atomic-host", diff --git a/fedora.conf b/fedora.conf index 4fe2165..98ff70e 100644 --- a/fedora.conf +++ b/fedora.conf @@ -763,7 +763,8 @@ ostree_installer = [ "add_template": ["atomic-installer/lorax-configure-repo.tmpl", "atomic-installer/lorax-embed-repo.tmpl"], "add_template_var": [ - "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", + "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", + "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/", "ostree_osname=fedora-atomic", "ostree_install_ref=fedora/rawhide/x86_64/atomic-host", "ostree_update_ref=fedora/rawhide/x86_64/atomic-host", @@ -780,7 +781,8 @@ ostree_installer = [ "add_template": ["atomic-installer/lorax-configure-repo.tmpl", "atomic-installer/lorax-embed-repo.tmpl"], "add_template_var": [ - "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", + "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", + "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/", "ostree_osname=fedora-atomic", "ostree_install_ref=fedora/rawhide/aarch64/atomic-host", "ostree_update_ref=fedora/rawhide/aarch64/atomic-host", @@ -797,7 +799,8 @@ ostree_installer = [ "add_template": ["atomic-installer/lorax-configure-repo.tmpl", "atomic-installer/lorax-embed-repo.tmpl"], "add_template_var": [ - "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", + "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", + "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/", "ostree_osname=fedora-atomic", "ostree_install_ref=fedora/rawhide/ppc64le/atomic-host", "ostree_update_ref=fedora/rawhide/ppc64le/atomic-host",