diff options
| author | Zuul <zuul@review.opendev.org> | 2024-04-16 14:14:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-04-16 14:14:02 +0000 |
| commit | bc30edef90b31213644d85e54420ec255a9f134e (patch) | |
| tree | 83879b1c882d5ce9e1c041f56fae9539d67f583e /kolla | |
| parent | cdc89a75f6d845a507f515e8cd3467b99ebdc2e5 (diff) | |
| parent | 14a2e37f00a8197de97f88eebe88b2ff385b4ccb (diff) | |
| download | kolla-bc30edef90b31213644d85e54420ec255a9f134e.tar.gz kolla-bc30edef90b31213644d85e54420ec255a9f134e.zip | |
Merge "Drop Senlin"
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 1 | ||||
| -rw-r--r-- | kolla/common/sources.py | 8 | ||||
| -rw-r--r-- | kolla/common/users.py | 2 |
3 files changed, 1 insertions, 10 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index ab13f1154..21979997b 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -103,7 +103,6 @@ _PROFILE_OPTS = [ 'octavia', 'redis', 'sahara', - 'senlin', 'solum', 'tacker', 'telegraf', diff --git a/kolla/common/sources.py b/kolla/common/sources.py index fa1ddda7d..ab2a9d40b 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -143,10 +143,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/sahara-dashboard/' 'sahara-dashboard-${openstack_branch}.tar.gz')}, - 'horizon-plugin-senlin-dashboard': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/senlin-dashboard/' - 'senlin-dashboard-${openstack_branch}.tar.gz')}, 'horizon-plugin-solum-dashboard': { 'type': 'url', 'location': ('$tarballs_base/openstack/solum-dashboard/' @@ -448,10 +444,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/sahara-plugin-vanilla/' 'sahara-plugin-vanilla-${openstack_branch}.tar.gz')}, - 'senlin-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/senlin/' - 'senlin-${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 8f6c2144d..5b0e2da74 100644 --- a/kolla/common/users.py +++ b/kolla/common/users.py @@ -165,7 +165,7 @@ USERS = { 'uid': 42441, 'gid': 42441, }, - 'senlin-user': { + 'senlin-user': { # unused user (senlin dropped) 'uid': 42443, 'gid': 42443, }, |