diff --git a/tasks/main.yml b/tasks/main.yml index e3346c0..aad2a7e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -50,6 +50,7 @@ import_role: name: "python_venv_build" vars: + venv_build_distro_package_list: "{{ gnocchi_devel_distro_packages }}" venv_python_executable: "{{ gnocchi_venv_python_executable }}" venv_build_constraints: "{{ gnocchi_git_constraints }}" venv_install_destination_path: "{{ gnocchi_bin | dirname }}" diff --git a/vars/debian.yml b/vars/debian.yml index 93defb4..2c0beb4 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -16,13 +16,16 @@ cache_timeout: 600 #: Necessary packages -gnocchi_distro_packages: +gnocchi_devel_distro_packages: - build-essential - git - libpq-dev - librados-dev - libsystemd-dev - - python-dev + - python3-dev + +gnocchi_distro_packages: + - libxml2 # NOTE(noonedeadpunk): These variables are left for migration from apache to uwsgi # which was introduced during train release. They can be dropped afterwards. @@ -30,4 +33,4 @@ gnocchi_system_service_name: apache2 gnocchi_apache_config: - "/etc/apache2/sites-enabled/gnocchi-httpd.conf" - "/etc/apache2/sites-available/gnocchi-httpd.conf" -gnocchi_apache_ports: "/etc/apache2/ports.conf" \ No newline at end of file +gnocchi_apache_ports: "/etc/apache2/ports.conf" diff --git a/vars/redhat.yml b/vars/redhat.yml index b9cb78f..ff9daad 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -14,7 +14,7 @@ # limitations under the License. #: Necessary packages -gnocchi_distro_packages: +gnocchi_devel_distro_packages: - '@Development Tools' - git - librados2-devel @@ -23,6 +23,9 @@ gnocchi_distro_packages: - systemd-devel - which +gnocchi_distro_packages: + - libxml2 + # NOTE(noonedeadpunk): These variables are left for migration from apache to uwsgi # which was introduced during train release. They can be dropped afterwards. gnocchi_system_service_name: httpd