aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-03-31 17:26:11 +0000
committerGerrit Code Review <review@openstack.org>2022-03-31 17:26:11 +0000
commitda9079cd9bb012c308051a6010c24c3c588ee0b5 (patch)
tree5cf8d2375db2df8b697b3ccf2bfb811b403c3dea
parent1cfca191b967f394b386811a101e6af93594dce8 (diff)
parentbb65c5667423707dc92b3cdb3993523ccca0f150 (diff)
downloadkolla-da9079cd9bb012c308051a6010c24c3c588ee0b5.tar.gz
kolla-da9079cd9bb012c308051a6010c24c3c588ee0b5.zip
Merge "[release] Use Yoga sources by default"
-rwxr-xr-xkolla/common/config.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 3ef4819be..ee5e03e66 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -32,7 +32,7 @@ DISTRO_PRETTY_NAME = {
'debian': 'Debian GNU/Linux 11 (bullseye)',
'ubuntu': 'Ubuntu 20.04',
}
-OPENSTACK_RELEASE = 'master'
+OPENSTACK_RELEASE = 'yoga'
# This is noarch repository so we will use it on all architectures
DELOREAN = "https://trunk.rdoproject.org/centos8-master/" \
@@ -396,10 +396,12 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/murano-dashboard/'
'murano-dashboard-${openstack_branch}.tar.gz')},
+ # FIXME(mgoddard): Revert to ${openstack_branch} when a stable-yoga tarball
+ # exists.
'horizon-plugin-neutron-vpnaas-dashboard': {
'type': 'url',
'location': ('$tarballs_base/openstack/neutron-vpnaas-dashboard/'
- 'neutron-vpnaas-dashboard-${openstack_branch}.tar.gz')},
+ 'neutron-vpnaas-dashboard-6.0.0.tar.gz')},
'horizon-plugin-octavia-dashboard': {
'type': 'url',
'location': ('$tarballs_base/openstack/octavia-dashboard/'
@@ -484,10 +486,12 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/monasca-agent/'
'monasca-agent-${openstack_branch}.tar.gz')},
+ # FIXME(mgoddard): Revert to ${openstack_branch} when a stable-yoga tarball
+ # exists.
'monasca-api': {
'type': 'url',
'location': ('$tarballs_base/openstack/monasca-api/'
- 'monasca-api-${openstack_branch}.tar.gz')},
+ 'monasca-api-8.0.0.tar.gz')},
'monasca-notification': {
'type': 'url',
'location': ('$tarballs_base/openstack/monasca-notification/'
@@ -621,10 +625,12 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/trove/'
'trove-${openstack_branch}.tar.gz')},
+ # FIXME(mgoddard): Revert to ${openstack_branch} when a stable-yoga tarball
+ # exists.
'venus-base': {
'type': 'url',
'location': ('$tarballs_base/openstack/venus/'
- 'venus-${openstack_branch}.tar.gz')},
+ 'venus-master.tar.gz')},
'vitrage-base': {
'type': 'url',
'location': ('$tarballs_base/openstack/vitrage/'