aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-07-06 11:33:24 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-07-06 11:50:12 +0200
commit0cfd36292cccb8d3af9c65a1dff9696f50870df6 (patch)
tree31486bf7feb260ddfddfde5302bd879343a47c68 /kolla
parentacf1600973a2e6c239538384a34feb41d080141e (diff)
downloadkolla-0cfd36292cccb8d3af9c65a1dff9696f50870df6.tar.gz
kolla-0cfd36292cccb8d3af9c65a1dff9696f50870df6.zip
Remove sensu images
They have been deprecated in Ussuri [1]. [1]: https://review.opendev.org/#/c/711636/ Change-Id: I0cfde46c29eedce77c70c1c677220814a801ff3a
Diffstat (limited to 'kolla')
-rwxr-xr-xkolla/common/config.py2
-rwxr-xr-xkolla/image/build.py7
-rw-r--r--kolla/template/repos.yaml1
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 e432bfb9a..448606908 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -132,7 +132,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
},
@@ -143,7 +142,6 @@ UNBUILDABLE_IMAGES = {
"opendaylight", # no binary package
"ovsdpdk",
"qdrouterd",
- "sensu-base",
},
'ubuntu': {
@@ -152,11 +150,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: