diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-09 17:21:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-09 17:21:45 +0000 |
| commit | 9f9e4a517ad93d480c28610d5ba043e12ecc024b (patch) | |
| tree | 1c3fdfcce75f701a79f9e595390f08fb2b623b88 /kolla | |
| parent | 5c08a191e401c0b1cc5646d1fd3386b2b72cad24 (diff) | |
| parent | 6c77d52cda63cc51f6e15943b1733a5100b08392 (diff) | |
| download | kolla-9f9e4a517ad93d480c28610d5ba043e12ecc024b.tar.gz kolla-9f9e4a517ad93d480c28610d5ba043e12ecc024b.zip | |
Merge "Remove opendaylight image"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/image/build.py | 4 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 4b32a0e4a..91c7c5b30 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -81,7 +81,6 @@ STATUS_ERRORS = (STATUS_CONNECTION_ERROR, STATUS_PUSH_ERROR, UNBUILDABLE_IMAGES = { 'aarch64': { "monasca-grafana", # no phantomJS on aarch64 - "opendaylight", # no binary package "prometheus-mtail", # no aarch64 binary "skydive-base", # no aarch64 binary }, @@ -90,7 +89,6 @@ UNBUILDABLE_IMAGES = { "elasticsearch", # no binary package "grafana", # no binary package "monasca-grafana", # no phantomJS - "opendaylight", # no binary package "prometheus-base", # no ppc64le binaries "skydive-base", # no ppc64le binaries "telegraf", # no binary package @@ -129,7 +127,6 @@ UNBUILDABLE_IMAGES = { 'centos': { "hacluster-pcs", # Missing crmsh package "nova-spicehtml5proxy", # Missing spicehtml5 package - "opendaylight", # Missing opendaylight repo "ovsdpdk", # Not supported on CentOS "tgtd", # Not supported on CentOS 8 }, @@ -138,7 +135,6 @@ UNBUILDABLE_IMAGES = { "bifrost-base", # tries to install 'mysql-server' which is not in # Debian 'buster' "monasca-grafana", # FIXME(hrw): some ssl issues to fix - "opendaylight", # no binary package "ovsdpdk", "qdrouterd", }, diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 9b9a4abdb..7ef94c28d 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -68,7 +68,6 @@ ubuntu: influxdb: "deb https://repos.influxdata.com/ubuntu bionic stable" kibana: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main" mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main" - 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" td-agent: "deb http://packages.treasuredata.com/3/ubuntu/bionic/ bionic contrib" |