diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2022-08-03 11:51:26 +0200 |
---|---|---|
committer | Erik Skultety <eskultet@redhat.com> | 2022-09-22 10:38:27 +0000 |
commit | 46fca5f7aaf32c94a2728e3ac2f79ceb7bb4fad0 (patch) | |
tree | 5880ca39adbf2f12b4773a18aa9ec25837ba7c8c | |
parent | ed2c1d4a54e301f6daa1efdd30d128d1c0e3f928 (diff) | |
download | libvirt-ci-46fca5f7aaf32c94a2728e3ac2f79ceb7bb4fad0.zip libvirt-ci-46fca5f7aaf32c94a2728e3ac2f79ceb7bb4fad0.tar.gz libvirt-ci-46fca5f7aaf32c94a2728e3ac2f79ceb7bb4fad0.tar.bz2 |
lcitool: move ansible/vars/ to facts/
The ansible/vars/ directory is not passed directly to Ansible, it
is passed in the group variables after processing in Python.
Furthermore, it is also used to generate Dockerfiles which does not
involve Ansible. Move it to another name which matches the name
of the variables.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | docs/platforms_and_mappings.rst | 6 | ||||
-rw-r--r-- | docs/projects.rst | 2 | ||||
-rw-r--r-- | lcitool/facts/mappings.yml (renamed from lcitool/ansible/vars/mappings.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/gtk-vnc+dist.yml (renamed from lcitool/ansible/vars/projects/gtk-vnc+dist.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/gtk-vnc.yml (renamed from lcitool/ansible/vars/projects/gtk-vnc.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/internal/base.yml (renamed from lcitool/ansible/vars/projects/internal/base.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/internal/cloud-init.yml (renamed from lcitool/ansible/vars/projects/internal/cloud-init.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/internal/developer.yml (renamed from lcitool/ansible/vars/projects/internal/developer.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/internal/early_install.yml (renamed from lcitool/ansible/vars/projects/internal/early_install.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/internal/perl-cpan.yml (renamed from lcitool/ansible/vars/projects/internal/perl-cpan.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/internal/python-pip.yml (renamed from lcitool/ansible/vars/projects/internal/python-pip.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/internal/unwanted.yml (renamed from lcitool/ansible/vars/projects/internal/unwanted.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/internal/vm.yml (renamed from lcitool/ansible/vars/projects/internal/vm.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libnbd.yml (renamed from lcitool/ansible/vars/projects/libnbd.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libosinfo.yml (renamed from lcitool/ansible/vars/projects/libosinfo.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt+dist.yml (renamed from lcitool/ansible/vars/projects/libvirt+dist.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt+minimal.yml (renamed from lcitool/ansible/vars/projects/libvirt+minimal.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-appdev-guide-python.yml (renamed from lcitool/ansible/vars/projects/libvirt-appdev-guide-python.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-cim.yml (renamed from lcitool/ansible/vars/projects/libvirt-cim.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-console-proxy.yml (renamed from lcitool/ansible/vars/projects/libvirt-console-proxy.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-csharp.yml (renamed from lcitool/ansible/vars/projects/libvirt-csharp.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-dbus.yml (renamed from lcitool/ansible/vars/projects/libvirt-dbus.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-glib+dist.yml (renamed from lcitool/ansible/vars/projects/libvirt-glib+dist.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-glib.yml (renamed from lcitool/ansible/vars/projects/libvirt-glib.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-go-xml.yml (renamed from lcitool/ansible/vars/projects/libvirt-go-xml.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-go.yml (renamed from lcitool/ansible/vars/projects/libvirt-go.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-java.yml (renamed from lcitool/ansible/vars/projects/libvirt-java.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-ocaml.yml (renamed from lcitool/ansible/vars/projects/libvirt-ocaml.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-perl.yml (renamed from lcitool/ansible/vars/projects/libvirt-perl.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-php.yml (renamed from lcitool/ansible/vars/projects/libvirt-php.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-publican.yml (renamed from lcitool/ansible/vars/projects/libvirt-publican.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-python.yml (renamed from lcitool/ansible/vars/projects/libvirt-python.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-ruby.yml (renamed from lcitool/ansible/vars/projects/libvirt-ruby.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-rust.yml (renamed from lcitool/ansible/vars/projects/libvirt-rust.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-sandbox.yml (renamed from lcitool/ansible/vars/projects/libvirt-sandbox.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-snmp.yml (renamed from lcitool/ansible/vars/projects/libvirt-snmp.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-tck+runtime.yml (renamed from lcitool/ansible/vars/projects/libvirt-tck+runtime.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt-tck.yml (renamed from lcitool/ansible/vars/projects/libvirt-tck.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/libvirt.yml (renamed from lcitool/ansible/vars/projects/libvirt.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/osinfo-db-tools+dist.yml (renamed from lcitool/ansible/vars/projects/osinfo-db-tools+dist.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/osinfo-db-tools.yml (renamed from lcitool/ansible/vars/projects/osinfo-db-tools.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/osinfo-db.yml (renamed from lcitool/ansible/vars/projects/osinfo-db.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/qemu+dist.yml (renamed from lcitool/ansible/vars/projects/qemu+dist.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/qemu+minimal.yml (renamed from lcitool/ansible/vars/projects/qemu+minimal.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/qemu.yml (renamed from lcitool/ansible/vars/projects/qemu.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/virt-manager.yml (renamed from lcitool/ansible/vars/projects/virt-manager.yml) | 0 | ||||
-rw-r--r-- | lcitool/facts/projects/virt-viewer.yml (renamed from lcitool/ansible/vars/projects/virt-viewer.yml) | 0 | ||||
-rw-r--r-- | lcitool/package.py | 2 | ||||
-rw-r--r-- | lcitool/projects.py | 6 |
49 files changed, 8 insertions, 8 deletions
diff --git a/docs/platforms_and_mappings.rst b/docs/platforms_and_mappings.rst index eb8389c..4351da3 100644 --- a/docs/platforms_and_mappings.rst +++ b/docs/platforms_and_mappings.rst @@ -30,7 +30,7 @@ In case you'd like to add a new OS distribution then: you're adding uses a package format we currently don't know about. Maintainers will advise on what to do in that case. -#. Edit the ``lcitool/ansible/vars/mappings.yml`` file to update all the +#. Edit the ``lcitool/facts/mappings.yml`` file to update all the existing package entries, providing details of the new OS distro. #. Run the unit tests with:: @@ -67,11 +67,11 @@ In order to simply add a new package mapping: #. Fork the project. -#. Edit the ``lcitool/ansible/vars/mappings.yml`` file to add your desired +#. Edit the ``lcitool/facts/mappings.yml`` file to add your desired mapping. #. Add the package mapping to the respective project's config file under - ``lcitool/ansible/vars/projects/``. + ``lcitool/facts/projects/``. #. Run the unit tests with:: diff --git a/docs/projects.rst b/docs/projects.rst index 6a08909..4af0fb5 100644 --- a/docs/projects.rst +++ b/docs/projects.rst @@ -3,7 +3,7 @@ Externally defined project package lists Historically all projects have been defined in data files at the location:: - lcitool/ansible/vars/projects/$NAME.yml + lcitool/facts/projects/$NAME.yml This creates a chicken and egg problem when a project changes its build pre-requisites, as libvirt-ci needs to be updated if-and-only-if the diff --git a/lcitool/ansible/vars/mappings.yml b/lcitool/facts/mappings.yml index 4645cf5..4645cf5 100644 --- a/lcitool/ansible/vars/mappings.yml +++ b/lcitool/facts/mappings.yml diff --git a/lcitool/ansible/vars/projects/gtk-vnc+dist.yml b/lcitool/facts/projects/gtk-vnc+dist.yml index 1e23b86..1e23b86 100644 --- a/lcitool/ansible/vars/projects/gtk-vnc+dist.yml +++ b/lcitool/facts/projects/gtk-vnc+dist.yml diff --git a/lcitool/ansible/vars/projects/gtk-vnc.yml b/lcitool/facts/projects/gtk-vnc.yml index 16c108a..16c108a 100644 --- a/lcitool/ansible/vars/projects/gtk-vnc.yml +++ b/lcitool/facts/projects/gtk-vnc.yml diff --git a/lcitool/ansible/vars/projects/internal/base.yml b/lcitool/facts/projects/internal/base.yml index 4306dc5..4306dc5 100644 --- a/lcitool/ansible/vars/projects/internal/base.yml +++ b/lcitool/facts/projects/internal/base.yml diff --git a/lcitool/ansible/vars/projects/internal/cloud-init.yml b/lcitool/facts/projects/internal/cloud-init.yml index 97d02e6..97d02e6 100644 --- a/lcitool/ansible/vars/projects/internal/cloud-init.yml +++ b/lcitool/facts/projects/internal/cloud-init.yml diff --git a/lcitool/ansible/vars/projects/internal/developer.yml b/lcitool/facts/projects/internal/developer.yml index f2fd878..f2fd878 100644 --- a/lcitool/ansible/vars/projects/internal/developer.yml +++ b/lcitool/facts/projects/internal/developer.yml diff --git a/lcitool/ansible/vars/projects/internal/early_install.yml b/lcitool/facts/projects/internal/early_install.yml index cfae81d..cfae81d 100644 --- a/lcitool/ansible/vars/projects/internal/early_install.yml +++ b/lcitool/facts/projects/internal/early_install.yml diff --git a/lcitool/ansible/vars/projects/internal/perl-cpan.yml b/lcitool/facts/projects/internal/perl-cpan.yml index 1f734d7..1f734d7 100644 --- a/lcitool/ansible/vars/projects/internal/perl-cpan.yml +++ b/lcitool/facts/projects/internal/perl-cpan.yml diff --git a/lcitool/ansible/vars/projects/internal/python-pip.yml b/lcitool/facts/projects/internal/python-pip.yml index ca7b9bd..ca7b9bd 100644 --- a/lcitool/ansible/vars/projects/internal/python-pip.yml +++ b/lcitool/facts/projects/internal/python-pip.yml diff --git a/lcitool/ansible/vars/projects/internal/unwanted.yml b/lcitool/facts/projects/internal/unwanted.yml index e5f369c..e5f369c 100644 --- a/lcitool/ansible/vars/projects/internal/unwanted.yml +++ b/lcitool/facts/projects/internal/unwanted.yml diff --git a/lcitool/ansible/vars/projects/internal/vm.yml b/lcitool/facts/projects/internal/vm.yml index 4db78a4..4db78a4 100644 --- a/lcitool/ansible/vars/projects/internal/vm.yml +++ b/lcitool/facts/projects/internal/vm.yml diff --git a/lcitool/ansible/vars/projects/libnbd.yml b/lcitool/facts/projects/libnbd.yml index 8ba493b..8ba493b 100644 --- a/lcitool/ansible/vars/projects/libnbd.yml +++ b/lcitool/facts/projects/libnbd.yml diff --git a/lcitool/ansible/vars/projects/libosinfo.yml b/lcitool/facts/projects/libosinfo.yml index 934ee96..934ee96 100644 --- a/lcitool/ansible/vars/projects/libosinfo.yml +++ b/lcitool/facts/projects/libosinfo.yml diff --git a/lcitool/ansible/vars/projects/libvirt+dist.yml b/lcitool/facts/projects/libvirt+dist.yml index 1fc1b2c..1fc1b2c 100644 --- a/lcitool/ansible/vars/projects/libvirt+dist.yml +++ b/lcitool/facts/projects/libvirt+dist.yml diff --git a/lcitool/ansible/vars/projects/libvirt+minimal.yml b/lcitool/facts/projects/libvirt+minimal.yml index dbb83a1..dbb83a1 100644 --- a/lcitool/ansible/vars/projects/libvirt+minimal.yml +++ b/lcitool/facts/projects/libvirt+minimal.yml diff --git a/lcitool/ansible/vars/projects/libvirt-appdev-guide-python.yml b/lcitool/facts/projects/libvirt-appdev-guide-python.yml index 853e6e9..853e6e9 100644 --- a/lcitool/ansible/vars/projects/libvirt-appdev-guide-python.yml +++ b/lcitool/facts/projects/libvirt-appdev-guide-python.yml diff --git a/lcitool/ansible/vars/projects/libvirt-cim.yml b/lcitool/facts/projects/libvirt-cim.yml index 797badf..797badf 100644 --- a/lcitool/ansible/vars/projects/libvirt-cim.yml +++ b/lcitool/facts/projects/libvirt-cim.yml diff --git a/lcitool/ansible/vars/projects/libvirt-console-proxy.yml b/lcitool/facts/projects/libvirt-console-proxy.yml index 2b25a3d..2b25a3d 100644 --- a/lcitool/ansible/vars/projects/libvirt-console-proxy.yml +++ b/lcitool/facts/projects/libvirt-console-proxy.yml diff --git a/lcitool/ansible/vars/projects/libvirt-csharp.yml b/lcitool/facts/projects/libvirt-csharp.yml index 85598b5..85598b5 100644 --- a/lcitool/ansible/vars/projects/libvirt-csharp.yml +++ b/lcitool/facts/projects/libvirt-csharp.yml diff --git a/lcitool/ansible/vars/projects/libvirt-dbus.yml b/lcitool/facts/projects/libvirt-dbus.yml index ab1837f..ab1837f 100644 --- a/lcitool/ansible/vars/projects/libvirt-dbus.yml +++ b/lcitool/facts/projects/libvirt-dbus.yml diff --git a/lcitool/ansible/vars/projects/libvirt-glib+dist.yml b/lcitool/facts/projects/libvirt-glib+dist.yml index ba1e18b..ba1e18b 100644 --- a/lcitool/ansible/vars/projects/libvirt-glib+dist.yml +++ b/lcitool/facts/projects/libvirt-glib+dist.yml diff --git a/lcitool/ansible/vars/projects/libvirt-glib.yml b/lcitool/facts/projects/libvirt-glib.yml index 8ef5495..8ef5495 100644 --- a/lcitool/ansible/vars/projects/libvirt-glib.yml +++ b/lcitool/facts/projects/libvirt-glib.yml diff --git a/lcitool/ansible/vars/projects/libvirt-go-xml.yml b/lcitool/facts/projects/libvirt-go-xml.yml index c06b9bb..c06b9bb 100644 --- a/lcitool/ansible/vars/projects/libvirt-go-xml.yml +++ b/lcitool/facts/projects/libvirt-go-xml.yml diff --git a/lcitool/ansible/vars/projects/libvirt-go.yml b/lcitool/facts/projects/libvirt-go.yml index 2b25a3d..2b25a3d 100644 --- a/lcitool/ansible/vars/projects/libvirt-go.yml +++ b/lcitool/facts/projects/libvirt-go.yml diff --git a/lcitool/ansible/vars/projects/libvirt-java.yml b/lcitool/facts/projects/libvirt-java.yml index 8e5b748..8e5b748 100644 --- a/lcitool/ansible/vars/projects/libvirt-java.yml +++ b/lcitool/facts/projects/libvirt-java.yml diff --git a/lcitool/ansible/vars/projects/libvirt-ocaml.yml b/lcitool/facts/projects/libvirt-ocaml.yml index 7ef023d..7ef023d 100644 --- a/lcitool/ansible/vars/projects/libvirt-ocaml.yml +++ b/lcitool/facts/projects/libvirt-ocaml.yml diff --git a/lcitool/ansible/vars/projects/libvirt-perl.yml b/lcitool/facts/projects/libvirt-perl.yml index 6b46d96..6b46d96 100644 --- a/lcitool/ansible/vars/projects/libvirt-perl.yml +++ b/lcitool/facts/projects/libvirt-perl.yml diff --git a/lcitool/ansible/vars/projects/libvirt-php.yml b/lcitool/facts/projects/libvirt-php.yml index f10c689..f10c689 100644 --- a/lcitool/ansible/vars/projects/libvirt-php.yml +++ b/lcitool/facts/projects/libvirt-php.yml diff --git a/lcitool/ansible/vars/projects/libvirt-publican.yml b/lcitool/facts/projects/libvirt-publican.yml index 85f54bf..85f54bf 100644 --- a/lcitool/ansible/vars/projects/libvirt-publican.yml +++ b/lcitool/facts/projects/libvirt-publican.yml diff --git a/lcitool/ansible/vars/projects/libvirt-python.yml b/lcitool/facts/projects/libvirt-python.yml index 8e79fff..8e79fff 100644 --- a/lcitool/ansible/vars/projects/libvirt-python.yml +++ b/lcitool/facts/projects/libvirt-python.yml diff --git a/lcitool/ansible/vars/projects/libvirt-ruby.yml b/lcitool/facts/projects/libvirt-ruby.yml index 28fdbe7..28fdbe7 100644 --- a/lcitool/ansible/vars/projects/libvirt-ruby.yml +++ b/lcitool/facts/projects/libvirt-ruby.yml diff --git a/lcitool/ansible/vars/projects/libvirt-rust.yml b/lcitool/facts/projects/libvirt-rust.yml index 0317495..0317495 100644 --- a/lcitool/ansible/vars/projects/libvirt-rust.yml +++ b/lcitool/facts/projects/libvirt-rust.yml diff --git a/lcitool/ansible/vars/projects/libvirt-sandbox.yml b/lcitool/facts/projects/libvirt-sandbox.yml index d249a7e..d249a7e 100644 --- a/lcitool/ansible/vars/projects/libvirt-sandbox.yml +++ b/lcitool/facts/projects/libvirt-sandbox.yml diff --git a/lcitool/ansible/vars/projects/libvirt-snmp.yml b/lcitool/facts/projects/libvirt-snmp.yml index 1f38f87..1f38f87 100644 --- a/lcitool/ansible/vars/projects/libvirt-snmp.yml +++ b/lcitool/facts/projects/libvirt-snmp.yml diff --git a/lcitool/ansible/vars/projects/libvirt-tck+runtime.yml b/lcitool/facts/projects/libvirt-tck+runtime.yml index 6872cb8..6872cb8 100644 --- a/lcitool/ansible/vars/projects/libvirt-tck+runtime.yml +++ b/lcitool/facts/projects/libvirt-tck+runtime.yml diff --git a/lcitool/ansible/vars/projects/libvirt-tck.yml b/lcitool/facts/projects/libvirt-tck.yml index 18d7a15..18d7a15 100644 --- a/lcitool/ansible/vars/projects/libvirt-tck.yml +++ b/lcitool/facts/projects/libvirt-tck.yml diff --git a/lcitool/ansible/vars/projects/libvirt.yml b/lcitool/facts/projects/libvirt.yml index 0234a1c..0234a1c 100644 --- a/lcitool/ansible/vars/projects/libvirt.yml +++ b/lcitool/facts/projects/libvirt.yml diff --git a/lcitool/ansible/vars/projects/osinfo-db-tools+dist.yml b/lcitool/facts/projects/osinfo-db-tools+dist.yml index 8654b89..8654b89 100644 --- a/lcitool/ansible/vars/projects/osinfo-db-tools+dist.yml +++ b/lcitool/facts/projects/osinfo-db-tools+dist.yml diff --git a/lcitool/ansible/vars/projects/osinfo-db-tools.yml b/lcitool/facts/projects/osinfo-db-tools.yml index 0216e47..0216e47 100644 --- a/lcitool/ansible/vars/projects/osinfo-db-tools.yml +++ b/lcitool/facts/projects/osinfo-db-tools.yml diff --git a/lcitool/ansible/vars/projects/osinfo-db.yml b/lcitool/facts/projects/osinfo-db.yml index c4afbdc..c4afbdc 100644 --- a/lcitool/ansible/vars/projects/osinfo-db.yml +++ b/lcitool/facts/projects/osinfo-db.yml diff --git a/lcitool/ansible/vars/projects/qemu+dist.yml b/lcitool/facts/projects/qemu+dist.yml index d112a4f..d112a4f 100644 --- a/lcitool/ansible/vars/projects/qemu+dist.yml +++ b/lcitool/facts/projects/qemu+dist.yml diff --git a/lcitool/ansible/vars/projects/qemu+minimal.yml b/lcitool/facts/projects/qemu+minimal.yml index 618d328..618d328 100644 --- a/lcitool/ansible/vars/projects/qemu+minimal.yml +++ b/lcitool/facts/projects/qemu+minimal.yml diff --git a/lcitool/ansible/vars/projects/qemu.yml b/lcitool/facts/projects/qemu.yml index 425459c..425459c 100644 --- a/lcitool/ansible/vars/projects/qemu.yml +++ b/lcitool/facts/projects/qemu.yml diff --git a/lcitool/ansible/vars/projects/virt-manager.yml b/lcitool/facts/projects/virt-manager.yml index f7109ba..f7109ba 100644 --- a/lcitool/ansible/vars/projects/virt-manager.yml +++ b/lcitool/facts/projects/virt-manager.yml diff --git a/lcitool/ansible/vars/projects/virt-viewer.yml b/lcitool/facts/projects/virt-viewer.yml index 5e861cd..5e861cd 100644 --- a/lcitool/ansible/vars/projects/virt-viewer.yml +++ b/lcitool/facts/projects/virt-viewer.yml diff --git a/lcitool/package.py b/lcitool/package.py index 44e0242..d267e2f 100644 --- a/lcitool/package.py +++ b/lcitool/package.py @@ -8,7 +8,7 @@ Translates generic package mapping names to concrete package names This module takes care of translation of the generic package mapping names -originating from the mappings.yml file (e.g. ansible/vars/mappings.yml) to +originating from the mappings.yml file (e.g. facts/mappings.yml) to specific package names depending on several factors like packaging format, OS distribution, cross building, etc. diff --git a/lcitool/projects.py b/lcitool/projects.py index 9bcab1d..6d8a684 100644 --- a/lcitool/projects.py +++ b/lcitool/projects.py @@ -78,7 +78,7 @@ class Projects(metaclass=Singleton): @staticmethod def _load_projects(): - source = Path(resource_filename(__name__, "ansible/vars/projects")) + source = Path(resource_filename(__name__, "facts/projects")) projects = Projects._load_projects_from_path(source) if util.get_extra_data_dir() is not None: @@ -89,12 +89,12 @@ class Projects(metaclass=Singleton): @staticmethod def _load_internal_projects(): - source = Path(resource_filename(__name__, "ansible/vars/projects/internal")) + source = Path(resource_filename(__name__, "facts/projects/internal")) return Projects._load_projects_from_path(source) def _load_mappings(self): mappings_path = resource_filename(__name__, - "ansible/vars/mappings.yml") + "facts/mappings.yml") try: with open(mappings_path, "r") as infile: |