From f2036628594fc90e617dac0aa55339428bc62921 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 12 Oct 2020 14:32:17 +0100 Subject: [PATCH] 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 --- kolla/common/config.py | 76 +++++++++++++++++++++--------------------- kolla/image/build.py | 3 -- 2 files changed, 38 insertions(+), 41 deletions(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index dfb7d06fbc..b9daef7bfc 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -307,23 +307,23 @@ SOURCES = { 'aodh-base': { 'type': 'url', 'location': ('$tarballs_base/aodh/' - 'aodh-8.0.0.tar.gz')}, + 'aodh-8.0.1.tar.gz')}, 'barbican-base': { 'type': 'url', 'location': ('$tarballs_base/barbican/' - 'barbican-8.0.0.tar.gz')}, + 'barbican-8.0.1.tar.gz')}, 'bifrost-base': { 'type': 'url', 'location': ('$tarballs_base/bifrost/' - 'bifrost-6.0.4.tar.gz')}, + 'bifrost-6.0.5.tar.gz')}, 'blazar-base': { 'type': 'url', 'location': ('$tarballs_base/blazar/' - 'blazar-3.0.0.tar.gz')}, + 'blazar-3.0.1.tar.gz')}, 'ceilometer-base': { 'type': 'url', 'location': ('$tarballs_base/ceilometer/' - 'ceilometer-12.1.0.tar.gz')}, + 'ceilometer-12.1.1.tar.gz')}, 'ceilometer-base-plugin-panko': { 'type': 'url', 'location': ('$tarballs_base/panko/' @@ -331,7 +331,7 @@ SOURCES = { 'cinder-base': { 'type': 'url', 'location': ('$tarballs_base/cinder/' - 'cinder-14.1.0.tar.gz')}, + 'cinder-14.3.0.tar.gz')}, 'congress-base': { 'type': 'url', 'location': ('$tarballs_base/congress/' @@ -339,7 +339,7 @@ SOURCES = { 'cloudkitty-base': { 'type': 'url', 'location': ('$tarballs_base/cloudkitty/' - 'cloudkitty-9.0.0.tar.gz')}, + 'cloudkitty-9.0.1.tar.gz')}, 'crane': { 'type': 'url', 'location': ('https://github.com/pulp/crane/archive/3.3.0.tar.gz')}, @@ -350,7 +350,7 @@ SOURCES = { 'designate-base': { 'type': 'url', 'location': ('$tarballs_base/designate/' - 'designate-8.0.0.tar.gz')}, + 'designate-8.0.1.tar.gz')}, 'dragonflow-base': { 'type': 'url', 'location': ('$tarballs_base/dragonflow/' @@ -379,15 +379,15 @@ SOURCES = { 'heat-base': { 'type': 'url', 'location': ('$tarballs_base/heat/' - 'openstack-heat-12.1.0.tar.gz')}, + 'openstack-heat-12.2.0.tar.gz')}, 'horizon': { 'type': 'url', 'location': ('$tarballs_base/horizon/' - 'horizon-15.3.0.tar.gz')}, + 'horizon-15.3.1.tar.gz')}, 'horizon-plugin-blazar-dashboard': { 'type': 'url', 'location': ('$tarballs_base/blazar-dashboard/' - 'blazar-dashboard-1.3.0.tar.gz')}, + 'blazar-dashboard-1.3.1.tar.gz')}, 'horizon-plugin-congress-dashboard': { 'type': 'url', 'location': ('$tarballs_base/congress-dashboard/' @@ -411,7 +411,7 @@ SOURCES = { 'horizon-plugin-heat-dashboard': { 'type': 'url', 'location': ('$tarballs_base/heat-dashboard/' - 'heat-dashboard-1.5.0.tar.gz')}, + 'heat-dashboard-1.5.1.tar.gz')}, 'horizon-plugin-ironic-ui': { 'type': 'url', 'location': ('$tarballs_base/ironic-ui/' @@ -435,7 +435,7 @@ SOURCES = { 'horizon-plugin-monasca-ui': { 'type': 'url', 'location': ('$tarballs_base/monasca-ui/' - 'monasca-ui-1.15.0.tar.gz')}, + 'monasca-ui-1.15.1.tar.gz')}, 'horizon-plugin-murano-dashboard': { 'type': 'url', 'location': ('$tarballs_base/murano-dashboard/' @@ -443,7 +443,7 @@ SOURCES = { 'horizon-plugin-neutron-lbaas-dashboard': { 'type': 'url', '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': { 'type': 'url', 'location': ('$tarballs_base/neutron-vpnaas-dashboard/' @@ -451,11 +451,11 @@ SOURCES = { 'horizon-plugin-octavia-dashboard': { 'type': 'url', 'location': ('$tarballs_base/octavia-dashboard/' - 'octavia-dashboard-3.0.1.tar.gz')}, + 'octavia-dashboard-3.1.0.tar.gz')}, 'horizon-plugin-sahara-dashboard': { 'type': 'url', 'location': ('$tarballs_base/sahara-dashboard/' - 'sahara-dashboard-10.0.1.tar.gz')}, + 'sahara-dashboard-10.0.2.tar.gz')}, 'horizon-plugin-searchlight-ui': { 'type': 'url', 'location': ('$tarballs_base/searchlight-ui/' @@ -471,7 +471,7 @@ SOURCES = { 'horizon-plugin-tacker-dashboard': { 'type': 'url', 'location': ('$tarballs_base/tacker-horizon/' - 'tacker-horizon-0.14.0.tar.gz')}, + 'tacker-horizon-0.14.1.tar.gz')}, 'horizon-plugin-trove-dashboard': { 'type': 'url', 'location': ('$tarballs_base/trove-dashboard/' @@ -495,11 +495,11 @@ SOURCES = { 'ironic-base': { 'type': 'url', 'location': ('$tarballs_base/ironic/' - 'ironic-12.1.4.tar.gz')}, + 'ironic-12.1.5.tar.gz')}, 'ironic-inspector': { 'type': 'url', 'location': ('$tarballs_base/ironic-inspector/' - 'ironic-inspector-8.2.4.tar.gz')}, + 'ironic-inspector-8.2.5.tar.gz')}, 'karbor-base': { 'type': 'url', 'location': ('$tarballs_base/karbor/' @@ -515,15 +515,15 @@ SOURCES = { 'kuryr-libnetwork': { 'type': 'url', 'location': ('$tarballs_base/kuryr-libnetwork/' - 'kuryr-libnetwork-3.0.0.tar.gz')}, + 'kuryr-libnetwork-3.0.1.tar.gz')}, 'magnum-base': { 'type': 'url', 'location': ('$tarballs_base/magnum/' - 'magnum-8.2.0.tar.gz')}, + 'magnum-8.2.1.tar.gz')}, 'manila-base': { 'type': 'url', 'location': ('$tarballs_base/manila/' - 'manila-8.1.2.tar.gz')}, + 'manila-8.1.3.tar.gz')}, 'mistral-base': { 'type': 'url', 'location': ('$tarballs_base/mistral/' @@ -531,15 +531,15 @@ SOURCES = { 'mistral-base-plugin-tacker': { 'type': 'url', 'location': ('$tarballs_base/tacker/' - 'tacker-1.0.0.tar.gz')}, + 'tacker-1.0.1.tar.gz')}, 'monasca-agent': { 'type': 'url', 'location': ('$tarballs_base/monasca-agent/' - 'monasca-agent-2.10.0.tar.gz')}, + 'monasca-agent-2.10.1.tar.gz')}, 'monasca-api': { 'type': 'url', 'location': ('$tarballs_base/monasca-api/' - 'monasca-api-3.0.0.tar.gz')}, + 'monasca-api-3.0.1.tar.gz')}, 'monasca-log-api': { 'type': 'url', 'location': ('$tarballs_base/monasca-log-api/' @@ -547,7 +547,7 @@ SOURCES = { 'monasca-notification': { 'type': 'url', 'location': ('$tarballs_base/monasca-notification/' - 'monasca-notification-1.17.0.tar.gz')}, + 'monasca-notification-1.17.1.tar.gz')}, 'monasca-persister': { 'type': 'url', 'location': ('$tarballs_base/monasca-persister/' @@ -568,11 +568,11 @@ SOURCES = { 'murano-base': { 'type': 'url', 'location': ('$tarballs_base/murano/' - 'murano-7.0.0.tar.gz')}, + 'murano-7.1.0.tar.gz')}, 'neutron-base': { 'type': 'url', 'location': ('$tarballs_base/neutron/' - 'neutron-14.2.0.tar.gz')}, + 'neutron-14.4.0.tar.gz')}, 'neutron-base-plugin-neutron-fwaas': { 'type': 'url', 'location': ('$tarballs_base/neutron-fwaas/' @@ -648,15 +648,15 @@ SOURCES = { 'neutron-server-ovn-plugin-networking-ovn': { 'type': 'url', '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': { 'type': 'url', 'location': ('$tarballs_base/networking-ovn/' - 'networking-ovn-6.1.0.tar.gz')}, + 'networking-ovn-6.1.1.tar.gz')}, 'nova-base': { 'type': 'url', 'location': ('$tarballs_base/nova/' - 'nova-19.2.0.tar.gz')}, + 'nova-19.3.1.tar.gz')}, 'nova-base-plugin-blazar': { 'type': 'url', 'location': ('$tarballs_base/blazar-nova/' @@ -672,7 +672,7 @@ SOURCES = { 'octavia-base': { 'type': 'url', 'location': ('$tarballs_base/octavia/' - 'octavia-4.1.2.tar.gz')}, + 'octavia-4.1.3.tar.gz')}, 'panko-base': { 'type': 'url', 'location': ('$tarballs_base/panko/' @@ -784,7 +784,7 @@ SOURCES = { 'sahara-base-plugin-mapr': { 'type': 'url', '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': { 'type': 'url', 'location': ('$tarballs_base/sahara-plugin-spark/' @@ -808,7 +808,7 @@ SOURCES = { 'solum-base': { 'type': 'url', 'location': ('$tarballs_base/solum/' - 'solum-6.0.0.tar.gz')}, + 'solum-6.0.1.tar.gz')}, 'swift-base': { 'type': 'url', 'location': ('$tarballs_base/swift/' @@ -816,7 +816,7 @@ SOURCES = { 'tacker-base': { 'type': 'url', 'location': ('$tarballs_base/tacker/' - 'tacker-1.0.0.tar.gz')}, + 'tacker-1.0.1.tar.gz')}, 'tacker-base-plugin-networking-sfc': { 'type': 'url', 'location': ('$tarballs_base/networking-sfc/' @@ -840,7 +840,7 @@ SOURCES = { 'vitrage-base': { 'type': 'url', 'location': ('$tarballs_base/vitrage/' - 'vitrage-4.3.1.tar.gz')}, + 'vitrage-4.3.2.tar.gz')}, 'vmtp': { 'type': 'url', 'location': ('$tarballs_base/vmtp/' @@ -852,11 +852,11 @@ SOURCES = { 'zaqar-base': { 'type': 'url', 'location': ('$tarballs_base/zaqar/' - 'zaqar-8.0.0.tar.gz')}, + 'zaqar-8.0.1.tar.gz')}, 'zun-base': { 'type': 'url', 'location': ('$tarballs_base/zun/' - 'zun-3.0.0.tar.gz')} + 'zun-3.0.1.tar.gz')} } diff --git a/kolla/image/build.py b/kolla/image/build.py index 6703bbae46..f7688e413a 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -97,9 +97,6 @@ SKIPPED_IMAGES = { "zun-base", ], 'centos+source': [ - # FIXME(yoctozepto): temporary block due to upstream issues - "bifrost-base", - "ovsdpdk", "tripleoclient", # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed