Remove neutron-lbaas-dashboard for train and above

The python3-neutron-lbaas-dashboard no longer exists as of
Train. Remove it in favor of the octavia-dashboard subordinate
charm.

This patch also keeps python-cinderclient at a version
that includes v1.client for testing.

Change-Id: Ic8694cd8604aff8be392a31feeccb7fea55d0e41
This commit is contained in:
Corey Bryant 2019-09-12 20:41:22 +00:00
parent 983d7466d4
commit fec0eeb2b7
2 changed files with 7 additions and 3 deletions

View File

@ -278,6 +278,8 @@ def determine_packages():
# NOTE(jamespage): Django in Ubuntu disco or later uses
# mysqldb rather than pymysql.
packages.append('python3-mysqldb')
if release >= 'train':
packages.remove('python3-neutron-lbaas-dashboard')
return list(set(packages))
@ -288,6 +290,7 @@ def determine_purge_packages():
:returns: list of package names
"""
pkgs = []
release = CompareOpenStackReleases(os_release('openstack-dashboard'))
if release >= 'rocky':
pkgs = [p for p in BASE_PACKAGES if p.startswith('python-')]
@ -299,8 +302,9 @@ def determine_purge_packages():
'python-designate-dashboard',
'python-heat-dashboard',
])
return pkgs
return []
if release >= 'train':
pkgs.append('python3-neutron-lbaas-dashboard')
return pkgs
def remove_old_packages():

View File

@ -12,7 +12,7 @@ requests>=2.18.4
amulet>=1.14.3,<2.0;python_version=='2.7'
bundletester>=0.6.1,<1.0;python_version=='2.7'
python-ceilometerclient>=1.5.0
python-cinderclient>=1.4.0
python-cinderclient>=1.4.0,<5.0 # Train cinderclient removes v1.client
python-glanceclient>=1.1.0
python-heatclient>=0.8.0
python-keystoneclient>=1.7.1