diff options
| author | Ghanshyam Mann <gmann@ghanshyammann.com> | 2020-11-28 09:54:51 -0600 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-12-11 14:21:10 +0000 |
| commit | d66ff8d3a3eaf22c2106fd0cffd26a243a40aa9b (patch) | |
| tree | 18c80d80da3be79d3d37a8034486a6a3702c447b /kolla | |
| parent | 865f55d4ec408f1e0a5fd8ef4f77edc566c8eb75 (diff) | |
| download | kolla-d66ff8d3a3eaf22c2106fd0cffd26a243a40aa9b.tar.gz kolla-d66ff8d3a3eaf22c2106fd0cffd26a243a40aa9b.zip | |
Remove retired Qinling support and images
Qinling project is retiring in Wallaby cycle[1].
This commit removes the usages of Qinling project
before its code is removed.
Needed-By: https://review.opendev.org/c/openstack/qinling/+/764521
[1] http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018638.html
Change-Id: I5bb79f08b76830981be95df19f3a33f5fda6893d
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 13 | ||||
| -rwxr-xr-x | kolla/image/build.py | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 4c7eda2f8..a2841fdd4 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -112,7 +112,6 @@ _PROFILE_OPTS = [ 'novajoin', 'octavia', 'panko', - 'qinling', 'rally', 'redis', 'sahara', @@ -419,10 +418,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/octavia-dashboard/' 'octavia-dashboard-${openstack_branch}.tar.gz')}, - 'horizon-plugin-qinling-dashboard': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/qinling-dashboard/' - 'qinling-dashboard-${openstack_branch}.tar.gz')}, 'horizon-plugin-sahara-dashboard': { 'type': 'url', 'location': ('$tarballs_base/openstack/sahara-dashboard/' @@ -624,10 +619,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/placement/' 'placement-${openstack_branch}.tar.gz')}, - 'qinling-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/qinling/' - 'qinling-${openstack_branch}.tar.gz')}, 'tempest-plugin-tempest-conf': { 'type': 'url', 'location': ('$tarballs_base/openstack/python-tempestconf/' @@ -1122,10 +1113,6 @@ USERS = { 'uid': 42483, 'gid': 42483, }, - 'qinling-user': { - 'uid': 42484, - 'gid': 42484, - }, 'masakari-user': { 'uid': 42485, 'gid': 42485, diff --git a/kolla/image/build.py b/kolla/image/build.py index 0c9f74fa1..8a4e48bf3 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -107,7 +107,6 @@ UNBUILDABLE_IMAGES = { "monasca-base", "monasca-thresh", "nova-mksproxy", - "qinling-base", "searchlight-base", "solum-base", "vmtp", |