From a3737384aa9783683388dd15f37685a7f660c57f Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Fri, 14 Oct 2016 13:22:42 -0700
Subject: [PATCH] Revert "Build source from Newton rather then Master"
Revert Note: Move back to master for the master branch.
This reverts commit e1ca39db92ed438991782be091efbdd91747fe8c.
Change-Id: I00758fe44b525efdc21e55ffe0f1b4d040abd63b
---
kolla/common/config.py | 74 +++++++++++++++++++++---------------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 0eac28704e..ad182700cc 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -157,115 +157,115 @@ SOURCES = {
'openstack-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/requirements/'
- 'requirements-stable-newton.tar.gz')},
+ 'requirements-master.tar.gz')},
'aodh-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/aodh/'
- 'aodh-3.0.0.tar.gz')},
+ 'aodh-master.tar.gz')},
'barbican-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/barbican/'
- 'barbican-3.0.0.tar.gz')},
+ 'barbican-master.tar.gz')},
'bifrost-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/bifrost/'
- 'bifrost-2.1.0.tar.gz')},
+ 'bifrost-master.tar.gz')},
'ceilometer-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/ceilometer/'
- 'ceilometer-7.0.0.tar.gz')},
+ 'ceilometer-master.tar.gz')},
'cinder-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/cinder/'
- 'cinder-9.0.0.tar.gz')},
+ 'cinder-master.tar.gz')},
'congress-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/congress/'
- 'congress-4.0.0.tar.gz')},
+ 'congress-master.tar.gz')},
'cloudkitty-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/cloudkitty/'
- 'cloudkitty-0.6.1.tar.gz')},
+ 'cloudkitty-master.tar.gz')},
'designate-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/designate/'
- 'designate-3.0.0.tar.gz')},
+ 'designate-master.tar.gz')},
'glance-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/glance/'
- 'glance-13.0.0.tar.gz')},
+ 'glance-master.tar.gz')},
'gnocchi-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/gnocchi/'
- 'gnocchi-3.0.0.tar.gz')},
+ 'gnocchi-master.tar.gz')},
'heat-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/heat/'
- 'heat-7.0.0.tar.gz')},
+ 'heat-master.tar.gz')},
'horizon': {
'type': 'url',
'location': ('http://tarballs.openstack.org/horizon/'
- 'horizon-10.0.0.tar.gz')},
+ 'horizon-master.tar.gz')},
'horizon-plugin-neutron-lbaas-dashboard': {
'type': 'url',
'location': ('http://tarballs.openstack.org/neutron-lbaas-dashboard/'
- 'neutron-lbaas-dashboard-1.0.0.tar.gz')},
+ 'neutron-lbaas-dashboard-master.tar.gz')},
'ironic-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/ironic/'
- 'ironic-6.2.1.tar.gz')},
+ 'ironic-master.tar.gz')},
'ironic-inspector': {
'type': 'url',
'location': ('http://tarballs.openstack.org/ironic-inspector/'
- 'ironic-inspector-4.2.0.tar.gz')},
+ 'ironic-inspector-master.tar.gz')},
'keystone-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/keystone/'
- 'keystone-10.0.0.tar.gz')},
+ 'keystone-master.tar.gz')},
'kuryr-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/kuryr/'
- 'kuryr-lib-0.1.0.tar.gz')},
+ 'kuryr-master.tar.gz')},
'kuryr-libnetwork': {
'type': 'url',
- 'location': ('http://tarballs.openstack.org/kuryr/'
- 'kuryr-lib-0.1.0.tar.gz')},
+ 'location': ('http://tarballs.openstack.org/kuryr-libnetwork/'
+ 'kuryr-libnetwork-master.tar.gz')},
'magnum-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/magnum/'
- 'magnum-3.1.1.tar.gz')},
+ 'magnum-master.tar.gz')},
'manila-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/manila/'
- 'manila-3.0.0.tar.gz')},
+ 'manila-master.tar.gz')},
'mistral-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/mistral/'
- 'mistral-3.0.0.tar.gz')},
+ 'mistral-master.tar.gz')},
'murano-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/murano/'
- 'murano-3.0.0.tar.gz')},
+ 'murano-master.tar.gz')},
'neutron-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/neutron/'
- 'neutron-9.0.0.tar.gz')},
+ 'neutron-master.tar.gz')},
'neutron-lbaas-agent': {
'type': 'url',
'location': ('http://tarballs.openstack.org/neutron-lbaas/'
- 'neutron-lbaas-9.0.0.tar.gz')},
+ 'neutron-lbaas-master.tar.gz')},
'neutron-sfc-agent': {
'type': 'url',
'location': ('http://tarballs.openstack.org/networking-sfc/'
- 'networking-sfc-2.0.0.tar.gz')},
+ 'networking-sfc-master.tar.gz')},
'neutron-vpnaas-agent': {
'type': 'url',
'location': ('http://tarballs.openstack.org/neutron-vpnaas/'
- 'neutron-vpnaas-9.0.0.tar.gz')},
+ 'neutron-vpnaas-master.tar.gz')},
'nova-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/nova/'
- 'nova-14.0.0.tar.gz')},
+ 'nova-master.tar.gz')},
'nova-spicehtml5proxy': {
'type': 'url',
'location': ('http://github.com/SPICE/spice-html5/tarball/'
@@ -277,11 +277,11 @@ SOURCES = {
'rally': {
'type': 'url',
'location': ('http://tarballs.openstack.org/rally/'
- 'rally-0.6.0.tar.gz')},
+ 'rally-master.tar.gz')},
'sahara-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/sahara/'
- 'sahara-5.0.0.tar.gz')},
+ 'sahara-master.tar.gz')},
'searchlight-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/searchlight/'
@@ -289,27 +289,27 @@ SOURCES = {
'senlin-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/senlin/'
- 'senlin-2.0.0.tar.gz')},
+ 'senlin-master.tar.gz')},
'swift-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/swift/'
- 'swift-2.10.0.tar.gz')},
+ 'swift-master.tar.gz')},
'tempest': {
'type': 'url',
'location': ('http://tarballs.openstack.org/tempest/'
- 'tempest-13.0.0.tar.gz')},
+ 'tempest-master.tar.gz')},
'trove-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/trove/'
- 'trove-6.0.0.tar.gz')},
+ 'trove-master.tar.gz')},
'watcher-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/watcher/'
- 'python-watcher-0.31.0.tar.gz')},
+ 'watcher-master.tar.gz')},
'zaqar': {
'type': 'url',
'location': ('http://tarballs.openstack.org/zaqar/'
- 'zaqar-3.0.0.tar.gz')}
+ 'zaqar-master.tar.gz')}
}