aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-04-11 14:50:59 +0000
committerGerrit Code Review <review@openstack.org>2022-04-11 14:50:59 +0000
commitcb3b95c767ec2411e3bbc047fdc7bd175f3681b7 (patch)
tree7aa246d1c8cf4a0c48f38f29302ceaafdcb97dd9 /kolla
parentd549ad4c0b0cb1505a41426f852bff2d85dd882f (diff)
parentf4319f8247057bf0c418e738dc2ebadd13b01989 (diff)
downloadkolla-cb3b95c767ec2411e3bbc047fdc7bd175f3681b7.tar.gz
kolla-cb3b95c767ec2411e3bbc047fdc7bd175f3681b7.zip
Merge "Drop qdrouterd image"
Diffstat (limited to 'kolla')
-rwxr-xr-xkolla/common/config.py3
-rwxr-xr-xkolla/image/build.py2
2 files changed, 1 insertions, 4 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index fa5ade8ea..6443036cf 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -64,7 +64,6 @@ _PROFILE_OPTS = [
'memcached',
'openvswitch',
'proxysql',
- 'qdrouterd',
'rabbitmq',
'redis',
'skydive',
@@ -871,7 +870,7 @@ USERS = {
'uid': 42464,
'gid': 42464,
},
- 'qdrouterd-user': {
+ 'qdrouterd-user': { # unused user (qdrouterd dropped)
'uid': 42465,
'gid': 42465,
},
diff --git a/kolla/image/build.py b/kolla/image/build.py
index a93661f6e..23dbc2d28 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -97,11 +97,9 @@ UNBUILDABLE_IMAGES = {
},
'debian': {
- "qdrouterd", # no qdrouterd package in Debian bullseye
},
'ubuntu': {
- "qdrouterd", # There is no qdrouterd package for Ubuntu
},
'ubuntu+aarch64': {