diff options
| author | Zuul <zuul@review.opendev.org> | 2025-03-24 14:07:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-03-24 14:07:09 +0000 |
| commit | 7667e2493116534e87ab511b5ff0ba6770f2ee92 (patch) | |
| tree | 2b4582c7bdf44a002e306128c9ac5e929e73314a /kolla | |
| parent | dc0fbd20a1b7e0bb12fd2e14a2f27cd283b61967 (diff) | |
| parent | f2fba3842cd520161f5c136297d806e9fe4d7521 (diff) | |
| download | kolla-7667e2493116534e87ab511b5ff0ba6770f2ee92.tar.gz kolla-7667e2493116534e87ab511b5ff0ba6770f2ee92.zip | |
Merge "Remove swift container images"
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 1 | ||||
| -rw-r--r-- | kolla/common/sources.py | 4 | ||||
| -rw-r--r-- | kolla/common/users.py | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 1b2c547f9..14bfc00de 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -81,7 +81,6 @@ _PROFILE_OPTS = [ 'neutron', 'nova-', 'placement', - 'swift', ], help='Main images'), cfg.ListOpt('aux', diff --git a/kolla/common/sources.py b/kolla/common/sources.py index 4488cad01..2cbfbf887 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -413,10 +413,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/skyline-console/' 'skyline-console-${openstack_branch}.tar.gz')}, - 'swift-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/swift/' - 'swift-${openstack_branch}.tar.gz')}, 'tacker-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/tacker/' diff --git a/kolla/common/users.py b/kolla/common/users.py index 791ebab88..2675ae80a 100644 --- a/kolla/common/users.py +++ b/kolla/common/users.py @@ -173,7 +173,7 @@ USERS = { 'uid': 42444, 'gid': 42444, }, - 'swift-user': { + 'swift-user': { # unused user (swift dropped) 'uid': 42445, 'gid': 42445, }, |