openstack
/
kolla
Code Issues Proposed changes

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 <zhang.lei.fly@gmail.com>
Change-Id: Ibaaf1de0c437ce9d25c93e68ab5a43279c4e60ee
This commit is contained in:
confi-surya 2018-04-25 10:47:52 +09:00
parent cc3c3ee268
commit 2aefc3d8fa
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kolla/common/config.py
View File

@ -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/'

9
kolla/image/build.py
View File

@ -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