openstack
/
kolla
Code Issues Proposed changes

Bump versions for Stein 

Also, make Bifrost buildable again. The longstanding Bifrost issues in
Stein have now been fixed [1] for CentOS.

[1] https://review.opendev.org/#/c/749014/

Change-Id: I030bbe32bd489c3031b065f74de83c658356d4b2
This commit is contained in:
Mark Goddard 2020-10-12 14:32:17 +01:00
parent c6835b12a6
commit f203662859
2 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
kolla/common/config.py
View File

@ -307,23 +307,23 @@ SOURCES = {
'aodh-base': { 'aodh-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/aodh/' 'location': ('$tarballs_base/aodh/'
'aodh-8.0.0.tar.gz')}, 'aodh-8.0.1.tar.gz')},
'barbican-base': { 'barbican-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/barbican/' 'location': ('$tarballs_base/barbican/'
'barbican-8.0.0.tar.gz')}, 'barbican-8.0.1.tar.gz')},
'bifrost-base': { 'bifrost-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/bifrost/' 'location': ('$tarballs_base/bifrost/'
'bifrost-6.0.4.tar.gz')}, 'bifrost-6.0.5.tar.gz')},
'blazar-base': { 'blazar-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/blazar/' 'location': ('$tarballs_base/blazar/'
'blazar-3.0.0.tar.gz')}, 'blazar-3.0.1.tar.gz')},
'ceilometer-base': { 'ceilometer-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/ceilometer/' 'location': ('$tarballs_base/ceilometer/'
'ceilometer-12.1.0.tar.gz')}, 'ceilometer-12.1.1.tar.gz')},
'ceilometer-base-plugin-panko': { 'ceilometer-base-plugin-panko': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/panko/' 'location': ('$tarballs_base/panko/'
@ -331,7 +331,7 @@ SOURCES = {
'cinder-base': { 'cinder-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/cinder/' 'location': ('$tarballs_base/cinder/'
'cinder-14.1.0.tar.gz')}, 'cinder-14.3.0.tar.gz')},
'congress-base': { 'congress-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/congress/' 'location': ('$tarballs_base/congress/'
@ -339,7 +339,7 @@ SOURCES = {
'cloudkitty-base': { 'cloudkitty-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/cloudkitty/' 'location': ('$tarballs_base/cloudkitty/'
'cloudkitty-9.0.0.tar.gz')}, 'cloudkitty-9.0.1.tar.gz')},
'crane': { 'crane': {
'type': 'url', 'type': 'url',
'location': ('https://github.com/pulp/crane/archive/3.3.0.tar.gz')}, 'location': ('https://github.com/pulp/crane/archive/3.3.0.tar.gz')},
@ -350,7 +350,7 @@ SOURCES = {
'designate-base': { 'designate-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/designate/' 'location': ('$tarballs_base/designate/'
'designate-8.0.0.tar.gz')}, 'designate-8.0.1.tar.gz')},
'dragonflow-base': { 'dragonflow-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/dragonflow/' 'location': ('$tarballs_base/dragonflow/'
@ -379,15 +379,15 @@ SOURCES = {
'heat-base': { 'heat-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/heat/' 'location': ('$tarballs_base/heat/'
'openstack-heat-12.1.0.tar.gz')}, 'openstack-heat-12.2.0.tar.gz')},
'horizon': { 'horizon': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/horizon/' 'location': ('$tarballs_base/horizon/'
'horizon-15.3.0.tar.gz')}, 'horizon-15.3.1.tar.gz')},
'horizon-plugin-blazar-dashboard': { 'horizon-plugin-blazar-dashboard': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/blazar-dashboard/' 'location': ('$tarballs_base/blazar-dashboard/'
'blazar-dashboard-1.3.0.tar.gz')}, 'blazar-dashboard-1.3.1.tar.gz')},
'horizon-plugin-congress-dashboard': { 'horizon-plugin-congress-dashboard': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/congress-dashboard/' 'location': ('$tarballs_base/congress-dashboard/'
@ -411,7 +411,7 @@ SOURCES = {
'horizon-plugin-heat-dashboard': { 'horizon-plugin-heat-dashboard': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/heat-dashboard/' 'location': ('$tarballs_base/heat-dashboard/'
'heat-dashboard-1.5.0.tar.gz')}, 'heat-dashboard-1.5.1.tar.gz')},
'horizon-plugin-ironic-ui': { 'horizon-plugin-ironic-ui': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/ironic-ui/' 'location': ('$tarballs_base/ironic-ui/'
@ -435,7 +435,7 @@ SOURCES = {
'horizon-plugin-monasca-ui': { 'horizon-plugin-monasca-ui': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/monasca-ui/' 'location': ('$tarballs_base/monasca-ui/'
'monasca-ui-1.15.0.tar.gz')}, 'monasca-ui-1.15.1.tar.gz')},
'horizon-plugin-murano-dashboard': { 'horizon-plugin-murano-dashboard': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/murano-dashboard/' 'location': ('$tarballs_base/murano-dashboard/'
@ -443,7 +443,7 @@ SOURCES = {
'horizon-plugin-neutron-lbaas-dashboard': { 'horizon-plugin-neutron-lbaas-dashboard': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/neutron-lbaas-dashboard/' 'location': ('$tarballs_base/neutron-lbaas-dashboard/'
'neutron-lbaas-dashboard-6.0.0.tar.gz')}, 'neutron-lbaas-dashboard-6.0.1.tar.gz')},
'horizon-plugin-neutron-vpnaas-dashboard': { 'horizon-plugin-neutron-vpnaas-dashboard': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/neutron-vpnaas-dashboard/' 'location': ('$tarballs_base/neutron-vpnaas-dashboard/'
@ -451,11 +451,11 @@ SOURCES = {
'horizon-plugin-octavia-dashboard': { 'horizon-plugin-octavia-dashboard': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/octavia-dashboard/' 'location': ('$tarballs_base/octavia-dashboard/'
'octavia-dashboard-3.0.1.tar.gz')}, 'octavia-dashboard-3.1.0.tar.gz')},
'horizon-plugin-sahara-dashboard': { 'horizon-plugin-sahara-dashboard': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/sahara-dashboard/' 'location': ('$tarballs_base/sahara-dashboard/'
'sahara-dashboard-10.0.1.tar.gz')}, 'sahara-dashboard-10.0.2.tar.gz')},
'horizon-plugin-searchlight-ui': { 'horizon-plugin-searchlight-ui': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/searchlight-ui/' 'location': ('$tarballs_base/searchlight-ui/'
@ -471,7 +471,7 @@ SOURCES = {
'horizon-plugin-tacker-dashboard': { 'horizon-plugin-tacker-dashboard': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/tacker-horizon/' 'location': ('$tarballs_base/tacker-horizon/'
'tacker-horizon-0.14.0.tar.gz')}, 'tacker-horizon-0.14.1.tar.gz')},
'horizon-plugin-trove-dashboard': { 'horizon-plugin-trove-dashboard': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/trove-dashboard/' 'location': ('$tarballs_base/trove-dashboard/'
@ -495,11 +495,11 @@ SOURCES = {
'ironic-base': { 'ironic-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/ironic/' 'location': ('$tarballs_base/ironic/'
'ironic-12.1.4.tar.gz')}, 'ironic-12.1.5.tar.gz')},
'ironic-inspector': { 'ironic-inspector': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/ironic-inspector/' 'location': ('$tarballs_base/ironic-inspector/'
'ironic-inspector-8.2.4.tar.gz')}, 'ironic-inspector-8.2.5.tar.gz')},
'karbor-base': { 'karbor-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/karbor/' 'location': ('$tarballs_base/karbor/'
@ -515,15 +515,15 @@ SOURCES = {
'kuryr-libnetwork': { 'kuryr-libnetwork': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/kuryr-libnetwork/' 'location': ('$tarballs_base/kuryr-libnetwork/'
'kuryr-libnetwork-3.0.0.tar.gz')}, 'kuryr-libnetwork-3.0.1.tar.gz')},
'magnum-base': { 'magnum-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/magnum/' 'location': ('$tarballs_base/magnum/'
'magnum-8.2.0.tar.gz')}, 'magnum-8.2.1.tar.gz')},
'manila-base': { 'manila-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/manila/' 'location': ('$tarballs_base/manila/'
'manila-8.1.2.tar.gz')}, 'manila-8.1.3.tar.gz')},
'mistral-base': { 'mistral-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/mistral/' 'location': ('$tarballs_base/mistral/'
@ -531,15 +531,15 @@ SOURCES = {
'mistral-base-plugin-tacker': { 'mistral-base-plugin-tacker': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/tacker/' 'location': ('$tarballs_base/tacker/'
'tacker-1.0.0.tar.gz')}, 'tacker-1.0.1.tar.gz')},
'monasca-agent': { 'monasca-agent': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/monasca-agent/' 'location': ('$tarballs_base/monasca-agent/'
'monasca-agent-2.10.0.tar.gz')}, 'monasca-agent-2.10.1.tar.gz')},
'monasca-api': { 'monasca-api': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/monasca-api/' 'location': ('$tarballs_base/monasca-api/'
'monasca-api-3.0.0.tar.gz')}, 'monasca-api-3.0.1.tar.gz')},
'monasca-log-api': { 'monasca-log-api': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/monasca-log-api/' 'location': ('$tarballs_base/monasca-log-api/'
@ -547,7 +547,7 @@ SOURCES = {
'monasca-notification': { 'monasca-notification': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/monasca-notification/' 'location': ('$tarballs_base/monasca-notification/'
'monasca-notification-1.17.0.tar.gz')}, 'monasca-notification-1.17.1.tar.gz')},
'monasca-persister': { 'monasca-persister': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/monasca-persister/' 'location': ('$tarballs_base/monasca-persister/'
@ -568,11 +568,11 @@ SOURCES = {
'murano-base': { 'murano-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/murano/' 'location': ('$tarballs_base/murano/'
'murano-7.0.0.tar.gz')}, 'murano-7.1.0.tar.gz')},
'neutron-base': { 'neutron-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/neutron/' 'location': ('$tarballs_base/neutron/'
'neutron-14.2.0.tar.gz')}, 'neutron-14.4.0.tar.gz')},
'neutron-base-plugin-neutron-fwaas': { 'neutron-base-plugin-neutron-fwaas': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/neutron-fwaas/' 'location': ('$tarballs_base/neutron-fwaas/'
@ -648,15 +648,15 @@ SOURCES = {
'neutron-server-ovn-plugin-networking-ovn': { 'neutron-server-ovn-plugin-networking-ovn': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/networking-ovn/' 'location': ('$tarballs_base/networking-ovn/'
'networking-ovn-6.1.0.tar.gz')}, 'networking-ovn-6.1.1.tar.gz')},
'neutron-metadata-agent-ovn-plugin-networking-ovn': { 'neutron-metadata-agent-ovn-plugin-networking-ovn': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/networking-ovn/' 'location': ('$tarballs_base/networking-ovn/'
'networking-ovn-6.1.0.tar.gz')}, 'networking-ovn-6.1.1.tar.gz')},
'nova-base': { 'nova-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/nova/' 'location': ('$tarballs_base/nova/'
'nova-19.2.0.tar.gz')}, 'nova-19.3.1.tar.gz')},
'nova-base-plugin-blazar': { 'nova-base-plugin-blazar': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/blazar-nova/' 'location': ('$tarballs_base/blazar-nova/'
@ -672,7 +672,7 @@ SOURCES = {
'octavia-base': { 'octavia-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/octavia/' 'location': ('$tarballs_base/octavia/'
'octavia-4.1.2.tar.gz')}, 'octavia-4.1.3.tar.gz')},
'panko-base': { 'panko-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/panko/' 'location': ('$tarballs_base/panko/'
@ -784,7 +784,7 @@ SOURCES = {
'sahara-base-plugin-mapr': { 'sahara-base-plugin-mapr': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/sahara-plugin-mapr/' 'location': ('$tarballs_base/sahara-plugin-mapr/'
'sahara-plugin-mapr-1.0.1.tar.gz')}, 'sahara-plugin-mapr-1.0.2.tar.gz')},
'sahara-base-plugin-spark': { 'sahara-base-plugin-spark': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/sahara-plugin-spark/' 'location': ('$tarballs_base/sahara-plugin-spark/'
@ -808,7 +808,7 @@ SOURCES = {
'solum-base': { 'solum-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/solum/' 'location': ('$tarballs_base/solum/'
'solum-6.0.0.tar.gz')}, 'solum-6.0.1.tar.gz')},
'swift-base': { 'swift-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/swift/' 'location': ('$tarballs_base/swift/'
@ -816,7 +816,7 @@ SOURCES = {
'tacker-base': { 'tacker-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/tacker/' 'location': ('$tarballs_base/tacker/'
'tacker-1.0.0.tar.gz')}, 'tacker-1.0.1.tar.gz')},
'tacker-base-plugin-networking-sfc': { 'tacker-base-plugin-networking-sfc': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/networking-sfc/' 'location': ('$tarballs_base/networking-sfc/'
@ -840,7 +840,7 @@ SOURCES = {
'vitrage-base': { 'vitrage-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/vitrage/' 'location': ('$tarballs_base/vitrage/'
'vitrage-4.3.1.tar.gz')}, 'vitrage-4.3.2.tar.gz')},
'vmtp': { 'vmtp': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/vmtp/' 'location': ('$tarballs_base/vmtp/'
@ -852,11 +852,11 @@ SOURCES = {
'zaqar-base': { 'zaqar-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/zaqar/' 'location': ('$tarballs_base/zaqar/'
'zaqar-8.0.0.tar.gz')}, 'zaqar-8.0.1.tar.gz')},
'zun-base': { 'zun-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/zun/' 'location': ('$tarballs_base/zun/'
'zun-3.0.0.tar.gz')} 'zun-3.0.1.tar.gz')}
} }

3
kolla/image/build.py
View File

@ -97,9 +97,6 @@ SKIPPED_IMAGES = {
"zun-base", "zun-base",
], ],
'centos+source': [ 'centos+source': [
# FIXME(yoctozepto): temporary block due to upstream issues
"bifrost-base",
"ovsdpdk", "ovsdpdk",
"tripleoclient", "tripleoclient",
# TODO(jeffrey4l): remove tripleo-ui when following bug is fixed # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed