From 53019323c41d933aa085a69ff8259deee383b9f3 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 22 Apr 2022 11:10:14 +0200 Subject: [PATCH] Fix distro support option for Octavia Distro instalaltion has been broken for a while and CI disabled for it. With this commit we're fixing path and returning back CI testing of it. Change-Id: Ia715e0506e45ead6ed8ecffac3fbd70e9849da13 (cherry picked from commit ebac6ccb5e002b2190c065b468f39506dd7f247a) --- vars/debian.yml | 4 ++-- vars/distro_install.yml | 2 +- vars/redhat.yml | 9 --------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/vars/debian.yml b/vars/debian.yml index 865c4dec..0e28c593 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -31,5 +31,5 @@ octavia_service_distro_packages: - octavia-health-manager - octavia-housekeeping - octavia-worker - - python-pymysql - - python-systemd + - python3-pymysql + - python3-systemd diff --git a/vars/distro_install.yml b/vars/distro_install.yml index 8ccc8375..1a1b4581 100644 --- a/vars/distro_install.yml +++ b/vars/distro_install.yml @@ -1,4 +1,4 @@ --- -octavia_package_list: "{{ octavia_distro_packages + octavia_service_distro_packages + octavia_distro_openstack_clients_packages }}" +octavia_package_list: "{{ octavia_distro_packages + octavia_service_distro_packages }}" _octavia_bin: "/usr/bin" diff --git a/vars/redhat.yml b/vars/redhat.yml index c51ef29e..c232cd19 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -29,12 +29,3 @@ octavia_service_distro_packages: - openstack-octavia-housekeeping - openstack-octavia-worker - python3-systemd - -octavia_distro_openstack_clients_packages: - - python-shade - - python-keystoneclient - - python-neutronclient - - python-novaclient - - python-cinderclient - - python-octaviaclient - - python-openstackclient