WIP: services: Point repositories to git.baserock.org

1 files changed, 41 insertions, 43 deletions

diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index 4fd97301..01ba6ab5 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -28,7 +28,7 @@ chunks:
   build-depends:
   - greenlet
 - name: py-amqp
-  repo: git://85.199.252.93/delta/python-packages/py-amqp.git
+  repo: upstream:python-packages/py-amqp.git
   ref: 875b10d1715def640042c7ff2f42c00a6c07eed1
   unpetrify-ref: 1.4.6
   build-depends: []
@@ -55,7 +55,7 @@ chunks:
   unpetrify-ref: 0.23
   build-depends: []
 - name: mako
-  repo: git://85.199.252.93/delta/python-packages/mako.git
+  repo: upstream:python-packages/mako.git
   ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7
   unpetrify-ref: rel_1_0_0
   build-depends:
@@ -126,7 +126,7 @@ chunks:
   unpetrify-ref: docutils-0.12
   build-depends: []
 - name: snowballstemmer
-  repo: git://85.199.252.93/delta/python-packages/snowballstemmer.git
+  repo: upstream:python-packages/snowballstemmer.git
   ref: f0d81ce1606d685029302ea073b59d9437d12569
   unpetrify-ref: master
   build-depends: []
@@ -140,12 +140,12 @@ chunks:
   - docutils
   - snowballstemmer
 - name: logilab-common
-  repo: git://85.199.252.93/delta/python-packages/logilab-common.git
+  repo: upstream:python-packages/logilab-common.git
   ref: d1d8f793af6d015d885b9ea67b5741d5a093e2f4
   unpetrify-ref: logilab-common-version-0.62.0
   build-depends: []
 - name: astroid
-  repo: git://85.199.252.93/delta/python-packages/astroid.git
+  repo: upstream:python-packages/astroid.git
   ref: 7657331baa162122890aa4327f4f441cde9f5188
   unpetrify-ref: astroid-1.2.1
   build-depends:
@@ -163,45 +163,45 @@ chunks:
   unpetrify-ref: 2.5.1-final
   build-depends: []
 - name: pystache
-  repo: git://85.199.252.93/delta/python-packages/pystache.git
-  ref: c684298743dbcfb20d06dccba5b74de13120cef9
-  unpetrify-ref: baserock-clone/v0.5.4-submodules
+  repo: upstream:python-packages/pystache.git
+  ref: 0c5e61a4ccc05bde7f6c6132b4fb6c49a3c093fd
+  unpetrify-ref: baserock/v0.5.4
   build-depends: []
 - name: enum34
-  repo: git://85.199.252.93/delta/python-packages/enum34.git
-  ref: 6f566392f62accf077a5e5fb97aa9d15a0388d2b
+  repo: upstream:python-packages/enum34.git
+  ref: f1fa1787ceaac72b9934f318ea2135d28c05dd55
   unpetrify-ref: enum34-1.0
   build-depends: []
 - name: pies
-  repo: git://85.199.252.93/delta/python-packages/pies.git
+  repo: upstream:python-packages/pies.git
   ref: 593dcce07fdb3e8d0053a863a7aba7f2ce8a6c9c
   unpetrify-ref: 2.6.1
   build-depends:
   - enum34
 - name: natsort
-  repo: git://85.199.252.93/delta/python-packages/natsort.git
+  repo: upstream:python-packages/natsort.git
   ref: ce94d418c3849e891f0508b41f5bccc4ae1d4e4d
   unpetrify-ref: 3.5.1
   build-depends: []
 - name: isort
-  repo: git://85.199.252.93/delta/python-packages/isort.git
+  repo: upstream:python-packages/isort.git
   ref: 9d1b03b6e1fd2f87be1c635d6159a76a131f8155
   unpetrify-ref: 3.9.0
   build-depends:
   - pies
   - natsort
 - name: pep8
-  repo: git://85.199.252.93/delta/python-packages/pep8.git
+  repo: upstream:python-packages/pep8.git
   ref: 164066c4d85f212f5f4a11699b848942c678b947
   unpetrify-ref: 1.5.7
   build-depends: []
 - name: pyflakes
-  repo: git://85.199.252.93/delta/python-packages/pyflakes.git
+  repo: upstream:python-packages/pyflakes.git
   ref: 71b7b6776856912d50a0b9a85a8ea2a1dc7eb75c
   unpetrify-ref: 0.8.1
   build-depends: []
 - name: smartypants
-  repo: git://85.199.252.93/delta/python-packages/smartypants.git
+  repo: upstream:python-packages/smartypants.git
   ref: e89b6e7e119694edcd414a556c634d5ca85bff76
   unpetrify-ref: v1.8.6
   build-depends:
@@ -270,22 +270,20 @@ chunks:
   unpetrify-ref: 0.21.1
   build-depends: []
 - name: numpy
-  repo: git://85.199.252.93/delta/python-packages/numpy.git
-  ref: a46fe2f6e894ff86c1c69760971261c73b112f1a
-  unpetrify-ref: baserock-clone/v1.9.0-submodules
+  repo: upstream:python-packages/numpy.git
+  ref: ac07f6d3e45090b224a7da81708e60a762a65f76
+  unpetrify-ref: baserock/v1.9.0
   build-depends:
   - cython
   - sphinx
 - name: websockify
-# This repo is in upstream but we should lorry its submodule
-# and no use a github repository
-  repo: git://85.199.252.93/delta/python-packages/websockify
-  ref: 3b7eb92b47ee5c0a34d202b6d00b83a358920ddb
-  unpetrify-ref: baserock-clone/v0.6.0-submodules
+  repo: upstream:python-packages/websockify
+  ref: e0863aa0c2103069961bc24e618615a0f2bb1487
+  unpetrify-ref: baserock/v0.6.0
   build-depends:
   - numpy
 - name: python-mimeparse
-  repo: git://85.199.252.93/delta/python-packages/python-mimeparse.git
+  repo: upstream:python-packages/python-mimeparse.git
   ref: 2d600d3fc4a386af69d20fba433843b4df2b3c92
   unpetrify-ref: master
   build-depends: []
@@ -295,7 +293,7 @@ chunks:
   repo: upstream:python-packages/httplib2
   build-depends: []
 - name: extras
-  repo: git://85.199.252.93/delta/python-packages/python-test-extras.git
+  repo: upstream:python-packages/python-test-extras.git
   ref: cdeb596f01241e9c779332e86f6edcd0c2e8e9f0
   unpetrify-ref: master
   build-depends: []
@@ -380,7 +378,7 @@ chunks:
   unpetrify-ref: 3.3
   build-depends: []
 - name: ply
-  repo: git://85.199.252.93/delta/python-packages/ply.git
+  repo: upstream:python-packages/ply.git
   ref: 6513f3537d80f483ec9c7e36d52e87f107a57f23
   unpetrify-ref: master
   build-depends: []
@@ -392,17 +390,17 @@ chunks:
   - ply
   - python-decorator
 - name: waitress
-  repo: git://85.199.252.93/delta/python-packages/waitress.git
+  repo: upstream:python-packages/waitress.git
   ref: b795d573a5a9e6e39b46a6e82da367a6a5db8dbd
   unpetrify-ref: 0.8.9
   build-depends: []
 - name: beautifulsoup4
-  repo: git://85.199.252.93/delta/python-packages/beautifulsoup4.git
+  repo: upstream:python-packages/beautifulsoup4.git
   ref: bcd7af0e9159d97aa511fb2d879424d1c1c5aadf
   unpetrify-ref: trunk
   build-depends: []
 - name: webtest
-  repo: git://85.199.252.93/delta/python-packages/webtest.git
+  repo: upstream:python-packages/webtest.git
   ref: 6a24fba456d1c4ac2609b90f1fdc377c595608a4
   unpetrify-ref: 2.0.16
   build-depends:
@@ -410,7 +408,7 @@ chunks:
   - waitress
   - beautifulsoup4
 - name: logutils
-  repo: git://85.199.252.93/delta/python-packages/logutils.git
+  repo: upstream:python-packages/logutils.git
   ref: 095f14efbaaf838b7772bffd36a466abb9668efe
   unpetrify-ref: 0.3.3
   build-depends: []
@@ -581,7 +579,7 @@ chunks:
   - sqlalchemy
   - sqlalchemy-migrate
 - name: glance_store
-  repo: git://85.199.252.93/delta/openstack/glance_store.git
+  repo: upstream:openstack/glance_store.git
   ref: 54f673d4133c1244e2555e7ceb3344c104a74154
   unpetrify-ref: 0.1.8
   build-depends:
@@ -691,13 +689,13 @@ chunks:
   - jinja2
   - pexpect
 - name: wsgiref
-  repo: git://85.199.252.93/delta/python-packages/wsgiref.git
-  ref: 504f5b7a5ce148a865f81723a952e27469410f68
-  unpetrify-ref: baserock-clone/master
+  repo: upstream:python-packages/wsgiref.git
+  ref: e8360785eef259394e13b2062407edc3c2cbc1e0
+  unpetrify-ref: baserock/master
   build-depends: []
 - name: rfc3986
-  repo: git://85.199.252.93/delta/python-packages/python-rfc3986.git
-  ref: 8daff8ef7c8cfa9a2bddc6b2511e269c5eb079a1
+  repo: upstream:python-packages/python-rfc3986.git
+  ref: 9817ec3e47bca8fba9a7cac56d785e9d644f7473
   unpetrify-ref: rfc3986-0.2.0
   build-depends: []
 - name: nova
@@ -759,30 +757,30 @@ chunks:
   - webob
   - wsgiref
 - name: kazoo
-  repo: git://85.199.252.93/delta/python-packages/kazoo.git
+  repo: upstream:python-packages/kazoo.git
   ref: 93a718ea4c20df797766742c3d74de281613c651
   unpretrify-ref: 2.0
   build-depends: []
 - name: pymemcache
-  repo: git://85.199.252.93/delta/python-packages/pymemcache.git
+  repo: upstream:python-packages/pymemcache.git
   ref: 3824d3b0bcdea3e8d0c08598bedfce10fd3c79e0
   unpetrify-ref: master
   build-depends:
   - nose
 - name: zake
-  repo: git://85.199.252.93/delta/python-packages/zake.git
+  repo: upstream:python-packages/zake.git
   ref: 13b92d9db4ad37d9550ef5c5abd323a2530a1e72
   unpetrify-ref: master
   build-depends:
   - kazoo
   - testtools
 - name: sysv_ipc-tarball
-  repo: git://85.199.252.93/delta/python-packages/sysv-ipc-tarball.git
-  ref: 11c30a9005878080597ee4109d1c25ae2c066a82
+  repo: upstream:python-packages/sysv-ipc-tarball.git
+  ref: a77e3a63f004e6ee789fa05e4a5bbc333b1529f1
   unpetrify-ref: sysv_ipc-0.6.8
   build-depends: []
 - name: tooz
-  repo: git://85.199.252.93/delta/python-packages/tooz.git
+  repo: upstream:python-packages/tooz.git
   ref: a90940a506b7c1bf52ef7d2f2ff52204fdcc6221
   unpetrify-ref: 0.7
   build-depends: