diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-07 08:50:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-07 08:50:48 +0000 |
| commit | 4f4b0126a9316b2746306eec86c1224f220aef1c (patch) | |
| tree | f6a9aba9b349e9a201a68cd9e3b0af1d6c1b6de9 /kolla | |
| parent | 22d7ffa382ea7a7a6bd0ac1b46699529175d7328 (diff) | |
| parent | 0cfd36292cccb8d3af9c65a1dff9696f50870df6 (diff) | |
| download | kolla-4f4b0126a9316b2746306eec86c1224f220aef1c.tar.gz kolla-4f4b0126a9316b2746306eec86c1224f220aef1c.zip | |
Merge "Remove sensu images"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 2 | ||||
| -rwxr-xr-x | kolla/image/build.py | 7 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 7648b04a0..6983e44e8 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -1072,7 +1072,7 @@ USERS = { 'uid': 42466, 'gid': 42466, }, - 'sensu-user': { + 'sensu-user': { # unused used (sensu dropped) 'uid': 42467, 'gid': 42467, }, diff --git a/kolla/image/build.py b/kolla/image/build.py index 96ae2d58d..4b32a0e4a 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -131,7 +131,6 @@ UNBUILDABLE_IMAGES = { "nova-spicehtml5proxy", # Missing spicehtml5 package "opendaylight", # Missing opendaylight repo "ovsdpdk", # Not supported on CentOS - "sensu-base", # Dropped by CentOS "tgtd", # Not supported on CentOS 8 }, @@ -142,7 +141,6 @@ UNBUILDABLE_IMAGES = { "opendaylight", # no binary package "ovsdpdk", "qdrouterd", - "sensu-base", }, 'ubuntu': { @@ -151,11 +149,6 @@ UNBUILDABLE_IMAGES = { 'ubuntu+aarch64': { "kibana", # no binary package - "sensu-base", # no binary package - }, - - 'ubuntu+ppc64le': { - "sensu-base", # no binary package }, 'centos+aarch64': { diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 63f02cba2..9b9a4abdb 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -71,7 +71,6 @@ ubuntu: opendaylight: "deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main" qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main" - sensu: "deb https://sensu.global.ssl.fastly.net/apt bionic main" td-agent: "deb http://packages.treasuredata.com/3/ubuntu/bionic/ bionic contrib" ubuntu-aarch64: |