Revert "Switch to Ussuri release tarballs"

Ussuri release. Standard process per [1].

[1] https://docs.openstack.org/kolla/latest/contributor/release-management.html

This reverts commit 885fbbb0e120a65d6907ea0170556ac4642e6ab3.

Change-Id: I169c87594d233e9a1950be8f1d0325d7c517bdb4

1 files changed, 126 insertions, 126 deletions

diff --git a/kolla/common/config.py b/kolla/common/config.py
index 0cfdcad9a..666f38e7a 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -289,281 +289,281 @@ SOURCES = {
     'openstack-base': {
         'type': 'url',
         'location': ('$tarballs_base/requirements/'
-                     'requirements-stable-ussuri.tar.gz')},
+                     'requirements-${openstack_branch}.tar.gz')},
     'aodh-base': {
         'type': 'url',
         'location': ('$tarballs_base/aodh/'
-                     'aodh-10.0.0.tar.gz')},
+                     'aodh-${openstack_branch}.tar.gz')},
     'barbican-base': {
         'type': 'url',
         'location': ('$tarballs_base/barbican/'
-                     'barbican-10.0.0.tar.gz')},
+                     'barbican-${openstack_branch}.tar.gz')},
     'bifrost-base': {
         'type': 'url',
         'location': ('$tarballs_base/bifrost/'
-                     'bifrost-8.0.0.tar.gz')},
+                     'bifrost-${openstack_branch}.tar.gz')},
     'blazar-base': {
         'type': 'url',
         'location': ('$tarballs_base/blazar/'
-                     'blazar-5.0.0.tar.gz')},
+                     'blazar-${openstack_branch}.tar.gz')},
     'ceilometer-base': {
         'type': 'url',
         'location': ('$tarballs_base/ceilometer/'
-                     'ceilometer-14.0.0.tar.gz')},
+                     'ceilometer-${openstack_branch}.tar.gz')},
     'ceilometer-base-plugin-panko': {
         'type': 'url',
         'location': ('$tarballs_base/panko/'
-                     'panko-8.0.0.tar.gz')},
+                     'panko-${openstack_branch}.tar.gz')},
     'cinder-base': {
         'type': 'url',
         'location': ('$tarballs_base/cinder/'
-                     'cinder-16.0.0.tar.gz')},
+                     'cinder-${openstack_branch}.tar.gz')},
     'congress-base': {
         'type': 'url',
         'location': ('$tarballs_base/congress/'
-                     'openstack-congress-11.0.0.tar.gz')},
+                     'congress-${openstack_branch}.tar.gz')},
     'cloudkitty-base': {
         'type': 'url',
         'location': ('$tarballs_base/cloudkitty/'
-                     'cloudkitty-12.0.0.tar.gz')},
+                     'cloudkitty-${openstack_branch}.tar.gz')},
     'cyborg-base': {
         'type': 'url',
         'location': ('$tarballs_base/cyborg/'
-                     'openstack-cyborg-4.0.0.tar.gz')},
+                     'cyborg-${openstack_branch}.tar.gz')},
     'designate-base': {
         'type': 'url',
         'location': ('$tarballs_base/designate/'
-                     'designate-10.0.0.tar.gz')},
+                     'designate-${openstack_branch}.tar.gz')},
     'ec2-api': {
         'type': 'url',
         'location': ('$tarballs_base/ec2-api/'
-                     'ec2-api-10.0.0.tar.gz')},
+                     'ec2-api-${openstack_branch}.tar.gz')},
     'freezer-api': {
         'type': 'url',
         'location': ('$tarballs_base/freezer-api/'
-                     'freezer-api-8.0.0.tar.gz')},
+                     'freezer-api-${openstack_branch}.tar.gz')},
     'freezer-base': {
         'type': 'url',
         'location': ('$tarballs_base/freezer/'
-                     'freezer-8.0.0.tar.gz')},
+                     'freezer-${openstack_branch}.tar.gz')},
     'glance-base': {
         'type': 'url',
         'location': ('$tarballs_base/glance/'
-                     'glance-20.0.0.tar.gz')},
+                     'glance-${openstack_branch}.tar.gz')},
     'gnocchi-base': {
         'type': 'git',
-        'reference': '4.3.4',
+        'reference': 'master',
         'location': ('https://github.com/gnocchixyz/'
                      'gnocchi.git')},
     'heat-base': {
         'type': 'url',
         'location': ('$tarballs_base/heat/'
-                     'openstack-heat-14.0.0.tar.gz')},
+                     'heat-${openstack_branch}.tar.gz')},
     'horizon': {
         'type': 'url',
         'location': ('$tarballs_base/horizon/'
-                     'horizon-18.3.2.tar.gz')},
+                     'horizon-${openstack_branch}.tar.gz')},
     'horizon-plugin-blazar-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/blazar-dashboard/'
-                     'blazar-dashboard-3.0.0.tar.gz')},
+                     'blazar-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-congress-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/congress-dashboard/'
-                     'congress-dashboard-6.0.0.tar.gz')},
+                     'congress-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-cloudkitty-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/cloudkitty-dashboard/'
-                     'cloudkitty-dashboard-10.0.0.tar.gz')},
+                     'cloudkitty-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-designate-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/designate-dashboard/'
-                     'designate-dashboard-10.0.0.tar.gz')},
+                     'designate-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-fwaas-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-fwaas-dashboard/'
-                     'neutron-fwaas-dashboard-3.0.0.tar.gz')},
+                     'neutron-fwaas-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-freezer-web-ui': {
         'type': 'url',
         'location': ('$tarballs_base/freezer-web-ui/'
-                     'freezer-web-ui-8.0.0.tar.gz')},
+                     'freezer-web-ui-${openstack_branch}.tar.gz')},
     'horizon-plugin-heat-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/heat-dashboard/'
-                     'heat-dashboard-3.0.0.tar.gz')},
+                     'heat-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-ironic-ui': {
         'type': 'url',
         'location': ('$tarballs_base/ironic-ui/'
-                     'ironic-ui-4.0.0.tar.gz')},
+                     'ironic-ui-${openstack_branch}.tar.gz')},
     'horizon-plugin-karbor-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/karbor-dashboard/'
-                     'karbor-dashboard-1.4.0.tar.gz')},
+                     'karbor-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-magnum-ui': {
         'type': 'url',
         'location': ('$tarballs_base/magnum-ui/'
-                     'magnum-ui-6.0.0.tar.gz')},
+                     'magnum-ui-${openstack_branch}.tar.gz')},
     'horizon-plugin-manila-ui': {
         'type': 'url',
         'location': ('$tarballs_base/manila-ui/'
-                     'manila-ui-3.0.0.tar.gz')},
+                     'manila-ui-${openstack_branch}.tar.gz')},
     'horizon-plugin-masakari-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/masakari-dashboard/'
-                     'masakari-dashboard-2.0.0.tar.gz')},
+                     'masakari-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-mistral-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/mistral-dashboard/'
-                     'mistral-dashboard-10.0.0.tar.gz')},
+                     'mistral-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-monasca-ui': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-ui/'
-                     'monasca-ui-2.0.1.tar.gz')},
+                     'monasca-ui-${openstack_branch}.tar.gz')},
     'horizon-plugin-murano-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/murano-dashboard/'
-                     'murano-dashboard-9.0.0.tar.gz')},
+                     'murano-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-neutron-vpnaas-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-vpnaas-dashboard/'
-                     'neutron-vpnaas-dashboard-2.0.0.tar.gz')},
+                     'neutron-vpnaas-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-octavia-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/octavia-dashboard/'
-                     'octavia-dashboard-5.0.0.tar.gz')},
+                     'octavia-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-qinling-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/qinling-dashboard/'
-                     'qinling-dashboard-3.0.0.tar.gz')},
+                     'qinling-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-sahara-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/sahara-dashboard/'
-                     'sahara-dashboard-12.0.0.tar.gz')},
+                     'sahara-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-searchlight-ui': {
         'type': 'url',
         'location': ('$tarballs_base/searchlight-ui/'
-                     'searchlight-ui-8.0.0.tar.gz')},
+                     'searchlight-ui-${openstack_branch}.tar.gz')},
     'horizon-plugin-senlin-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/senlin-dashboard/'
-                     'senlin-dashboard-1.0.0.tar.gz')},
+                     'senlin-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-solum-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/solum-dashboard/'
-                     'solum-dashboard-4.0.0.tar.gz')},
+                     'solum-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-tacker-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/tacker-horizon/'
-                     'tacker-horizon-1.0.0.tar.gz')},
+                     'tacker-horizon-${openstack_branch}.tar.gz')},
     'horizon-plugin-trove-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/trove-dashboard/'
-                     'trove-dashboard-14.0.0.tar.gz')},
+                     'trove-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-vitrage-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/vitrage-dashboard/'
-                     'vitrage-dashboard-3.1.0.tar.gz')},
+                     'vitrage-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-watcher-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/watcher-dashboard/'
-                     'watcher-dashboard-3.0.0.tar.gz')},
+                     'watcher-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-zaqar-ui': {
         'type': 'url',
         'location': ('$tarballs_base/zaqar-ui/'
-                     'zaqar-ui-8.0.0.tar.gz')},
+                     'zaqar-ui-${openstack_branch}.tar.gz')},
     'horizon-plugin-zun-ui': {
         'type': 'url',
         'location': ('$tarballs_base/zun-ui/'
-                     'zun-ui-5.0.0.tar.gz')},
+                     'zun-ui-${openstack_branch}.tar.gz')},
     'ironic-base': {
         'type': 'url',
         'location': ('$tarballs_base/ironic/'
-                     'ironic-15.0.0.tar.gz')},
+                     'ironic-${openstack_branch}.tar.gz')},
     'ironic-inspector': {
         'type': 'url',
         'location': ('$tarballs_base/ironic-inspector/'
-                     'ironic-inspector-10.1.0.tar.gz')},
+                     'ironic-inspector-${openstack_branch}.tar.gz')},
     'karbor-base': {
         'type': 'url',
         'location': ('$tarballs_base/karbor/'
-                     'karbor-1.5.0.tar.gz')},
+                     'karbor-${openstack_branch}.tar.gz')},
     'keystone-base': {
         'type': 'url',
         'location': ('$tarballs_base/keystone/'
-                     'keystone-17.0.0.tar.gz')},
+                     'keystone-${openstack_branch}.tar.gz')},
     'kuryr-base': {
         'type': 'url',
         'location': ('$tarballs_base/kuryr/'
-                     'kuryr-lib-2.0.0.tar.gz')},
+                     'kuryr-${openstack_branch}.tar.gz')},
     'kuryr-libnetwork': {
         'type': 'url',
         'location': ('$tarballs_base/kuryr-libnetwork/'
-                     'kuryr-libnetwork-5.0.0.tar.gz')},
+                     'kuryr-libnetwork-${openstack_branch}.tar.gz')},
     'magnum-base': {
         'type': 'url',
         'location': ('$tarballs_base/magnum/'
-                     'magnum-10.0.0.tar.gz')},
+                     'magnum-${openstack_branch}.tar.gz')},
     'manila-base': {
         'type': 'url',
         'location': ('$tarballs_base/manila/'
-                     'manila-10.0.0.tar.gz')},
+                     'manila-${openstack_branch}.tar.gz')},
     'masakari-base': {
         'type': 'url',
         'location': ('$tarballs_base/masakari/'
-                     'masakari-9.0.0.tar.gz')},
+                     'masakari-${openstack_branch}.tar.gz')},
     'masakari-monitors': {
         'type': 'url',
         'location': ('$tarballs_base/masakari-monitors/'
-                     'masakari-monitors-9.0.0.tar.gz')},
+                     'masakari-monitors-${openstack_branch}.tar.gz')},
     'mistral-base': {
         'type': 'url',
         'location': ('$tarballs_base/mistral/'
-                     'mistral-10.0.0.tar.gz')},
+                     'mistral-${openstack_branch}.tar.gz')},
     'mistral-base-plugin-tacker': {
         'type': 'url',
         'location': ('$tarballs_base/tacker/'
-                     'tacker-3.0.0.tar.gz')},
+                     'tacker-${openstack_branch}.tar.gz')},
     'monasca-agent': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-agent/'
-                     'monasca-agent-3.0.0.tar.gz')},
+                     'monasca-agent-${openstack_branch}.tar.gz')},
     'monasca-api': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-api/'
-                     'monasca-api-4.0.0.tar.gz')},
+                     'monasca-api-${openstack_branch}.tar.gz')},
     'monasca-notification': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-notification/'
-                     'monasca-notification-2.0.0.tar.gz')},
+                     'monasca-notification-${openstack_branch}.tar.gz')},
     'monasca-persister': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-persister/'
-                     'monasca-persister-2.0.0.tar.gz')},
+                     'monasca-persister-${openstack_branch}.tar.gz')},
     'monasca-statsd': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-statsd/'
-                     'monasca-statsd-2.0.0.tar.gz')},
+                     'monasca-statsd-${openstack_branch}.tar.gz')},
     # FIXME(dszumski): Use openstack tar when infra is fixed
     'monasca-thresh': {
         'type': 'url',
         'location': ('https://github.com/openstack/monasca-thresh/archive/'
-                     '2.7.0.tar.gz')},
+                     'master.tar.gz')},
     'monasca-thresh-additions-monasca-common': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-common/'
-                     'monasca-common-3.1.0.tar.gz')},
+                     'monasca-common-${openstack_branch}.tar.gz')},
     'murano-base': {
         'type': 'url',
         'location': ('$tarballs_base/murano/'
-                     'murano-9.0.0.tar.gz')},
+                     'murano-${openstack_branch}.tar.gz')},
     'neutron-base': {
         'type': 'url',
         'location': ('$tarballs_base/neutron/'
-                     'neutron-16.0.0.tar.gz')},
+                     'neutron-${openstack_branch}.tar.gz')},
     'neutron-base-plugin-neutron-fwaas': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-fwaas/'
-                     'neutron-fwaas-16.0.0.tar.gz')},
+                     'neutron-fwaas-${openstack_branch}.tar.gz')},
     'neutron-base-plugin-networking-ansible': {
         'type': 'url',
         'location': ('$tarballs_base/networking-ansible/'
@@ -571,11 +571,11 @@ SOURCES = {
     'neutron-base-plugin-networking-baremetal': {
         'type': 'url',
         'location': ('$tarballs_base/networking-baremetal/'
-                     'networking-baremetal-2.0.0.tar.gz')},
+                     'networking-baremetal-${openstack_branch}.tar.gz')},
     'neutron-base-plugin-networking-generic-switch': {
         'type': 'url',
         'location': ('$tarballs_base/networking-generic-switch/'
-                     'networking-generic-switch-3.0.0.tar.gz')},
+                     'networking-generic-switch-${openstack_branch}.tar.gz')},
     'neutron-base-plugin-networking-mlnx': {
         'type': 'url',
         'location': ('$tarballs_base/networking-mlnx/'
@@ -583,7 +583,7 @@ SOURCES = {
     'neutron-base-plugin-networking-sfc': {
         'type': 'url',
         'location': ('$tarballs_base/networking-sfc/'
-                     'networking-sfc-10.0.0.tar.gz')},
+                     'networking-sfc-${openstack_branch}.tar.gz')},
     'neutron-base-plugin-vmware-nsx': {
         'type': 'url',
         'location': ('$tarballs_base/vmware-nsx/'
@@ -591,19 +591,19 @@ SOURCES = {
     'neutron-base-plugin-vpnaas-agent': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-vpnaas/'
-                     'neutron-vpnaas-16.0.0.tar.gz')},
+                     'neutron-vpnaas-${openstack_branch}.tar.gz')},
     'neutron-bgp-dragent': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-dynamic-routing/'
-                     'neutron-dynamic-routing-16.0.0.tar.gz')},
+                     'neutron-dynamic-routing-${openstack_branch}.tar.gz')},
     'neutron-server-opendaylight-plugin-networking-odl': {
         'type': 'url',
         'location': ('$tarballs_base/networking-odl/'
-                     'networking-odl-16.0.0.tar.gz')},
+                     'networking-odl-${openstack_branch}.tar.gz')},
     'neutron-server-opendaylight-plugin-networking-bgpvpn': {
         'type': 'url',
         'location': ('$tarballs_base/networking-bgpvpn/'
-                     'networking-bgpvpn-12.0.0.tar.gz')},
+                     'networking-bgpvpn-${openstack_branch}.tar.gz')},
     'neutron-server-opendaylight-plugin-networking-l2gw': {
         'type': 'url',
         'location': ('$tarballs_base/networking-l2gw/'
@@ -611,11 +611,11 @@ SOURCES = {
     'neutron-server-opendaylight-plugin-networking-sfc': {
         'type': 'url',
         'location': ('$tarballs_base/networking-sfc/'
-                     'networking-sfc-10.0.0.tar.gz')},
+                     'networking-sfc-${openstack_branch}.tar.gz')},
     'neutron-server-plugin-neutron-dynamic-routing': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-dynamic-routing/'
-                     'neutron-dynamic-routing-16.0.0.tar.gz')},
+                     'neutron-dynamic-routing-${openstack_branch}.tar.gz')},
     'neutron-server-plugin-vmware-nsxlib': {
         'type': 'url',
         'location': ('$tarballs_base/vmware-nsxlib/'
@@ -623,15 +623,15 @@ SOURCES = {
     'neutron-vpnaas-agent': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-vpnaas/'
-                     'neutron-vpnaas-16.0.0.tar.gz')},
+                     'neutron-vpnaas-${openstack_branch}.tar.gz')},
     'nova-base': {
         'type': 'url',
         'location': ('$tarballs_base/nova/'
-                     'nova-21.0.0.tar.gz')},
+                     'nova-${openstack_branch}.tar.gz')},
     'nova-base-plugin-blazar': {
         'type': 'url',
         'location': ('$tarballs_base/blazar-nova/'
-                     'blazar-nova-2.0.0.tar.gz')},
+                     'blazar-nova-${openstack_branch}.tar.gz')},
     'nova-base-plugin-mksproxy': {
         'type': 'url',
         'location': ('$tarballs_base/nova-mksproxy/'
@@ -643,7 +643,7 @@ SOURCES = {
     'octavia-base': {
         'type': 'url',
         'location': ('$tarballs_base/octavia/'
-                     'octavia-6.0.0.tar.gz')},
+                     'octavia-${openstack_branch}.tar.gz')},
     'octavia-api-plugin-ovn-octavia-provider': {
         'type': 'url',
         'location': ('$tarballs_base/ovn-octavia-provider/'
@@ -651,15 +651,15 @@ SOURCES = {
     'panko-base': {
         'type': 'url',
         'location': ('$tarballs_base/panko/'
-                     'panko-8.0.0.tar.gz')},
+                     'panko-${openstack_branch}.tar.gz')},
     'placement-base': {
         'type': 'url',
         'location': ('$tarballs_base/placement/'
-                     'openstack-placement-3.0.0.tar.gz')},
+                     'placement-${openstack_branch}.tar.gz')},
     'qinling-base': {
         'type': 'url',
         'location': ('$tarballs_base/qinling/'
-                     'qinling-4.0.0.tar.gz')},
+                     'qinling-${openstack_branch}.tar.gz')},
     'tempest-plugin-tempest-conf': {
         'type': 'url',
         'location': ('$tarballs_base/python-tempestconf/'
@@ -667,155 +667,155 @@ SOURCES = {
     'tempest-plugin-barbican': {
         'type': 'url',
         'location': ('$tarballs_base/barbican-tempest-plugin/'
-                     'barbican_tempest_plugin-1.0.0.tar.gz')},
+                     'barbican-tempest-plugin-master.tar.gz')},
     'tempest-plugin-blazar': {
         'type': 'url',
         'location': ('$tarballs_base/blazar-tempest-plugin/'
-                     'blazar_tempest_plugin-0.4.0.tar.gz')},
+                     'blazar-tempest-plugin-master.tar.gz')},
     'tempest-plugin-cinder': {
         'type': 'url',
         'location': ('$tarballs_base/cinder-tempest-plugin/'
-                     'cinder-tempest-plugin-1.0.0.tar.gz')},
+                     'cinder-tempest-plugin-master.tar.gz')},
     'tempest-plugin-congress': {
         'type': 'url',
         'location': ('$tarballs_base/congress-tempest-plugin/'
-                     'congress-tempest-plugin-1.0.0.tar.gz')},
+                     'congress-tempest-plugin-master.tar.gz')},
     'tempest-plugin-ec2api': {
         'type': 'url',
         'location': ('$tarballs_base/ec2api-tempest-plugin/'
-                     'ec2api-tempest-plugin-1.0.0.tar.gz')},
+                     'ec2api-tempest-plugin-master.tar.gz')},
     'tempest-plugin-heat': {
         'type': 'url',
         'location': ('$tarballs_base/heat-tempest-plugin/'
-                     'heat-tempest-plugin-1.0.0.tar.gz')},
+                     'heat-tempest-plugin-master.tar.gz')},
     'tempest-plugin-ironic': {
         'type': 'url',
         'location': ('$tarballs_base/ironic-tempest-plugin/'
-                     'ironic-tempest-plugin-2.0.0.tar.gz')},
+                     'ironic-tempest-plugin-master.tar.gz')},
     'tempest-plugin-keystone': {
         'type': 'url',
         'location': ('$tarballs_base/keystone-tempest-plugin/'
-                     'keystone_tempest_plugin-0.4.0.tar.gz')},
+                     'keystone-tempest-plugin-master.tar.gz')},
     'tempest-plugin-magnum': {
         'type': 'url',
         'location': ('$tarballs_base/magnum-tempest-plugin/'
-                     'magnum_tempest_plugin-1.0.0.tar.gz')},
+                     'magnum-tempest-plugin-master.tar.gz')},
     'tempest-plugin-manila': {
         'type': 'url',
         'location': ('$tarballs_base/manila-tempest-plugin/'
-                     'manila-tempest-plugin-1.0.0.tar.gz')},
+                     'manila-tempest-plugin-master.tar.gz')},
     'tempest-plugin-mistral': {
         'type': 'url',
         'location': ('$tarballs_base/mistral-tempest-plugin/'
-                     'mistral_tempest_tests-1.0.0.tar.gz')},
+                     'mistral-tempest-plugin-master.tar.gz')},
     'tempest-plugin-monasca': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-tempest-plugin/'
-                     'monasca-tempest-plugin-2.0.0.tar.gz')},
+                     'monasca-tempest-plugin-master.tar.gz')},
     'tempest-plugin-murano': {
         'type': 'url',
         'location': ('$tarballs_base/murano-tempest-plugin/'
-                     'murano-tempest-plugin-2.0.0.tar.gz')},
+                     'murano-tempest-plugin-master.tar.gz')},
     'tempest-plugin-neutron': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-tempest-plugin/'
-                     'neutron-tempest-plugin-1.1.0.tar.gz')},
+                     'neutron-tempest-plugin-master.tar.gz')},
     'tempest-plugin-patrole': {
         'type': 'url',
         'location': ('$tarballs_base/patrole/'
-                     'patrole-0.9.0.tar.gz')},
+                     'patrole-master.tar.gz')},
     'tempest-plugin-telemetry': {
         'type': 'url',
         'location': ('$tarballs_base/telemetry-tempest-plugin/'
-                     'telemetry_tempest_plugin-1.0.0.tar.gz')},
+                     'telemetry-tempest-plugin-master.tar.gz')},
     'tempest-plugin-trove': {
         'type': 'url',
         'location': ('$tarballs_base/trove-tempest-plugin/'
-                     'trove_tempest_plugin-1.0.0.tar.gz')},
+                     'trove-tempest-plugin-master.tar.gz')},
     'tempest-plugin-vitrage': {
         'type': 'url',
         'location': ('$tarballs_base/vitrage-tempest-plugin/'
-                     'vitrage-tempest-plugin-4.0.0.tar.gz')},
+                     'vitrage-tempest-plugin-master.tar.gz')},
     'tempest-plugin-watcher': {
         'type': 'url',
         'location': ('$tarballs_base/watcher-tempest-plugin/'
-                     'watcher-tempest-plugin-2.0.0.tar.gz')},
+                     'watcher-tempest-plugin-master.tar.gz')},
     'tempest-plugin-zaqar': {
         'type': 'url',
         'location': ('$tarballs_base/zaqar-tempest-plugin/'
-                     'zaqar_tempest_plugin-1.0.0.tar.gz')},
+                     'zaqar-tempest-plugin-master.tar.gz')},
     'rally': {
         'type': 'url',
         'location': ('$tarballs_base/rally/'
-                     'rally-3.1.0.tar.gz')},
+                     'rally-master.tar.gz')},
     'sahara-base': {
         'type': 'url',
         'location': ('$tarballs_base/sahara/'
-                     'sahara-12.0.0.tar.gz')},
+                     'sahara-${openstack_branch}.tar.gz')},
     'sahara-base-plugin-ambari': {
         'type': 'url',
         'location': ('$tarballs_base/sahara-plugin-ambari/'
-                     'sahara-plugin-ambari-3.0.0.tar.gz')},
+                     'sahara-plugin-ambari-${openstack_branch}.tar.gz')},
     'sahara-base-plugin-cdh': {
         'type': 'url',
         'location': ('$tarballs_base/sahara-plugin-cdh/'
-                     'sahara-plugin-cdh-3.0.0.tar.gz')},
+                     'sahara-plugin-cdh-${openstack_branch}.tar.gz')},
     'sahara-base-plugin-mapr': {
         'type': 'url',
         'location': ('$tarballs_base/sahara-plugin-mapr/'
-                     'sahara-plugin-mapr-3.0.0.tar.gz')},
+                     'sahara-plugin-mapr-${openstack_branch}.tar.gz')},
     'sahara-base-plugin-spark': {
         'type': 'url',
         'location': ('$tarballs_base/sahara-plugin-spark/'
-                     'sahara-plugin-spark-3.0.0.tar.gz')},
+                     'sahara-plugin-spark-${openstack_branch}.tar.gz')},
     'sahara-base-plugin-storm': {
         'type': 'url',
         'location': ('$tarballs_base/sahara-plugin-storm/'
-                     'sahara-plugin-storm-3.0.0.tar.gz')},
+                     'sahara-plugin-storm-${openstack_branch}.tar.gz')},
     'sahara-base-plugin-vanilla': {
         'type': 'url',
         'location': ('$tarballs_base/sahara-plugin-vanilla/'
-                     'sahara-plugin-vanilla-3.0.0.tar.gz')},
+                     'sahara-plugin-vanilla-${openstack_branch}.tar.gz')},
     'searchlight-base': {
         'type': 'url',
         'location': ('$tarballs_base/searchlight/'
-                     'searchlight-8.0.0.tar.gz')},
+                     'searchlight-${openstack_branch}.tar.gz')},
     'senlin-base': {
         'type': 'url',
         'location': ('$tarballs_base/senlin/'
-                     'senlin-9.0.0.tar.gz')},
+                     'senlin-${openstack_branch}.tar.gz')},
     'solum-base': {
         'type': 'url',
         'location': ('$tarballs_base/solum/'
-                     'solum-8.0.0.tar.gz')},
+                     'solum-${openstack_branch}.tar.gz')},
     'swift-base': {
         'type': 'url',
         'location': ('$tarballs_base/swift/'
-                     'swift-2.25.0.tar.gz')},
+                     'swift-${openstack_branch}.tar.gz')},
     'tacker-base': {
         'type': 'url',
         'location': ('$tarballs_base/tacker/'
-                     'tacker-3.0.0.tar.gz')},
+                     'tacker-${openstack_branch}.tar.gz')},
     'tacker-base-plugin-networking-sfc': {
         'type': 'url',
         'location': ('$tarballs_base/networking-sfc/'
-                     'networking-sfc-10.0.0.tar.gz')},
+                     'networking-sfc-${openstack_branch}.tar.gz')},
     'tempest': {
         'type': 'url',
         'location': ('$tarballs_base/tempest/'
-                     'tempest-24.0.0.tar.gz')},
+                     'tempest-master.tar.gz')},
     'tripleoclient': {
         'type': 'url',
         'location': ('$tarballs_base/python-tripleoclient/'
-                     'tripleoclient-13.2.0.tar.gz')},
+                     'tripleoclient-12.3.0.tar.gz')},
     'trove-base': {
         'type': 'url',
         'location': ('$tarballs_base/trove/'
-                     'trove-13.0.0.tar.gz')},
+                     'trove-${openstack_branch}.tar.gz')},
     'vitrage-base': {
         'type': 'url',
         'location': ('$tarballs_base/vitrage/'
-                     'vitrage-7.1.0.tar.gz')},
+                     'vitrage-${openstack_branch}.tar.gz')},
     'vmtp': {
         'type': 'url',
         'location': ('$tarballs_base/vmtp/'
@@ -823,15 +823,15 @@ SOURCES = {
     'watcher-base': {
         'type': 'url',
         'location': ('$tarballs_base/watcher/'
-                     'python-watcher-4.0.0.tar.gz')},
+                     'watcher-${openstack_branch}.tar.gz')},
     'zaqar-base': {
         'type': 'url',
         'location': ('$tarballs_base/zaqar/'
-                     'zaqar-10.0.0.tar.gz')},
+                     'zaqar-${openstack_branch}.tar.gz')},
     'zun-base': {
         'type': 'url',
         'location': ('$tarballs_base/zun/'
-                     'zun-5.0.0.tar.gz')}
+                     'zun-${openstack_branch}.tar.gz')}
 }