diff options
| author | Zuul <zuul@review.opendev.org> | 2021-06-21 14:17:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-06-21 14:17:40 +0000 |
| commit | 7de35786d2ecc985ad1c94bc9db7b2566048bf9e (patch) | |
| tree | 57a3fddcb5f035b566483c34c9be504b430bff0c /kolla | |
| parent | 8ec8ef3d8a1a852187bbaf4b592f0739e2796abd (diff) | |
| parent | e6cea7b93df7b60619c1348f18356579bf4e0946 (diff) | |
| download | kolla-7de35786d2ecc985ad1c94bc9db7b2566048bf9e.tar.gz kolla-7de35786d2ecc985ad1c94bc9db7b2566048bf9e.zip | |
Merge "Remove rally"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 11 | ||||
| -rwxr-xr-x | kolla/image/build.py | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index a14055100..56887b398 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -106,7 +106,6 @@ _PROFILE_OPTS = [ 'monasca', 'murano', 'octavia', - 'rally', 'redis', 'sahara', 'senlin', @@ -641,14 +640,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/watcher-tempest-plugin/' 'watcher-tempest-plugin-2.2.0.tar.gz')}, - 'rally': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/rally/' - 'rally-3.2.0.tar.gz')}, - 'rally-plugin-openstack': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/rally-openstack/' - 'rally-openstack-2.1.0.tar.gz')}, 'sahara-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/sahara/' @@ -875,7 +866,7 @@ USERS = { 'uid': 42439, 'gid': 42439, }, - 'rally-user': { + 'rally-user': { # unused user (rally dropped) 'uid': 42440, 'gid': 42440, }, diff --git a/kolla/image/build.py b/kolla/image/build.py index 0e76ac919..095d2ee6a 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -147,7 +147,6 @@ UNBUILDABLE_IMAGES = { 'ubuntu+binary': { "cloudkitty-base", "ironic-neutron-agent", - "rally", "senlin-conductor", # no binary package "senlin-health-manager", # no binary package "tacker-base", |