diff options
| author | Zuul <zuul@review.opendev.org> | 2024-04-16 16:06:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-04-16 16:06:11 +0000 |
| commit | 9efdd6d151ad6d558d9f277dfef7369fb0997705 (patch) | |
| tree | 10ff526f105c47853a69f95363ba6fb6b3a2b731 /kolla | |
| parent | bc30edef90b31213644d85e54420ec255a9f134e (diff) | |
| parent | 4d9379ecc8d3c66902763aca0ae14643350a8976 (diff) | |
| download | kolla-9efdd6d151ad6d558d9f277dfef7369fb0997705.tar.gz kolla-9efdd6d151ad6d558d9f277dfef7369fb0997705.zip | |
Merge "Drop Sahara"
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 1 | ||||
| -rw-r--r-- | kolla/common/sources.py | 32 | ||||
| -rw-r--r-- | kolla/common/users.py | 2 |
3 files changed, 1 insertions, 34 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 21979997b..9c2e2efd3 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -102,7 +102,6 @@ _PROFILE_OPTS = [ 'mistral', 'octavia', 'redis', - 'sahara', 'solum', 'tacker', 'telegraf', diff --git a/kolla/common/sources.py b/kolla/common/sources.py index ab2a9d40b..6f8e03273 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -139,10 +139,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/octavia-dashboard/' 'octavia-dashboard-${openstack_branch}.tar.gz')}, - 'horizon-plugin-sahara-dashboard': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/sahara-dashboard/' - 'sahara-dashboard-${openstack_branch}.tar.gz')}, 'horizon-plugin-solum-dashboard': { 'type': 'url', 'location': ('$tarballs_base/openstack/solum-dashboard/' @@ -416,34 +412,6 @@ SOURCES = { 'releases/download/v${version}/' 'prometheus' '-${version}.linux-${debian_arch}.tar.gz')}, - 'sahara-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/sahara/' - 'sahara-${openstack_branch}.tar.gz')}, - 'sahara-base-plugin-ambari': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/sahara-plugin-ambari/' - 'sahara-plugin-ambari-${openstack_branch}.tar.gz')}, - 'sahara-base-plugin-cdh': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/sahara-plugin-cdh/' - 'sahara-plugin-cdh-${openstack_branch}.tar.gz')}, - 'sahara-base-plugin-mapr': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/sahara-plugin-mapr/' - 'sahara-plugin-mapr-${openstack_branch}.tar.gz')}, - 'sahara-base-plugin-spark': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/sahara-plugin-spark/' - 'sahara-plugin-spark-${openstack_branch}.tar.gz')}, - 'sahara-base-plugin-storm': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/sahara-plugin-storm/' - 'sahara-plugin-storm-${openstack_branch}.tar.gz')}, - 'sahara-base-plugin-vanilla': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/sahara-plugin-vanilla/' - 'sahara-plugin-vanilla-${openstack_branch}.tar.gz')}, 'skyline-apiserver': { 'type': 'url', 'location': ('$tarballs_base/openstack/skyline-apiserver/' diff --git a/kolla/common/users.py b/kolla/common/users.py index 5b0e2da74..f3c559f52 100644 --- a/kolla/common/users.py +++ b/kolla/common/users.py @@ -161,7 +161,7 @@ USERS = { 'uid': 42440, 'gid': 42440, }, - 'sahara-user': { + 'sahara-user': { # unused user (sahara dropped) 'uid': 42441, 'gid': 42441, }, |