From 2aefc3d8fae53fac6d354d42c230eeff8815e96d Mon Sep 17 00:00:00 2001 From: confi-surya Date: Wed, 25 Apr 2018 10:47:52 +0900 Subject: Revert "Add networking-odl image to skipped image list" This reverts commit I57594742e0842c0e701b9974046d9d1704446f4b Add ceilometer package into neutron-server-opendaylight container, then it chould be found by pip. Closes-Bug: #1764621 Co-Authored-By: Jeffrey Zhang Change-Id: Ibaaf1de0c437ce9d25c93e68ab5a43279c4e60ee --- kolla/common/config.py | 4 ++++ kolla/image/build.py | 9 --------- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'kolla') diff --git a/kolla/common/config.py b/kolla/common/config.py index 0a9258d0a..5ac5df895 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -579,6 +579,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/neutron-lbaas/' 'neutron-lbaas-master.tar.gz')}, + 'neutron-server-opendaylight-plugin-ceilometer': { + 'type': 'url', + 'location': ('$tarballs_base/ceilometer/' + 'ceilometer-master.tar.gz')}, 'neutron-server-opendaylight-plugin-networking-odl': { 'type': 'url', 'location': ('$tarballs_base/networking-odl/' diff --git a/kolla/image/build.py b/kolla/image/build.py index 782837799..a690e98b5 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -96,9 +96,6 @@ SKIPPED_IMAGES = { "zun-base", ], 'centos+source': [ - # TODO(spsurya): remove neutron-server-opendaylight fix below issue - # https://bugs.launchpad.net/kolla/+bug/1764621 - "neutron-server-opendaylight", "ovsdpdk", # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed # https://bugs.launchpad.net/tripleo/+bug/1744215 @@ -135,9 +132,6 @@ SKIPPED_IMAGES = { "zun-base", ], 'ubuntu+source': [ - # TODO(spsurya): remove neutron-server-opendaylight fix below issue - # https://bugs.launchpad.net/kolla/+bug/1764621 - "neutron-server-opendaylight", # There is no qdrouterd package for ubuntu bionic "qdrouterd", # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed @@ -197,9 +191,6 @@ SKIPPED_IMAGES = { ], 'oraclelinux+source': [ "bifrost-base", - # TODO(spsurya): remove neutron-server-opendaylight fix below issue - # https://bugs.launchpad.net/kolla/+bug/1764621 - "neutron-server-opendaylight", "ovsdpdk", # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed # https://bugs.launchpad.net/tripleo/+bug/1744215 -- cgit v1.2.3