aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-09 09:57:04 +0000
committerGerrit Code Review <review@openstack.org>2016-08-09 09:57:04 +0000
commit0c87d4256ac3402b9739128e69f45ce10519d46d (patch)
treef1999457270a20e44ce6c701385f8ff660147747 /kolla
parent4b735e2bf24ead9bee27ef61d035664008331261 (diff)
parenta7c41a8893038cbaeea4cc946a2fbd281b1955db (diff)
downloadkolla-0c87d4256ac3402b9739128e69f45ce10519d46d.tar.gz
kolla-0c87d4256ac3402b9739128e69f45ce10519d46d.zip
Merge "Fix inconsistencies in git url"
Diffstat (limited to 'kolla')
-rw-r--r--kolla/common/config.py4
-rw-r--r--kolla/tests/etc/default.conf2
-rw-r--r--kolla/tests/test_build.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index b243a953b..71b93b888 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -164,8 +164,8 @@ _BASE_OPTS = [
SOURCES = {
'openstack-base': {
'type': 'url',
- 'location': ('https://github.com/openstack/requirements/tarball/'
- 'master')},
+ 'location': ('http://tarballs.openstack.org/requirements/'
+ 'requirements-master.tar.gz')},
'aodh-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/aodh/'
diff --git a/kolla/tests/etc/default.conf b/kolla/tests/etc/default.conf
index 844ae20d1..933e1f8c4 100644
--- a/kolla/tests/etc/default.conf
+++ b/kolla/tests/etc/default.conf
@@ -3,7 +3,7 @@ debug=True
[neutron-server-plugin-networking-arista]
reference = master
-location = https://github.com/openstack/networking-arista
+location = https://git.openstack.org/openstack/networking-arista
type = git
[profiles]
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index 92962913a..e76925960 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -178,7 +178,7 @@ class KollaWorkerTest(base.TestCase):
expected_plugin = {
'name': 'neutron-server-plugin-networking-arista',
'reference': 'master',
- 'source': 'https://github.com/openstack/networking-arista',
+ 'source': 'https://git.openstack.org/openstack/networking-arista',
'type': 'git'
}
for image in kolla.images: