From d94be925a695b398b6d175e84b682486052a8190 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Sat, 3 Mar 2018 20:24:49 +0800
Subject: [PATCH] Revert "Use queens release for all OpenStack projects"

queens branch is created. Revert this patch.

This reverts commit 6e088f9839fff5f46683545bf27d2c6eaa99019b.

Change-Id: If7151ea03a0a90ec9a95b2f0649ed3e355a45cc2
(cherry picked from commit a5880b52a8703a10484fcdcaa71932e1ca66e454)
---
 kolla/common/config.py | 182 ++++++++++++++++++++---------------------
 1 file changed, 89 insertions(+), 93 deletions(-)

diff --git a/kolla/common/config.py b/kolla/common/config.py
index ebb00dd866..0a51f3c724 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -285,43 +285,43 @@ SOURCES = {
     'openstack-base': {
         'type': 'url',
         'location': ('$tarballs_base/requirements/'
-                     'requirements-stable-queens.tar.gz')},
+                     'requirements-master.tar.gz')},
     'almanach-base': {
         'type': 'url',
         'location': ('$tarballs_base/almanach/'
-                     'almanach-stable-queens.tar.gz')},
+                     'almanach-master.tar.gz')},
     'aodh-base': {
         'type': 'url',
         'location': ('$tarballs_base/aodh/'
-                     'aodh-6.0.0.tar.gz')},
+                     'aodh-master.tar.gz')},
     'barbican-base': {
         'type': 'url',
         'location': ('$tarballs_base/barbican/'
-                     'barbican-6.0.0.0rc1.tar.gz')},
+                     'barbican-master.tar.gz')},
     'bifrost-base': {
         'type': 'url',
         'location': ('$tarballs_base/bifrost/'
-                     'bifrost-5.0.0.tar.gz')},
+                     'bifrost-master.tar.gz')},
     'blazar-base': {
         'type': 'url',
         'location': ('$tarballs_base/blazar/'
-                     'blazar-1.0.0.0rc1.tar.gz')},
+                     'blazar-master.tar.gz')},
     'ceilometer-base': {
         'type': 'url',
         'location': ('$tarballs_base/ceilometer/'
-                     'ceilometer-10.0.0.tar.gz')},
+                     'ceilometer-master.tar.gz')},
     'ceilometer-base-plugin-panko': {
         'type': 'url',
         'location': ('$tarballs_base/panko/'
-                     'panko-4.0.0.tar.gz')},
+                     'panko-master.tar.gz')},
     'cinder-base': {
         'type': 'url',
         'location': ('$tarballs_base/cinder/'
-                     'cinder-12.0.0.0rc1.tar.gz')},
+                     'cinder-master.tar.gz')},
     'congress-base': {
         'type': 'url',
         'location': ('$tarballs_base/congress/'
-                     'congress-7.0.0.0rc1.tar.gz')},
+                     'congress-master.tar.gz')},
     'cloudkitty-base': {
         'type': 'url',
         'location': ('$tarballs_base/cloudkitty/'
@@ -329,7 +329,7 @@ SOURCES = {
     'designate-base': {
         'type': 'url',
         'location': ('$tarballs_base/designate/'
-                     'designate-6.0.0.0rc1.tar.gz')},
+                     'designate-master.tar.gz')},
     'dragonflow-base': {
         'type': 'url',
         'location': ('$tarballs_base/dragonflow/'
@@ -337,32 +337,32 @@ SOURCES = {
     'ec2-api': {
         'type': 'url',
         'location': ('$tarballs_base/ec2-api/'
-                     'ec2-api-stable-queens.tar.gz')},
+                     'ec2-api-master.tar.gz')},
     'freezer-api': {
         'type': 'url',
         'location': ('$tarballs_base/freezer-api/'
-                     'freezer-api-6.0.0.0rc1.tar.gz')},
+                     'freezer-api-master.tar.gz')},
     'freezer-base': {
         'type': 'url',
         'location': ('$tarballs_base/freezer/'
-                     'freezer-6.0.0.0rc1.tar.gz')},
+                     'freezer-master.tar.gz')},
     'glance-base': {
         'type': 'url',
         'location': ('$tarballs_base/glance/'
-                     'glance-16.0.0.0rc2.tar.gz')},
+                     'glance-master.tar.gz')},
     'gnocchi-base': {
         'type': 'git',
-        'reference': '4.2.0',
+        'reference': 'master',
         'location': ('https://github.com/gnocchixyz/'
                      'gnocchi.git')},
     'heat-base': {
         'type': 'url',
         'location': ('$tarballs_base/heat/'
-                     'heat-10.0.0.0rc1.tar.gz')},
+                     'heat-master.tar.gz')},
     'horizon': {
         'type': 'url',
         'location': ('$tarballs_base/horizon/'
-                     'horizon-13.0.0.0rc1.tar.gz')},
+                     'horizon-master.tar.gz')},
     'horizon-plugin-cloudkitty-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/cloudkitty-dashboard/'
@@ -370,27 +370,27 @@ SOURCES = {
     'horizon-plugin-designate-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/designate-dashboard/'
-                     'designate-dashboard-6.0.0.0rc1.tar.gz')},
+                     'designate-dashboard-master.tar.gz')},
     'horizon-plugin-fwaas-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-fwaas-dashboard/'
-                     'neutron-fwaas-dashboard-1.2.0.tar.gz')},
+                     'neutron-fwaas-dashboard-master.tar.gz')},
     'horizon-plugin-freezer-web-ui': {
         'type': 'url',
         'location': ('$tarballs_base/freezer-web-ui/'
-                     'freezer-web-ui-6.0.0.0rc1.tar.gz')},
+                     'freezer-web-ui-master.tar.gz')},
     'horizon-plugin-heat-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/heat-dashboard/'
-                     'heat-dashboard-1.0.2.tar.gz')},
+                     'heat-dashboard-master.tar.gz')},
     'horizon-plugin-ironic-ui': {
         'type': 'url',
         'location': ('$tarballs_base/ironic-ui/'
-                     'ironic-ui-3.1.0.tar.gz')},
+                     'ironic-ui-master.tar.gz')},
     'horizon-plugin-karbor-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/karbor-dashboard/'
-                     'karbor-dashboard-1.0.0.tar.gz')},
+                     'karbor-dashboard-master.tar.gz')},
     'horizon-plugin-magnum-ui': {
         'type': 'url',
         'location': ('$tarballs_base/magnum-ui/'
@@ -398,151 +398,147 @@ SOURCES = {
     'horizon-plugin-manila-ui': {
         'type': 'url',
         'location': ('$tarballs_base/manila-ui/'
-                     'manila-ui-2.13.0.tar.gz')},
+                     'manila-ui-master.tar.gz')},
     'horizon-plugin-mistral-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/mistral-dashboard/'
-                     'mistral-dashboard-6.0.0.0rc1.tar.gz')},
+                     'mistral-dashboard-master.tar.gz')},
     'horizon-plugin-monasca-ui': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-ui/'
-                     'monasca-ui-1.12.0.tar.gz')},
+                     'monasca-ui-master.tar.gz')},
     'horizon-plugin-murano-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/murano-dashboard/'
-                     'murano-dashboard-5.0.0.0rc1.tar.gz')},
+                     'murano-dashboard-master.tar.gz')},
     'horizon-plugin-neutron-lbaas-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-lbaas-dashboard/'
-                     'neutron-lbaas-dashboard-4.0.0.0rc1.tar.gz')},
+                     'neutron-lbaas-dashboard-master.tar.gz')},
     'horizon-plugin-sahara-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/sahara-dashboard/'
-                     'sahara-dashboard-8.0.0.0rc1.tar.gz')},
+                     'sahara-dashboard-master.tar.gz')},
     'horizon-plugin-searchlight-ui': {
         'type': 'url',
         'location': ('$tarballs_base/searchlight-ui/'
-                     'searchlight-ui-4.0.0.0rc2.tar.gz')},
+                     'searchlight-ui-master.tar.gz')},
     'horizon-plugin-senlin-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/senlin-dashboard/'
-                     'senlin-dashboard-0.8.0.tar.gz')},
-    # TODO(jeffrey4l): solum-dashboard 2.3.0 is released but not pushed to
-    # tarballs.o.o site, use queens branch instead
+                     'senlin-dashboard-master.tar.gz')},
     'horizon-plugin-solum-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/solum-dashboard/'
-                     'solum-dashboard-stable-queens.tar.gz')},
+                     'solum-dashboard-master.tar.gz')},
     'horizon-plugin-tacker-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/tacker-horizon/'
-                     'tacker-horizon-0.11.0.tar.gz')},
+                     'tacker-horizon-master.tar.gz')},
     'horizon-plugin-trove-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/trove-dashboard/'
-                     'trove-dashboard-10.0.0.0rc1.tar.gz')},
+                     'trove-dashboard-master.tar.gz')},
     'horizon-plugin-vitrage-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/vitrage-dashboard/'
-                     'vitrage-dashboard-1.4.1.tar.gz')},
+                     'vitrage-dashboard-master.tar.gz')},
     'horizon-plugin-watcher-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/watcher-dashboard/'
-                     'watcher-dashboard-1.8.0.tar.gz')},
+                     'watcher-dashboard-master.tar.gz')},
     'horizon-plugin-zaqar-ui': {
         'type': 'url',
         'location': ('$tarballs_base/zaqar-ui/'
-                     'zaqar-ui-4.0.0.0rc1.tar.gz')},
+                     'zaqar-ui-master.tar.gz')},
     'horizon-plugin-zun-ui': {
         'type': 'url',
         'location': ('$tarballs_base/zun-ui/'
-                     'zun-ui-1.0.0.tar.gz')},
+                     'zun-ui-master.tar.gz')},
     'ironic-base': {
         'type': 'url',
         'location': ('$tarballs_base/ironic/'
-                     'ironic-10.1.0.tar.gz')},
+                     'ironic-master.tar.gz')},
     'ironic-inspector': {
         'type': 'url',
         'location': ('$tarballs_base/ironic-inspector/'
-                     'ironic-inspector-7.2.0.tar.gz')},
-    # TODO(jeffrey4l): karbor 1.0.0 is released but not pushed to tarballs.o.o
-    # site, use queens branch instead
+                     'ironic-inspector-master.tar.gz')},
     'karbor-base': {
         'type': 'url',
         'location': ('$tarballs_base/karbor/'
-                     'karbor-stable-queens.tar.gz')},
+                     'karbor-master.tar.gz')},
     'keystone-base': {
         'type': 'url',
         'location': ('$tarballs_base/keystone/'
-                     'keystone-13.0.0.0rc1.tar.gz')},
+                     'keystone-master.tar.gz')},
     'kuryr-base': {
         'type': 'url',
         'location': ('$tarballs_base/kuryr/'
-                     'kuryr-lib-0.7.0.tar.gz')},
+                     'kuryr-master.tar.gz')},
     'kuryr-libnetwork': {
         'type': 'url',
         'location': ('$tarballs_base/kuryr-libnetwork/'
-                     'kuryr-libnetwork-1.0.0.tar.gz')},
+                     'kuryr-libnetwork-master.tar.gz')},
     'magnum-base': {
         'type': 'url',
         'location': ('$tarballs_base/magnum/'
-                     'magnum-6.0.1.tar.gz')},
+                     'magnum-master.tar.gz')},
     'manila-base': {
         'type': 'url',
         'location': ('$tarballs_base/manila/'
-                     'manila-6.0.0.0rc2.tar.gz')},
+                     'manila-master.tar.gz')},
     'mistral-base': {
         'type': 'url',
         'location': ('$tarballs_base/mistral/'
-                     'mistral-6.0.0.0rc1.tar.gz')},
+                     'mistral-master.tar.gz')},
     'mistral-base-plugin-tacker': {
         'type': 'url',
         'location': ('$tarballs_base/tacker/'
-                     'tacker-0.9.0.tar.gz')},
+                     'tacker-master.tar.gz')},
     'monasca-api': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-api/'
-                     'monasca-api-2.5.0.tar.gz')},
+                     'monasca-api-master.tar.gz')},
     'monasca-log-api': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-log-api/'
-                     'monasca-log-api-2.6.0.tar.gz')},
+                     'monasca-log-api-master.tar.gz')},
     'monasca-notification': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-notification/'
-                     'monasca-notification-1.13.0.tar.gz')},
+                     'monasca-notification-master.tar.gz')},
     'monasca-persister': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-persister/'
-                     'monasca-persister-1.10.0.tar.gz')},
+                     'monasca-persister-master.tar.gz')},
     'monasca-statsd': {
         'type': 'url',
         'location': ('$tarballs_base/monasca-statsd/'
-                     'monasca-statsd-1.9.0.tar.gz')},
+                     'monasca-statsd-master.tar.gz')},
     'murano-base': {
         'type': 'url',
         'location': ('$tarballs_base/murano/'
-                     'murano-5.0.0.0rc1.tar.gz')},
+                     'murano-master.tar.gz')},
     'neutron-base': {
         'type': 'url',
         'location': ('$tarballs_base/neutron/'
-                     'neutron-12.0.0.0rc2.tar.gz')},
+                     'neutron-master.tar.gz')},
     'neutron-base-plugin-neutron-fwaas': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-fwaas/'
-                     'neutron-fwaas-12.0.0.0rc1.tar.gz')},
+                     'neutron-fwaas-master.tar.gz')},
     'neutron-base-plugin-networking-generic-switch': {
         'type': 'url',
         'location': ('$tarballs_base/networking-generic-switch/'
-                     'networking-generic-switch-1.0.0.tar.gz')},
+                     'networking-generic-switch-master.tar.gz')},
     'neutron-base-plugin-networking-sfc': {
         'type': 'url',
         'location': ('$tarballs_base/networking-sfc/'
-                     'networking-sfc-6.0.0.0rc1.tar.gz')},
+                     'networking-sfc-master.tar.gz')},
     'neutron-base-plugin-vmware-nsx': {
         'type': 'url',
         'location': ('$tarballs_base/vmware-nsx/'
-                     'vmware-nsx-stable-queens.tar.gz')},
+                     'vmware-nsx-master.tar.gz')},
     'neutron-base-plugin-vpnaas-agent': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-vpnaas/'
@@ -550,59 +546,59 @@ SOURCES = {
     'neutron-bgp-dragent': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-dynamic-routing/'
-                     'neutron-dynamic-routing-12.0.0.0rc2.tar.gz')},
+                     'neutron-dynamic-routing-master.tar.gz')},
     'neutron-lbaas-agent': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-lbaas/'
-                     'neutron-lbaas-12.0.0.0rc1.tar.gz')},
+                     'neutron-lbaas-master.tar.gz')},
     'neutron-server-opendaylight-plugin-networking-odl': {
         'type': 'url',
         'location': ('$tarballs_base/networking-odl/'
-                     'networking-odl-12.0.0.0rc1.tar.gz')},
+                     'networking-odl-master.tar.gz')},
     'neutron-server-opendaylight-plugin-networking-bgpvpn': {
         'type': 'url',
         'location': ('$tarballs_base/networking-bgpvpn/'
-                     'networking-bgpvpn-8.0.0.0rc1.tar.gz')},
+                     'networking-bgpvpn-master.tar.gz')},
     'neutron-server-opendaylight-plugin-networking-l2gw': {
         'type': 'url',
         'location': ('$tarballs_base/networking-l2gw/'
-                     'networking-l2gw-stable-queens.tar.gz')},
+                     'networking-l2gw-master.tar.gz')},
     'neutron-server-opendaylight-plugin-networking-sfc': {
         'type': 'url',
         'location': ('$tarballs_base/networking-sfc/'
-                     'networking-sfc-6.0.0.0rc1.tar.gz')},
+                     'networking-sfc-master.tar.gz')},
     'neutron-server-plugin-neutron-dynamic-routing': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-dynamic-routing/'
-                     'neutron-dynamic-routing-12.0.0.0rc2.tar.gz')},
+                     'neutron-dynamic-routing-master.tar.gz')},
     'neutron-server-plugin-neutron-lbaas': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-lbaas/'
-                     'neutron-lbaas-12.0.0.0rc1.tar.gz')},
+                     'neutron-lbaas-master.tar.gz')},
     'neutron-server-plugin-vmware-nsxlib': {
         'type': 'url',
         'location': ('$tarballs_base/vmware-nsxlib/'
-                     'vmware-nsxlib-stable-queens.tar.gz')},
+                     'vmware-nsxlib-master.tar.gz')},
     'neutron-vpnaas-agent': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-vpnaas/'
-                     'neutron-vpnaas-12.0.0.tar.gz')},
+                     'neutron-vpnaas-master.tar.gz')},
     'neutron-server-ovn-plugin-networking-ovn': {
         'type': 'url',
         'location': ('$tarballs_base/networking-ovn/'
-                     'networking-ovn-4.0.0.0rc2.tar.gz')},
+                     'networking-ovn-master.tar.gz')},
     'neutron-metadata-agent-ovn-plugin-networking-ovn': {
         'type': 'url',
         'location': ('$tarballs_base/networking-ovn/'
-                     'networking-ovn-4.0.0.0rc2.tar.gz')},
+                     'networking-ovn-master.tar.gz')},
     'nova-base': {
         'type': 'url',
         'location': ('$tarballs_base/nova/'
-                     'nova-17.0.0.0rc2.tar.gz')},
+                     'nova-master.tar.gz')},
     'nova-base-plugin-blazar': {
         'type': 'url',
         'location': ('$tarballs_base/blazar-nova/'
-                     'blazar-nova-1.0.1.tar.gz')},
+                     'blazar-nova-master.tar.gz')},
     'nova-base-plugin-mksproxy': {
         'type': 'url',
         'location': ('$tarballs_base/nova-mksproxy/'
@@ -614,7 +610,7 @@ SOURCES = {
     'octavia-base': {
         'type': 'url',
         'location': ('$tarballs_base/octavia/'
-                     'octavia-2.0.0.0rc1.tar.gz')},
+                     'octavia-master.tar.gz')},
     'opendaylight': {
         'type': 'url',
         'location': ('https://nexus.opendaylight.org/content/'
@@ -624,7 +620,7 @@ SOURCES = {
     'panko-base': {
         'type': 'url',
         'location': ('$tarballs_base/panko/'
-                     'panko-4.0.0.tar.gz')},
+                     'panko-master.tar.gz')},
     'tempest-plugin-tempest-conf': {
         'type': 'url',
         'location': ('$tarballs_base/python-tempestconf/'
@@ -720,31 +716,31 @@ SOURCES = {
     'sahara-base': {
         'type': 'url',
         'location': ('$tarballs_base/sahara/'
-                     'sahara-8.0.0.0rc1.tar.gz')},
+                     'sahara-master.tar.gz')},
     'searchlight-base': {
         'type': 'url',
         'location': ('$tarballs_base/searchlight/'
-                     'searchlight-4.0.0.0rc1.tar.gz')},
+                     'searchlight-master.tar.gz')},
     'senlin-base': {
         'type': 'url',
         'location': ('$tarballs_base/senlin/'
-                     'senlin-5.0.0.0rc1.tar.gz')},
+                     'senlin-master.tar.gz')},
     'solum-base': {
         'type': 'url',
         'location': ('$tarballs_base/solum/'
-                     'solum-5.5.1.tar.gz')},
+                     'solum-master.tar.gz')},
     'swift-base': {
         'type': 'url',
         'location': ('$tarballs_base/swift/'
-                     'swift-2.17.0.tar.gz')},
+                     'swift-master.tar.gz')},
     'tacker-base': {
         'type': 'url',
         'location': ('$tarballs_base/tacker/'
-                     'tacker-0.9.0.tar.gz')},
+                     'tacker-master.tar.gz')},
     'tacker-base-plugin-networking-sfc': {
         'type': 'url',
         'location': ('$tarballs_base/networking-sfc/'
-                     'networking-sfc-6.0.0.0rc1.tar.gz')},
+                     'networking-sfc-master.tar.gz')},
     'tempest': {
         'type': 'url',
         'location': ('$tarballs_base/tempest/'
@@ -752,15 +748,15 @@ SOURCES = {
     'tripleo-ui': {
         'type': 'url',
         'location': ('$tarballs_base/tripleo-ui/'
-                     'tripleo-ui-8.2.0.tar.gz')},
+                     'tripleo-ui-latest.tar.gz')},
     'trove-base': {
         'type': 'url',
         'location': ('$tarballs_base/trove/'
-                     'trove-9.0.0.0rc1.tar.gz')},
+                     'trove-master.tar.gz')},
     'vitrage-base': {
         'type': 'url',
         'location': ('$tarballs_base/vitrage/'
-                     'vitrage-2.1.0.tar.gz')},
+                     'vitrage-master.tar.gz')},
     'vmtp': {
         'type': 'url',
         'location': ('$tarballs_base/vmtp/'
@@ -768,15 +764,15 @@ SOURCES = {
     'watcher-base': {
         'type': 'url',
         'location': ('$tarballs_base/watcher/'
-                     'python-watcher-1.8.0.tar.gz')},
+                     'watcher-master.tar.gz')},
     'zaqar': {
         'type': 'url',
         'location': ('$tarballs_base/zaqar/'
-                     'zaqar-6.0.0.0rc1.tar.gz')},
+                     'zaqar-master.tar.gz')},
     'zun-base': {
         'type': 'url',
         'location': ('$tarballs_base/zun/'
-                     'zun-1.0.0.tar.gz')}
+                     'zun-master.tar.gz')}
 }