Install pbr egg before installing cliff egg.

Conflicts:
	stack/slapos.cfg

component/python-cliff/buildout.cfg

+[buildout]
+
+[python-cliff]
+recipe = zc.recipe.egg:custom
+egg = cliff
+setup-eggs = ${python-cliff-prep:eggs}
+
+[python-cliff-prep]
+recipe = zc.recipe.egg
+eggs =
+  pbr
+

software/slaprunner/common.cfg

@@ -29,7 +29,6 @@ parts =
   eggs
   instance-runner-import
   instance-runner-export
-  slapos-cookbook
   template-slapos-cfg
 # XXX: we have to manually add this for resilience
   rdiff-backup
@@ -175,42 +174,15 @@ mode = 0644
 [eggs]
 recipe = z3c.recipe.scripts
 eggs =
-  ${lxml-python:egg}
   collective.recipe.environment
   cns.recipe.symlink
   erp5.util
-  hexagonit.recipe.download
-  inotifyx
   lock-file
-  lxml
-  netaddr
   plone.recipe.command
-  pytz
-  slapos.cookbook
-  slapos.libnetworkcache
   slapos.recipe.build
   slapos.toolbox[flask_auth]
-  slapos.core
-  supervisor
-  xml_marshaller
   Gunicorn
-
-# Add slapos.libnetworkcache to path of slapos.core so that slaprunner can build SRs using cache
-[slapos-cookbook]
-eggs =
-  ${lxml-python:egg}
-  slapos.cookbook
-  cliff
-  hexagonit.recipe.download
-  inotifyx
-  netaddr
-  netifaces
-  requests
-  slapos.core
-  supervisor
-  xml_marshaller
-  pytz
-  slapos.libnetworkcache
+  ${slapos-cookbook:eggs}
 
 [extra-eggs]
 recipe = zc.recipe.egg

stack/slapos.cfg

@@ -168,8 +168,14 @@ cliff = 1.15.0
 enum34 = 1.0.4
 
 # Required by:
+<<<<<<< HEAD
 # jsonschema==2.5.1
 functools32 = 3.2.3.post2
+=======
+# cliff==1.9.0
+# stevedore==1.1.0
+pbr = 0.10.4
+>>>>>>> 303ce29... Install pbr egg before installing cliff egg.
 
 # Required by:
 # cryptography==1.0.2