On Thu, Jul 22, 2021 at 10:51:19PM +0200, Thomas Goirand wrote: > >> In commit 522055bf, I added > >> config_space/files/etc/cloud/cloud.cfg.d/01_debian_cloud.cfg/GENERICCLOUD > >> and > >> config_space/files/etc/cloud/cloud.cfg.d/01_debian_cloud.cfg/GENERIC, in > >> the hope to get /etc/cloud/cloud.cfg.d/01_debian_cloud.cfg to contain > >> "manage_etc_hosts: true" in our generated OpenStack images. However, > >> after checking the last build, this file still doesn't exist in our > >> daily image. > >> > >> What am I missing? > > > > https://salsa.debian.org/cloud-admin-team/debian-cloud-images-daily/-/issues/2 > > > > The debian-cloud-images repository, which contains the FAI config and > > all the FAI wrapper code and is where you made your change, is a > > submodule of couple of other repositories. In order to change the > > generated images, you need to update the submodule in the > > https://salsa.debian.org/cloud-admin-team/debian-cloud-images-daily/-/tree/master > > repository. > > > > The repository structure is generally a good thing, but you're not the > > first to be bitten by this. If we can't easily automate keeping the > > submodule in sync, maybe just a reminder of some sort would help us make > > sure to perform the manual update. > > Thanks for the explanation. That's definitively helpful to know. > > But I still don't understand what kind of action I need to do to get > debian-cloud-images-daily to use the latest commit I pushed... :/
Update the "tools" submodule in the debian-cloud-images-daily repository and open a merge request with your change. Something like this: $ git clone [email protected]:cloud-admin-team/debian-cloud-images-daily.git Cloning into 'debian-cloud-images-daily'... remote: Enumerating objects: 34, done. remote: Counting objects: 100% (34/34), done. remote: Compressing objects: 100% (25/25), done. remote: Total 183 (delta 17), reused 24 (delta 9), pack-reused 149 Receiving objects: 100% (183/183), 27.66 KiB | 1.54 MiB/s, done. Resolving deltas: 100% (97/97), done. $ cd debian-cloud-images-daily $ git submodule update --init Submodule 'tools' (https://salsa.debian.org/cloud-team/debian-cloud-images.git) registered for path 'tools' Cloning into '/tmp/debian-cloud-images-daily/tools'... Submodule path 'tools': checked out '229fc0db3fc67c3f335acab82b1b0fac1d643e8b' $ git -C tools checkout master Previous HEAD position was 229fc0d Merge branch 'ssm-auth-scope-fix' into 'master' Switched to branch 'master' Your branch is up to date with 'origin/master'. $ git -C tools pull -r Already up to date. $ git status On branch master Your branch is up to date with 'origin/master'. Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: tools (new commits) no changes added to commit (use "git add" and/or "git commit -a") $ git diff diff --git a/tools b/tools index 229fc0d..71eec3d 160000 --- a/tools +++ b/tools @@ -1 +1 @@ -Subproject commit 229fc0db3fc67c3f335acab82b1b0fac1d643e8b +Subproject commit 71eec3d599e62e58a25260b2adf50f0d2abcfa4d $ git -C tools show-branch 229fc0db3fc67c3f335acab82b1b0fac1d643e8b 71eec3d599e62e58a25260b2adf50f0d2abcfa4d ! [229fc0db3fc67c3f335acab82b1b0fac1d643e8b] Merge branch 'ssm-auth-scope-fix' into 'master' ! [71eec3d599e62e58a25260b2adf50f0d2abcfa4d] Merge branch 'manage-etc-hosts' into 'master' -- - [71eec3d599e62e58a25260b2adf50f0d2abcfa4d] Merge branch 'manage-etc-hosts' into 'master' + [71eec3d599e62e58a25260b2adf50f0d2abcfa4d^2] Add manage_etc_hosts: true for the generic image. -- [229fc0db3fc67c3f335acab82b1b0fac1d643e8b] Merge branch 'ssm-auth-scope-fix' into 'master' $ git add tools $ git commit -m "Update tools" [master 58579af] Update tools 1 file changed, 1 insertion(+), 1 deletion(-)
