[meta-cloud-services][fido-kilo][PATCH 00/40] upgrade to Kilo 2015.1.2

[meta-cloud-services][fido-kilo][PATCH 00/40] upgrade to Kilo 2015.1.2

[Josep Puigdemont]

This series of patches are an upgrade to the latest Kilo release of
Openstack (2015.1.2).

python-wsme had the wrong license.

There are a couple of cherry-picks from master too.

layer.conf has been modified to select the required version of the
recipes python-six (1.9.0) and python-psutil (1.2.1).

Dependency on python-lockfile and python-lesscpy has been removed, as
Openstack is not using them anymore. The recipes have been removed too, but
this is put in a separate commit, in case you want to preserve them.

This is part of a larger patch set to bring fido-kilo to a more functional
state.

Jackie Huang (1):
  python-xstatic-angular-irdragndrop: add new recipe

Josep Puigdemont (38):
  python-tooz: updated to 0.13.3 (kilo latest)
  python-wsme: upgrade to 0.8.0, set proper license
  python-pycadf: upgrade to 0.8.0 (kilo)
  layer.conf: prefer python-six 1.9.0
  python-stevedore: upgrade to 1.3.0 (kilo)
  python-oslo.config: upgrade to 1.9.3 (kilo)
  python-oslo.i18n: upgrade to 1.5.0 (kilo)
  python-oslo.utils: update to 1.4.0, add dependencies
  python-oslo.concurrency: updated to 1.8.2 (kilo)
  python-oslo.context: upgrade to 0.2.0 (kilo)
  python-oslo.db: upgrade to 1.7.2 (kilo)
  python-wrapt: add recipe
  python-debtcollector: add recipe
  python-oslo.log: update to 1.0.0, add dependencies
  python-oslo.serialization: upgrade to 1.4.0
  python-oslo.middleware: upgrade to 1.0.0
  python-trollius: add recipe
  python-aioeventlet: add recipe
  python-oslo.messaging: upgrade to 1.8.3
  python-oslo.rootwrap: upgrade to 1.6.0
  python-psutil: add recipe
  layer.conf: prefer 1.2.1 version of python-psutil
  python-cinderclient: upgrade to 1.1.2
  python-glanceclient: upgrade to 0.17.3
  python-jsonrpclib: add recipe
  python-keystonemiddleware: upgrade to 1.5.2
  python-nova: upgrade to 2015.1.2
  python-neutron: upgrade to 2015.1.2
  neutron ml2 plugin: enable gre in [agent] section
  python-cryptography,-vectors: add 0.8.1
  python-oslo.policy: add new recipe
  python-keystone: upgrade to 2015.1.2
  python-keystoneclient: upgrade to 1.3.3
  python-horizon: upgrade to 2015.1.2
  python-horizon: remove dependency on lesscpy
  python-lesscpy: remove recipe
  Openstack doesn't depend on lockfile anymore
  python-lockfile: remove recipe

Mark Asselstine (1):
  horizon: add missing dependencies to address startup errors

 meta-openstack/conf/layer.conf                     |  2 +
 .../python/python-aioeventlet_0.4.bb               | 14 +++++++
 .../python/python-ceilometer_git.bb                |  1 -
 .../recipes-devtools/python/python-cinder_git.bb   |  1 -
 .../python/python-cinderclient_git.bb              |  7 ++--
 .../python/python-cryptography-vectors_0.8.1.bb    | 14 +++++++
 .../python/python-cryptography/run-ptest           |  2 +
 .../python/python-cryptography_0.8.1.bb            | 46 ++++++++++++++++++++++
 .../python/python-debtcollector_0.3.0.bb           | 22 +++++++++++
 .../python/python-glanceclient_git.bb              | 18 ++++-----
 .../recipes-devtools/python/python-heat_git.bb     |  1 -
 .../recipes-devtools/python/python-horizon_git.bb  | 13 +++---
 .../python/python-jsonrpclib_0.1.6.bb              | 11 ++++++
 .../recipes-devtools/python/python-keystone_git.bb |  9 +++--
 .../python/python-keystoneclient_git.bb            |  8 ++--
 .../python/python-keystonemiddleware_git.bb        |  7 ++--
 .../0001-lesscpy-remove-explicit-python3.patch     | 23 -----------
 ...02-Description-Fixup-for-python3.3-compat.patch | 31 ---------------
 .../recipes-devtools/python/python-lesscpy_0.9j.bb | 28 -------------
 .../python/python-lockfile_0.9.1.bb                | 17 --------
 .../recipes-devtools/python/python-neutron_git.bb  | 13 +++---
 .../recipes-devtools/python/python-nova_git.bb     |  9 +++--
 ...y_1.5.0.bb => python-oslo.concurrency_1.8.2.bb} | 14 +++++--
 ...config_1.6.1.bb => python-oslo.config_1.9.3.bb} |  4 +-
 .../python/python-oslo.context_git.bb              |  9 ++---
 ...on-oslo.db_1.5.0.bb => python-oslo.db_1.7.2.bb} |  7 +---
 ...slo.i18n_1.4.0.bb => python-oslo.i18n_1.5.0.bb} |  5 ++-
 .../recipes-devtools/python/python-oslo.log_git.bb | 11 +++---
 .../python/python-oslo.messaging_git.bb            | 23 +++++++----
 ...re_0.4.0.bb => python-oslo.middleware_1.0.0.bb} | 16 ++++----
 .../python/python-oslo.policy_0.3.2.bb             | 29 ++++++++++++++
 ...wrap_1.5.0.bb => python-oslo.rootwrap_1.6.0.bb} |  7 ++--
 .../python/python-oslo.serialization_git.bb        | 11 ++++--
 .../python/python-oslo.utils_git.bb                | 12 ++++--
 .../recipes-devtools/python/python-psutil_1.2.1.bb | 16 ++++++++
 ...thon-pycadf_0.6.0.bb => python-pycadf_0.8.0.bb} |  6 +--
 ...tevedore_1.2.0.bb => python-stevedore_1.3.0.bb} | 13 ++----
 .../{python-tooz_0.4.bb => python-tooz_0.13.3.bb}  |  6 +--
 .../recipes-devtools/python/python-trollius_2.0.bb | 10 +++++
 .../recipes-devtools/python/python-wrapt_1.10.5.bb | 11 ++++++
 .../{python-wsme_0.6.bb => python-wsme_0.8.0.bb}   | 14 ++++---
 .../python-xstatic-angular-irdragndrop_1.0.2.2.bb  | 22 +++++++++++
 .../python-xstatic-angular-lrdragndrop_1.0.2.2.bb  | 22 +++++++++++
 .../python/python-xstatic-magic-search_0.2.5.1.bb  | 21 ++++++++++
 44 files changed, 366 insertions(+), 220 deletions(-)
 create mode 100644 meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-cryptography-vectors_0.8.1.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-cryptography/run-ptest
 create mode 100644 meta-openstack/recipes-devtools/python/python-cryptography_0.8.1.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-debtcollector_0.3.0.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-jsonrpclib_0.1.6.bb
 delete mode 100644 meta-openstack/recipes-devtools/python/python-lesscpy/0001-lesscpy-remove-explicit-python3.patch
 delete mode 100644 meta-openstack/recipes-devtools/python/python-lesscpy/0002-Description-Fixup-for-python3.3-compat.patch
 delete mode 100644 meta-openstack/recipes-devtools/python/python-lesscpy_0.9j.bb
 delete mode 100644 meta-openstack/recipes-devtools/python/python-lockfile_0.9.1.bb
 rename meta-openstack/recipes-devtools/python/{python-oslo.concurrency_1.5.0.bb => python-oslo.concurrency_1.8.2.bb} (61%)
 rename meta-openstack/recipes-devtools/python/{python-oslo.config_1.6.1.bb => python-oslo.config_1.9.3.bb} (79%)
 rename meta-openstack/recipes-devtools/python/{python-oslo.db_1.5.0.bb => python-oslo.db_1.7.2.bb} (78%)
 rename meta-openstack/recipes-devtools/python/{python-oslo.i18n_1.4.0.bb => python-oslo.i18n_1.5.0.bb} (77%)
 rename meta-openstack/recipes-devtools/python/{python-oslo.middleware_0.4.0.bb => python-oslo.middleware_1.0.0.bb} (60%)
 create mode 100644 meta-openstack/recipes-devtools/python/python-oslo.policy_0.3.2.bb
 rename meta-openstack/recipes-devtools/python/{python-oslo.rootwrap_1.5.0.bb => python-oslo.rootwrap_1.6.0.bb} (76%)
 create mode 100644 meta-openstack/recipes-devtools/python/python-psutil_1.2.1.bb
 rename meta-openstack/recipes-devtools/python/{python-pycadf_0.6.0.bb => python-pycadf_0.8.0.bb} (81%)
 rename meta-openstack/recipes-devtools/python/{python-stevedore_1.2.0.bb => python-stevedore_1.3.0.bb} (53%)
 rename meta-openstack/recipes-devtools/python/{python-tooz_0.4.bb => python-tooz_0.13.3.bb} (81%)
 create mode 100644 meta-openstack/recipes-devtools/python/python-trollius_2.0.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-wrapt_1.10.5.bb
 rename meta-openstack/recipes-devtools/python/{python-wsme_0.6.bb => python-wsme_0.8.0.bb} (56%)
 create mode 100644 meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-xstatic-angular-lrdragndrop_1.0.2.2.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-xstatic-magic-search_0.2.5.1.bb

-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 01/40] python-tooz: updated to 0.13.3 (kilo latest)

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../python/{python-tooz_0.4.bb => python-tooz_0.13.3.bb}            | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-tooz_0.4.bb => python-tooz_0.13.3.bb} (81%)

diff --git a/meta-openstack/recipes-devtools/python/python-tooz_0.4.bb b/meta-openstack/recipes-devtools/python/python-tooz_0.13.3.bb
similarity index 81%
rename from meta-openstack/recipes-devtools/python/python-tooz_0.4.bb
rename to meta-openstack/recipes-devtools/python/python-tooz_0.13.3.bb
index 9ea75c3..a461725 100644
--- a/meta-openstack/recipes-devtools/python/python-tooz_0.4.bb
+++ b/meta-openstack/recipes-devtools/python/python-tooz_0.13.3.bb
@@ -4,13 +4,11 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
-PR = "r0"
-
 SRCNAME = "tooz"
 SRC_URI = "http://pypi.python.org/packages/source/t/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "26c2ff05188be7a4ba9d13ef54a6280c"
-SRC_URI[sha256sum] = "4db6b9058f2886af067bb81b8f757de095fc7a0bb24beef82c769478229ee595"
+SRC_URI[md5sum] = "2e9815c91508c34f5413b38597155017"
+SRC_URI[sha256sum] = "8b6ea7026a920eaa8508f2004fcd2c891267da88cc1ae5224f344af849395b64"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 02/40] python-wsme: upgrade to 0.8.0, set proper license

[Josep Puigdemont]

License is MIT.

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../python/{python-wsme_0.6.bb => python-wsme_0.8.0.bb}    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-wsme_0.6.bb => python-wsme_0.8.0.bb} (56%)

diff --git a/meta-openstack/recipes-devtools/python/python-wsme_0.6.bb b/meta-openstack/recipes-devtools/python/python-wsme_0.8.0.bb
similarity index 56%
rename from meta-openstack/recipes-devtools/python/python-wsme_0.6.bb
rename to meta-openstack/recipes-devtools/python/python-wsme_0.8.0.bb
index b0c159a..9bc5651 100644
--- a/meta-openstack/recipes-devtools/python/python-wsme_0.6.bb
+++ b/meta-openstack/recipes-devtools/python/python-wsme_0.8.0.bb
@@ -1,16 +1,15 @@
 DESCRIPTION = "Simplify the writing of REST APIs, and extend them with additional protocols"
 HOMEPAGE = "https://pypi.python.org/pypi/WSME/"
 SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=477dfa54ede28e2f361e7db05941d7a7"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5a9126e7f56a0cf3247050de7f10d0f4"
 
-PR = "r0"
 SRCNAME = "WSME"
 
 SRC_URI = "https://pypi.python.org/packages/source/W/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "80a46e564ae0710118ddeded8c5f4412"
-SRC_URI[sha256sum] = "8a37981ebf877d2ca8ae12f6c6fc3d920cb0c9d7be68fef419de252797dfdc15"
+SRC_URI[md5sum] = "8a257dc57d11a750c9aac34033ea8663"
+SRC_URI[sha256sum] = "00241e4e4e40d6183f6354a8f5659b601753d49e28b6e5aca332bdf2e31188db"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
@@ -22,5 +21,10 @@ DEPENDS += " \
         "
 
 RDEPENDS_${PN} += "\
+        python-netaddr \
         python-pbr \
+        python-pytz \
+        python-simplegeneric \
+        python-six \
+        python-webob \
         "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 03/40] python-pycadf: upgrade to 0.8.0 (kilo)

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../python/{python-pycadf_0.6.0.bb => python-pycadf_0.8.0.bb}       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-pycadf_0.6.0.bb => python-pycadf_0.8.0.bb} (81%)

diff --git a/meta-openstack/recipes-devtools/python/python-pycadf_0.6.0.bb b/meta-openstack/recipes-devtools/python/python-pycadf_0.8.0.bb
similarity index 81%
rename from meta-openstack/recipes-devtools/python/python-pycadf_0.6.0.bb
rename to meta-openstack/recipes-devtools/python/python-pycadf_0.8.0.bb
index 1857063..14b530b 100644
--- a/meta-openstack/recipes-devtools/python/python-pycadf_0.6.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-pycadf_0.8.0.bb
@@ -4,13 +4,11 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8"
 
-PR = "r0"
-
 SRCNAME = "pycadf"
 SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "283ff62801098f499e37aa493c1d18bb"
-SRC_URI[sha256sum] = "9ba1e9ac52ee2a2d6d9cc89847323559cc2ffe7b4d80b703944a0a1f75c7093f"
+SRC_URI[md5sum] = "3a9f439003ed165db7e9a7ef1d360259"
+SRC_URI[sha256sum] = "240d7775682a0f49fb580310dd6459e8a8b5f5619dfdc687f043c3fe21b48ba1"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 04/40] layer.conf: prefer python-six 1.9.0

[Josep Puigdemont]

Openstack Kilo requires python-six 1.9.0, or older, but
meta-virtualization provides an older version of python-six, which
gets selected due to higher priority. Solve this as a preferred
version in layer.conf.

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/conf/layer.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index 2b3a00d..93b03db 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -14,3 +14,4 @@ BB_DANGLINGAPPENDS_WARNONLY ?= "true"
 PREFERRED_VERSION_python-greenlet = "0.4.1"
 PREFERRED_VERSION_python-sqlalchemy = "0.9.7"
 PREFERRED_VERSION_python-pexpect = "3.3"
+PREFERRED_VERSION_python-six = "1.9.0"
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 05/40] python-stevedore: upgrade to 1.3.0 (kilo)

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 ...{python-stevedore_1.2.0.bb => python-stevedore_1.3.0.bb} | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-stevedore_1.2.0.bb => python-stevedore_1.3.0.bb} (53%)

diff --git a/meta-openstack/recipes-devtools/python/python-stevedore_1.2.0.bb b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
similarity index 53%
rename from meta-openstack/recipes-devtools/python/python-stevedore_1.2.0.bb
rename to meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
index 0f493eb..6100f68 100644
--- a/meta-openstack/recipes-devtools/python/python-stevedore_1.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-stevedore_1.3.0.bb
@@ -4,17 +4,10 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-PR = "r0"
+SRC_URI[md5sum] = "e9ed2a1cf91ee76fd9045f902fa58089"
+SRC_URI[sha256sum] = "beab2b7f91966d259796392c39ed6f260b32851861561dd9f3b9be2fd0c426a5"
 
-SRCNAME = "stevedore"
-SRC_URI = "http://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "bd82728ab03e62121fbbb077bcd55fdb"
-SRC_URI[sha256sum] = "3f70db9052c26e66dac61cb73d8c6f5211373983d39872addab617c759db4b45"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+inherit pypi
 
 DEPENDS += " \
         python-pip \
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 06/40] python-oslo.config: upgrade to 1.9.3 (kilo)

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../{python-oslo.config_1.6.1.bb => python-oslo.config_1.9.3.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-oslo.config_1.6.1.bb => python-oslo.config_1.9.3.bb} (79%)

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config_1.6.1.bb b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
similarity index 79%
rename from meta-openstack/recipes-devtools/python/python-oslo.config_1.6.1.bb
rename to meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
index 6cc72f6..3094b1e 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.config_1.6.1.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.config_1.9.3.bb
@@ -9,8 +9,8 @@ SRCNAME = "oslo.config"
 
 SRC_URI = "https://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "d51fd561300f46945dd24977c429280c"
-SRC_URI[sha256sum] = "4709df3a8ba05e6a47300770f1c90ade77b3d095f28e8f75191df8745268bb20"
+SRC_URI[md5sum] = "109da1307ea8c65440accccbc59cf9a5"
+SRC_URI[sha256sum] = "ab54e67776d9bbee86ba8cce9393ba3186e6e63de926e9797598dc35fe790140"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 07/40] python-oslo.i18n: upgrade to 1.5.0 (kilo)

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../python/{python-oslo.i18n_1.4.0.bb => python-oslo.i18n_1.5.0.bb}  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-oslo.i18n_1.4.0.bb => python-oslo.i18n_1.5.0.bb} (77%)

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.i18n_1.4.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.i18n_1.5.0.bb
similarity index 77%
rename from meta-openstack/recipes-devtools/python/python-oslo.i18n_1.4.0.bb
rename to meta-openstack/recipes-devtools/python/python-oslo.i18n_1.5.0.bb
index d2bc53b..dc50ad9 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.i18n_1.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.i18n_1.5.0.bb
@@ -9,8 +9,8 @@ PR = "r0"
 SRCNAME = "oslo.i18n"
 SRC_URI = "http://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "afd0a3394785b1b37959c1384129a554"
-SRC_URI[sha256sum] = "a3d64e8d2b4235a457da2c6269d8c97e867a90ba7d938fe0ed3cfc792c8c87bb"
+SRC_URI[md5sum] = "4ed6035729343bb4becdc5ffe6dc8e24"
+SRC_URI[sha256sum] = "cd09da0780e45737b784bdc026ea705ad006e3c003aa5dfeab83f269b4ea0e70"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
@@ -27,4 +27,5 @@ DEPENDS += " \
 RDEPENDS_${PN} += " \
         python-babel \
         python-pbr \
+        python-six \
         "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 08/40] python-oslo.utils: update to 1.4.0, add dependencies

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../recipes-devtools/python/python-oslo.utils_git.bb         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb
index 33c7e53..aaacc37 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb
@@ -4,13 +4,11 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
-PR = "r0"
-
 SRCNAME = "oslo.utils"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git"
 
-PV = "1.3.0"
-SRCREV = "ed4e2d775a56b9d47ed314f96dccd9221a91e241"
+PV = "1.4.0"
+SRCREV = "91dc782c2f11fb76425effd7a331d63111adf1ce"
 S = "${WORKDIR}/git"
 
 inherit setuptools
@@ -24,5 +22,11 @@ DEPENDS += " \
 
 # RDEPENDS_default: 
 RDEPENDS_${PN} += " \
+        python-babel \
+        python-iso8601 \
+        python-netaddr \
+        python-netifaces \
+        python-oslo.i18n \
         python-pbr \
+        python-six \
         "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 09/40] python-oslo.concurrency: updated to 1.8.2 (kilo)

[Josep Puigdemont]

Updated to latest kilo version, added dependencies.

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 ...ncurrency_1.5.0.bb => python-oslo.concurrency_1.8.2.bb} | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-oslo.concurrency_1.5.0.bb => python-oslo.concurrency_1.8.2.bb} (61%)

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.concurrency_1.5.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.concurrency_1.8.2.bb
similarity index 61%
rename from meta-openstack/recipes-devtools/python/python-oslo.concurrency_1.5.0.bb
rename to meta-openstack/recipes-devtools/python/python-oslo.concurrency_1.8.2.bb
index bdd3559..aaed290 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.concurrency_1.5.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.concurrency_1.8.2.bb
@@ -4,13 +4,11 @@ SECTION = "devel/python"
 LICENSE = "Apache-2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
-PR = "r0"
-
 SRCNAME = "oslo.concurrency"
 SRC_URI = "http://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "83baf51766c3acf9929223762689ebfd"
-SRC_URI[sha256sum] = "89b62c029f0ecfcc92da22277e93fbe74363d459208bf62d2c9e7a3da0019e83"
+SRC_URI[md5sum] = "1ba5ae8bdbb9c12c1b6baa8e3d400b7f"
+SRC_URI[sha256sum] = "149f4c972916f14c14c97d7be7b92ba59497c1bbd09c114ee3681bef0773daca"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
@@ -25,5 +23,13 @@ DEPENDS += " \
 
 # RDEPENDS_default: 
 RDEPENDS_${PN} += " \
+        python-babel \
+        python-fixtures \
+        python-iso8601 \
+        python-oslo.i18n \
+        python-oslo.utils \
         python-pbr \
+        python-posix-ipc \
+        python-retrying \
+        python-six \
         "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 10/40] python-oslo.context: upgrade to 0.2.0 (kilo)

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../recipes-devtools/python/python-oslo.context_git.bb           | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb
index d48abe5..2b5d5d7 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb
@@ -4,13 +4,11 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
-PR = "r0"
-
 SRCNAME = "oslo.context"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo"
 
-PV = "0.1.0"
-SRCREV = "205479f254e2bc90c0c142f1f75df500ae94f916"
+PV = "0.2.0"
+SRCREV = "6dde0a3ee69c44a0fd836fdd520f6efb1cb34229"
 S = "${WORKDIR}/git"
 
 inherit setuptools
@@ -23,6 +21,7 @@ DEPENDS += " \
 
 # RDEPENDS_default: 
 RDEPENDS_${PN} += " \
+        python-babel \
         python-pbr \
         bash \
         "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 11/40] python-oslo.db: upgrade to 1.7.2 (kilo)

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../python/{python-oslo.db_1.5.0.bb => python-oslo.db_1.7.2.bb}     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-oslo.db_1.5.0.bb => python-oslo.db_1.7.2.bb} (81%)

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.db_1.5.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.db_1.7.2.bb
similarity index 81%
rename from meta-openstack/recipes-devtools/python/python-oslo.db_1.5.0.bb
rename to meta-openstack/recipes-devtools/python/python-oslo.db_1.7.2.bb
index 1c3a7b4..3f2dd95 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.db_1.5.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.db_1.7.2.bb
@@ -4,14 +4,12 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
-PR = "r0"
+SRC_URI[md5sum] = "a66179ca85c81d419e5eb5ec338783c7"
+SRC_URI[sha256sum] = "e10b1bc9b128aaeae652809e1659ec2d2f64e2d1a143b9c9c66eb9cfef66c02c"
 
 SRCNAME = "oslo.db"
 SRC_URI = "http://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "b5786f249c3af5a45e39fcb495ef62f1"
-SRC_URI[sha256sum] = "1358218c8055226e6a11aca521e46f7e0e13174b2ff4ae0503b372def10cd26e"
-
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 12/40] python-wrapt: add recipe

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-wrapt_1.10.5.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-wrapt_1.10.5.bb

diff --git a/meta-openstack/recipes-devtools/python/python-wrapt_1.10.5.bb b/meta-openstack/recipes-devtools/python/python-wrapt_1.10.5.bb
new file mode 100644
index 0000000..5a8d0e7
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-wrapt_1.10.5.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "A Python module for decorators, wrappers and monkey patching."
+HOMEPAGE = "https://pypi.python.org/pypi/wrapt/"
+SECTION = "devel/python"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=848d45ec255e411c0ff82b034a49d8a0"
+
+SRC_URI[md5sum] = "79732bbc096235704e7523d3bacd202c"
+SRC_URI[sha256sum] = "99cbb4e3a3ea964df0cb1437261fc1198616ec872e7b501622f3f7f92fcd0833"
+
+inherit pypi
+
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 13/40] python-debtcollector: add recipe

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../python/python-debtcollector_0.3.0.bb           | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-debtcollector_0.3.0.bb

diff --git a/meta-openstack/recipes-devtools/python/python-debtcollector_0.3.0.bb b/meta-openstack/recipes-devtools/python/python-debtcollector_0.3.0.bb
new file mode 100644
index 0000000..af88441
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-debtcollector_0.3.0.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "A collection of Python deprecation patterns and strategies"
+HOMEPAGE = "https://pypi.python.org/pypi/debtcollector/"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
+
+SRC_URI[md5sum] = "21e711b88ab956bb1c1d15444bfca0a6"
+SRC_URI[sha256sum] = "64cf1ab9bacbdda8c83a569349f2a91211a890973e0119514a9b7bf34518373e"
+
+inherit pypi
+
+DEPENDS += " \
+    python-pbr \
+    "
+
+RDEPENDS_${PN} += " \
+    python-babel \
+    python-oslo.utils \
+    python-pbr \
+    python-six \
+    python-wrapt \
+    "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 14/40] python-oslo.log: update to 1.0.0, add dependencies

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-oslo.log_git.bb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb
index bfcbe31..1518717 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb
@@ -4,13 +4,11 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
-PR = "r0"
-
 SRCNAME = "oslo.log"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo"
 
-PV = "0.3.0"
-SRCREV = "5139941a0c8d63ae33421a2082e35fae0f800b67"
+PV = "1.0.0"
+SRCREV = "4f01e7e540e5cc6b26d32f2bc56dccd3fcd21920"
 S = "${WORKDIR}/git"
 
 inherit setuptools
@@ -24,6 +22,8 @@ DEPENDS += " \
 # RDEPENDS_default: 
 RDEPENDS_${PN} += " \
         bash \
+        python-babel \
+        python-debtcollector \
         python-pbr \
         python-iso8601 \
         python-oslo.config \
@@ -31,4 +31,5 @@ RDEPENDS_${PN} += " \
         python-oslo.i18n \
         python-oslo.utils \
         python-oslo.serialization\
+        python-six \
         "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 15/40] python-oslo.serialization: upgrade to 1.4.0

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../recipes-devtools/python/python-oslo.serialization_git.bb  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb
index db2869c..762d2bb 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb
@@ -4,13 +4,11 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
-PR = "r0"
-
 SRCNAME = "oslo.serialization"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git"
 
-PV = "1.3.0"
-SRCREV = "c89b3f80393b224e4c93f546bc00a4a36c5fb279"
+PV = "1.4.0"
+SRCREV = "7bfd5dece0f22dbdea1c3e524dbc0eca1f70f1b7"
 S = "${WORKDIR}/git"
 
 inherit setuptools
@@ -24,5 +22,10 @@ DEPENDS += " \
 
 # RDEPENDS_default: 
 RDEPENDS_${PN} += " \
+        python-babel \
+        python-iso8601 \
+        python-oslo.utils \
         python-pbr \
+        python-pytz \
+        python-six \
         "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 16/40] python-oslo.middleware: upgrade to 1.0.0

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 ...ddleware_0.4.0.bb => python-oslo.middleware_1.0.0.bb} | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-oslo.middleware_0.4.0.bb => python-oslo.middleware_1.0.0.bb} (60%)

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.middleware_0.4.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.middleware_1.0.0.bb
similarity index 60%
rename from meta-openstack/recipes-devtools/python/python-oslo.middleware_0.4.0.bb
rename to meta-openstack/recipes-devtools/python/python-oslo.middleware_1.0.0.bb
index 6affd47..5595a88 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.middleware_0.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.middleware_1.0.0.bb
@@ -4,26 +4,28 @@ SECTION = "devel/python"
 LICENSE = "Apache-2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
-PR = "r0"
-
 SRCNAME = "oslo.middleware"
 SRC_URI = "http://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "bca65b0372bd1f13eefa4c7205c9df99"
-SRC_URI[sha256sum] = "d300f8342b5faaf712890d58da111789740aebb4b46874e41b45110b704719cb"
+SRC_URI[md5sum] = "5102848f299c777e8333d207149e87ab"
+SRC_URI[sha256sum] = "5ccf160ae5ce23f3f59b86535352e3b5a9fa35dab0edc4ede8b17438da559995"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
 
-# DEPENDS_default: python-pip
-
 DEPENDS += " \
         python-pip \
         python-pbr \
         "
 
-# RDEPENDS_default: 
 RDEPENDS_${PN} += " \
+        python-babel \
+        python-oslo.config \
+        python-oslo.context \
+        python-oslo.i18n \
+        python-six \
+        python-stevedore \
+        python-webob \
         python-pbr \
         "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 17/40] python-trollius: add recipe

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-trollius_2.0.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-trollius_2.0.bb

diff --git a/meta-openstack/recipes-devtools/python/python-trollius_2.0.bb b/meta-openstack/recipes-devtools/python/python-trollius_2.0.bb
new file mode 100644
index 0000000..0a64581
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-trollius_2.0.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2"
+HOMEPAGE = "https://pypi.python.org/pypi/trollius"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8f7bb094c7232b058c7e9f2e431f389c"
+
+SRC_URI[md5sum] = "5704231bc385660783c5fad59e75549d"
+SRC_URI[sha256sum] = "a8e0e2d3a3193be3e0f113253f41675d2679d23c491f32b37f4e0a736f32a28f"
+
+inherit pypi
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 18/40] python-aioeventlet: add recipe

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../recipes-devtools/python/python-aioeventlet_0.4.bb      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb

diff --git a/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb b/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb
new file mode 100644
index 0000000..3b3a330
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "asyncio event loop scheduling callbacks in eventlet"
+HOMEPAGE = "https://pypi.python.org/pypi/aioeventlet"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8f7bb094c7232b058c7e9f2e431f389c"
+
+SRC_URI[md5sum] = "678ea30265ae0326bddc767f80efd144"
+SRC_URI[sha256sum] = "fe78c2b227ce077b1581e2ae2c071f351111d0878ec1b0216435f6a898df79a6"
+
+inherit pypi
+
+RDEPENDS_${PN} += " \
+    python-trollius \
+    "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 19/40] python-oslo.messaging: upgrade to 1.8.3

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../python/python-oslo.messaging_git.bb            | 23 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb
index 8841ec0..82a5c98 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb
@@ -4,26 +4,33 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8"
 
-PR = "r0"
-
 SRCNAME = "oslo.messaging"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo"
 
-PV = "1.6.0"
-SRCREV = "68cd8cfecc12a40b61a7b8557aad7b5a4e1f1c6d"
+PV = "1.8.3"
+SRCREV = "0f24108058fbf15752d384be4c13e4fbac801f2a"
 S = "${WORKDIR}/git"
 
 inherit setuptools
 
-# DEPENDS_default: python-pip
-
 DEPENDS += " \
         python-pip \
         python-pbr \
         "
 
-# RDEPENDS_default: 
 RDEPENDS_${PN} += " \
         bash \
         python-pbr \
+        python-oslo.config \
+        python-oslo.utils \
+        python-oslo.serialization \
+        python-oslo.i18n \
+        python-stevedore \
+        python-six \
+        python-eventlet \
+        python-pyyaml \
+        python-kombu \
+        python-oslo.middleware \
+        python-futures \
+        python-aioeventlet \
         "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 20/40] python-oslo.rootwrap: upgrade to 1.6.0

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 ...python-oslo.rootwrap_1.5.0.bb => python-oslo.rootwrap_1.6.0.bb} | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-oslo.rootwrap_1.5.0.bb => python-oslo.rootwrap_1.6.0.bb} (76%)

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_1.5.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_1.6.0.bb
similarity index 76%
rename from meta-openstack/recipes-devtools/python/python-oslo.rootwrap_1.5.0.bb
rename to meta-openstack/recipes-devtools/python/python-oslo.rootwrap_1.6.0.bb
index e3a47fa..93e3c74 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_1.5.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_1.6.0.bb
@@ -4,13 +4,11 @@ SECTION = "devel/python"
 LICENSE = "Apache-2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8"
 
-PR = "r0"
-
 SRCNAME = "oslo.rootwrap"
 SRC_URI = "http://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "3a988feffa7a0fb022857db9287bf8b9"
-SRC_URI[sha256sum] = "d2842359c08d7ecc5e5255f9c97aa9c42300eaed556d8f46fc18537e5d00b97e"
+SRC_URI[md5sum] = "dde8877cf09581a7dd24673806f778dd"
+SRC_URI[sha256sum] = "5fe6d1619a5306f9181899c7cc5251ba5a0de0d3c60f85b2172a2f7d400a4962"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
@@ -26,4 +24,5 @@ DEPENDS += " \
 # RDEPENDS_default: 
 RDEPENDS_${PN} += " \
         python-pbr \
+        python-six \
         "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 21/40] python-psutil: add recipe

[Josep Puigdemont]

The version in meta-python is too old, Openstack requires
version >=1.1.1 or < 2.0.0.

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../recipes-devtools/python/python-psutil_1.2.1.bb       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-psutil_1.2.1.bb

diff --git a/meta-openstack/recipes-devtools/python/python-psutil_1.2.1.bb b/meta-openstack/recipes-devtools/python/python-psutil_1.2.1.bb
new file mode 100644
index 0000000..a5555bc
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-psutil_1.2.1.bb
@@ -0,0 +1,16 @@
+SUMMARY = "A cross-platform process and system utilities module for Python"
+SECTION = "devel/python"
+HOMEPAGE = "http://code.google.com/p/psutil"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0f02e99f7f3c9a7fe8ecfc5d44c2be62"
+
+SRCNAME = "psutil"
+
+SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI[md5sum] = "80c3b251389771ab472e554e6c729c36"
+SRC_URI[sha256sum] = "508e4a44c8253a386a0f86d9c9bd4a1b4cbb2f94e88d49a19c1513653ca66c45"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 22/40] layer.conf: prefer 1.2.1 version of python-psutil

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/conf/layer.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index 93b03db..dbf55fa 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -15,3 +15,4 @@ PREFERRED_VERSION_python-greenlet = "0.4.1"
 PREFERRED_VERSION_python-sqlalchemy = "0.9.7"
 PREFERRED_VERSION_python-pexpect = "3.3"
 PREFERRED_VERSION_python-six = "1.9.0"
+PREFERRED_VERSION_python-psutil = "1.2.1"
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 23/40] python-cinderclient: upgrade to 1.1.2

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-cinderclient_git.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
index 31875fa..951198d 100644
--- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
@@ -5,17 +5,16 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3572962e13e5e739b30b0864365e0795"
 DEPENDS = "python-setuptools-git"
 
-PR = "r0"
 SRCNAME = "python-cinderclient"
 
 SRC_URI = "\
-	git://github.com/openstack/python-cinderclient.git;branch=master \
+	git://github.com/openstack/python-cinderclient.git;branch=stable/kilo \
 	file://fix_cinderclient_memory_leak.patch \
 	file://cinder-api-check.sh \
 	"
 
-PV="1.1.1+git${SRCPV}"
-SRCREV="9e94d814c6ae07c3d5e8242754aebcce150265cc"
+PV="1.1.2+git${SRCPV}"
+SRCREV="b44d32d02b014748044b5b18d27a9d1f8312145c"
 S = "${WORKDIR}/git"
 
 inherit setuptools monitor
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 24/40] python-glanceclient: upgrade to 0.17.3

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../recipes-devtools/python/python-glanceclient_git.bb | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
index 5435b06..430e32d 100644
--- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
@@ -3,18 +3,12 @@ HOMEPAGE = "https://github.com/openstack/python-glanceclient"
 SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-DEPENDS += " \
-        gmp \
-        python-pip \
-        python-pbr \
-        "
 
-SRCREV = "26280ed58b5d16feed4ab27be063d305ef48a252"
-PV = "0.17.0+git${SRCPV}"
-PR = "r0"
+SRCREV = "9333d0e4f2b47cf9a0dd52d71bb3a231422b84d2"
+PV = "0.17.3+git${SRCPV}"
 
 SRC_URI = "\
-	git://github.com/openstack/${BPN}.git;protocol=https \
+	git://github.com/openstack/${BPN}.git;protocol=https;branch=stable/kilo \
 	file://fix_glanceclient_memory_leak.patch \
 	file://glance-api-check.sh \
 	"
@@ -26,8 +20,10 @@ inherit setuptools monitor
 FILES_${PN} += "${datadir}/${SRCNAME}"
 
 DEPENDS += " \
-   python-pbr \
-   "
+    gmp \
+    python-pip \
+    python-pbr \
+    "
 
 RDEPENDS_${PN} = "gmp \
    python-warlock \
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 25/40] python-jsonrpclib: add recipe

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../recipes-devtools/python/python-jsonrpclib_0.1.6.bb        | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-jsonrpclib_0.1.6.bb

diff --git a/meta-openstack/recipes-devtools/python/python-jsonrpclib_0.1.6.bb b/meta-openstack/recipes-devtools/python/python-jsonrpclib_0.1.6.bb
new file mode 100644
index 0000000..c37072a
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-jsonrpclib_0.1.6.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "An implementation of the JSON-RPC v2.0 specification as a client library."
+HOMEPAGE = "https://pypi.python.org/pypi/jsonrpclib"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cdbf8d74b765504fbdf8e154bb4458a1"
+
+SRC_URI[md5sum] = "93382cff21aca9074896c9dc1c4ec73d"
+SRC_URI[sha256sum] = "733dad5da783a6ff959927d8c77346273c3b377db43cbdae0bd833b64584cf3a"
+
+inherit pypi
+
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 26/40] python-keystonemiddleware: upgrade to 1.5.2

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../recipes-devtools/python/python-keystonemiddleware_git.bb       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb
index f4ce244..69af3d1 100644
--- a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb
@@ -4,15 +4,14 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4a4d0e932ffae1c0131528d30d419c55"
 
-PR = "r0"
 SRCNAME = "keystonemiddleware"
 
 SRC_URI = "\
-	git://git.openstack.org/openstack/keystonemiddleware;branch=master \
+	git://git.openstack.org/openstack/keystonemiddleware;branch=stable/kilo \
 	"
 
-PV="1.4.0+git${SRCPV}"
-SRCREV="782fb0129d2eb7f181f890068767ce2b6906b2bd"
+PV="1.5.2+git${SRCPV}"
+SRCREV="fd12825acb92db08aea588522f9a91d7091f3a32"
 S = "${WORKDIR}/git"
 
 inherit setuptools
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 27/40] python-nova: upgrade to 2015.1.2

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-nova_git.bb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index d7a585e..79fad92 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -11,11 +11,11 @@ SRCNAME = "nova"
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
            file://nova-add-migrate.cfg-to-the-MANIFEST.patch \
-           file://neutron-api-set-default-binding-vnic_type.patch \
            "
 # restore post stable/juno:
+#           file://neutron-api-set-default-binding-vnic_type.patch \
 #           file://websocketproxy-allow-empty-schemes-at-python-2.7.3.patch
 #           file://nova-convert-path-from-relative-to-absolute.patch 
 #           file://nova-fix-location-to-doc-directory.patch
@@ -27,8 +27,9 @@ SRC_URI += "file://nova-all \
             file://nova.conf \
             file://openrc \
            "
-SRCREV="b6e11261a97bf96d5f9866f277d8ecc3be7891e5"
-PV="2015.1.0b2+git${SRCPV}"
+SRCREV="24c6b904f75b6a544edc9d34ca0163df7d164a1a"
+# 2015.1.2 is 24c6b904f75b6a544edc9d34ca0163df7d164a1a
+PV="2015.1.2+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 28/40] python-neutron: upgrade to 2015.1.2

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-neutron_git.bb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 1a5a9b2..e665e5e 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -4,10 +4,9 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
-PR = "r1"
 SRCNAME = "neutron"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
            file://neutron-server.init \
            file://neutron-agent.init \
            file://l3_agent.ini \
@@ -15,14 +14,13 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://metadata_agent.ini \
            file://neutron-dhcp-agent-netns-cleanup.cron \
            file://0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch \
-           file://neutron-test-nec-plugin-extensions-location.patch \
 	  "
 
 # TBD: update or drop
 # file://uuid_wscheck.patch
 
-SRCREV="1948efa261e47b08e2cde4828321614ee6e169be"
-PV="2015.1.0b2+git${SRCPV}"
+SRCREV="b175e03b12527d23c05fc45016e927a20c98d2f1"
+PV="2015.1.2+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -137,8 +135,6 @@ do_install_append() {
     sed -i '/\[keystone_authtoken\]/aidentity_uri=http://127.0.0.1:8081/keystone/admin/' ${NEUTRON_CONF_DIR}/neutron.conf
 
     cp run_tests.sh ${NEUTRON_CONF_DIR}
-
-    sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/tests/unit/nec/test_nec_plugin.py
 }
 
 pkg_postinst_${SRCNAME}-setup () {
@@ -286,6 +282,7 @@ RDEPENDS_${PN} += "python-paste \
 	python-markupsafe \
 	python-pyparsing \
 	python-pbr \
+	python-jsonrpclib \
 	"
 
 RDEPENDS_${SRCNAME} = "${PN} \
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 29/40] neutron ml2 plugin: enable gre in [agent] section

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
---
 meta-openstack/recipes-devtools/python/python-neutron_git.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index e665e5e..154d1cb 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -79,6 +79,8 @@ do_install_append() {
     echo "local_ip = ${MY_IP}" >> ${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
     echo "tunnel_type = gre" >> ${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
     echo "enable_tunneling = True" >> ${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
+    echo "[agent]" >> ${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
+    echo "tunnel_types = gre" >> ${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
 
     PLUGIN=openvswitch
     ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/plugins/ml2/ml2_conf.ini"
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 30/40] python-cryptography, -vectors: add 0.8.1

[Josep Puigdemont]

python-cryptography is required by python-pyopenssl >= 0.14
Keystone requires python-cryptography >=0.8

Includes python-cryptography-vectors package for ptest

Over 75k unit tests (100% coverage):
    * tested on nuc (x86) and beaglebone (arm) hardware.
    ** will overload ram on default qemux86/qemuarm

These commit is taken from meta-openembedded/meta-python
revision c346f605766754c02004478371f22609f15ecd1a

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../python/python-cryptography-vectors_0.8.1.bb    | 14 +++++++
 .../python/python-cryptography/run-ptest           |  2 +
 .../python/python-cryptography_0.8.1.bb            | 46 ++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-cryptography-vectors_0.8.1.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-cryptography/run-ptest
 create mode 100644 meta-openstack/recipes-devtools/python/python-cryptography_0.8.1.bb

diff --git a/meta-openstack/recipes-devtools/python/python-cryptography-vectors_0.8.1.bb b/meta-openstack/recipes-devtools/python/python-cryptography-vectors_0.8.1.bb
new file mode 100644
index 0000000..a9b64ed
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-cryptography-vectors_0.8.1.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Test vectors for the cryptography package."
+SECTION = "devel/python"
+LICENSE = "Apache-2.0 | BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4"
+DEPENDS = "python-cryptography"
+SRCNAME = "cryptography_vectors"
+
+SRC_URI = "https://pypi.python.org/packages/source/c/cryptography-vectors/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+SRC_URI[md5sum] = "04fcfcc61aee62e3b4beb1740cd120ac"
+SRC_URI[sha256sum] = "4a69e66026bfce4b97f75e72fe262f5e8f71daddc081f6608e5b0db89e552504"
+
+inherit setuptools
diff --git a/meta-openstack/recipes-devtools/python/python-cryptography/run-ptest b/meta-openstack/recipes-devtools/python/python-cryptography/run-ptest
new file mode 100644
index 0000000..0ba239c
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-cryptography/run-ptest
@@ -0,0 +1,2 @@
+#!/bin/sh
+py.test
diff --git a/meta-openstack/recipes-devtools/python/python-cryptography_0.8.1.bb b/meta-openstack/recipes-devtools/python/python-cryptography_0.8.1.bb
new file mode 100644
index 0000000..41e4acd
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-cryptography_0.8.1.bb
@@ -0,0 +1,46 @@
+SUMMARY = "Provides cryptographic recipes and primitives to Python developers"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0 | BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4"
+DEPENDS += " python-cffi-native python-cffi python-enum34 python-six python-pyasn1"
+SRCNAME = "cryptography"
+
+SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
+           file://run-ptest \
+"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+SRC_URI[md5sum] = "70dde78a5515abdbfd7a3d58f15689ab"
+SRC_URI[sha256sum] = "f4e041bc83c1be94d87116a7aa201c378b7c6581be4d83994b2da0a84499f73b"
+
+inherit pypi
+
+RDEPENDS_${PN} = "\
+                  python-pyasn1\
+                  python-six\
+                  python-cffi\
+                  python-enum34\
+                  python-setuptools\
+                  python-pycparser\
+                  python-subprocess\
+                  python-threading\
+                  python-numbers\
+                  python-contextlib\
+"
+
+RDEPENDS_${PN}-ptest = "\
+                       ${PN}\
+                       python-pytest\
+                       python-pretend\
+                       python-iso8601\
+                       python-cryptography-vectors\
+"
+
+inherit ptest
+
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests
+    cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+    install -d ${D}${PTEST_PATH}/tests/hazmat
+    cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/
+}
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 31/40] python-oslo.policy: add new recipe

[Josep Puigdemont]

A backport of commit ee0bfb3210d4fecd7d16e9b1c730b13dfd600914

Openstack Kilo requires oslo.policy>=0.3.1,<0.4.0, and that
commit introduced 0.4.0, so we had to downgrade the version.

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../python/python-oslo.policy_0.3.2.bb             | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-oslo.policy_0.3.2.bb

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.policy_0.3.2.bb b/meta-openstack/recipes-devtools/python/python-oslo.policy_0.3.2.bb
new file mode 100644
index 0000000..18f2ed9
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-oslo.policy_0.3.2.bb
@@ -0,0 +1,29 @@
+SUMMARY = "Oslo Policy library"
+DESCRIPTION = "The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services."
+HOMEPAGE = "https://pypi.python.org/pypi/oslo.policy"
+SECTION = "devel/python"
+LICENSE = "Apache-2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
+
+
+SRCNAME = "oslo.policy"
+SRC_URI = "http://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "1612940bb7a6db558563fd5450b75f7e"
+SRC_URI[sha256sum] = "e69a5c559f95bcbf91eb0ea9f16aa65f0fe5fccc7fa03693d4cc991b76e969a6"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+"
+
+RDEPENDS_${PN} += " \
+        python-oslo.config \
+        python-oslo.i18n \
+        python-oslo.serialization \
+        python-pbr \
+"
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 32/40] python-keystone: upgrade to 2015.1.2

[Josep Puigdemont]

Upgrade and update dependencies on python-oslo.policy

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-keystone_git.bb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index 1f012cc..ed0d7b8 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -4,10 +4,9 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
-PR = "r2"
 SRCNAME = "keystone"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
            file://keystone.conf \
            file://identity.sh \
            file://keystone \
@@ -20,8 +19,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
 # file://keystone-remove-git-commands-in-tests.patch 
 # file://keystone-explicitly-import-localcontext-from-oslo.me.patch
 
-SRCREV="0e633302e87261fdb3b0126c632fd676fc0a4d39"
-PV="2015.1.0b2+git${SRCPV}"
+SRCREV="8a2da01cb8b4a8369af4f5cf5cc7e20b1bf4453a"
+PV="2015.1.2+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -282,10 +281,12 @@ RDEPENDS_${PN} += " \
         python-dogpile.cache \
         python-pbr \
         python-pysaml2 \
+        python-oslo.policy \
         python-oslo.utils \
         python-oauthlib \
         python-fixtures \
         python-oslotest \
+        python-cryptography \
         "
 
 RDEPENDS_${SRCNAME}-tests += " bash"
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 33/40] python-keystoneclient: upgrade to 1.3.3

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../recipes-devtools/python/python-keystoneclient_git.bb          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
index 0063efc..5c5d98c 100644
--- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
@@ -4,17 +4,16 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4a4d0e932ffae1c0131528d30d419c55"
 
-PR = "r0"
 SRCNAME = "keystoneclient"
 
 SRC_URI = "\
-	git://github.com/openstack/python-keystoneclient.git;branch=master \
+	git://github.com/openstack/python-keystoneclient.git;branch=stable/kilo \
 	file://fix_keystoneclient_memory_leak.patch \
 	file://keystone-api-check.sh \
 	"
 
-PV = "1.3.0+git${SRCPV}"
-SRCREV = "a84b5ac115dd5775f7380a204811aa939fd5c242"
+PV = "1.3.3+git${SRCPV}"
+SRCREV = "ec70eb02f8a5889828cde786694283240f64c5c4"
 S = "${WORKDIR}/git"
 
 inherit setuptools monitor
@@ -32,6 +31,7 @@ RDEPENDS_${PN} += " \
 	python-requests \
 	python-simplejson \
 	python-oslo.config \
+	python-oslo.serialization \
 	python-pbr \
 	"
 
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 34/40] python-xstatic-angular-irdragndrop: add new recipe

[Josep Puigdemont]

From: Jackie Huang <jackie.huang@windriver.com>

It's required by python-horizon

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../python-xstatic-angular-irdragndrop_1.0.2.2.bb  | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb

diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb
new file mode 100644
index 0000000..2ad3e55
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "IrDragNDrop javascript library packaged for setuptools"
+HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-IrDragNDrop"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9acc2dfc3a0345c175df08104bd22298"
+
+SRCNAME = "XStatic-Angular-IrDragNDrop"
+SRC_URI = "http://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "6ea8809bae94014aef699d58836dba84"
+SRC_URI[sha256sum] = "5595f4a98ac8f8468f7e56dc916e10c0fc5f0197567899a75755f99fe8b5bd6d"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+DEPENDS += " \
+        python-pip \
+        "
+
+RDEPENDS_${PN} += " \
+        "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 35/40] horizon: add missing dependencies to address startup errors

[Josep Puigdemont]

From: Mark Asselstine <mark.asselstine@windriver.com>

Horizon requires python-xstatic-angular-lrdragndrop and
xstatic-magic-search otherwise errors will prevent the dashboard from
being accessed. The depencies are spelled out clearly in the
openstack-dashboard-error.log, as per the following error:

ImportError: Could not import settings 'openstack_dashboard.settings'
(Is it on sys.path? Is there an import error in the settings file?):
No module named angular_lrdragndrop

Even with these added dependencies there are other issues that prevent
the dashboard from being accessed but at least with these dependencies
satisfied we can move on to fixing the remaining runtime issues.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>

Conflicts:
	meta-openstack/recipes-devtools/python/python-horizon_git.bb
---
 .../recipes-devtools/python/python-horizon_git.bb  |  7 +++++--
 .../python-xstatic-angular-lrdragndrop_1.0.2.2.bb  | 22 ++++++++++++++++++++++
 .../python/python-xstatic-magic-search_0.2.5.1.bb  | 21 +++++++++++++++++++++
 3 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 meta-openstack/recipes-devtools/python/python-xstatic-angular-lrdragndrop_1.0.2.2.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-xstatic-magic-search_0.2.5.1.bb

diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index d0a9bab..b7c0046 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -39,6 +39,9 @@ RDEPENDS_${PN} += " python-django \
     python-xstatic-angular-cookies \
     python-xstatic-angular-mock \
     python-xstatic-angular-bootstrap \
+    python-xstatic-angular-irdragndrop \
+    python-xstatic-angular-lrdragndrop \
+    python-xstatic-magic-search \
     python-xstatic-d3 \
     python-xstatic-hogan \
     python-xstatic-jasmine \
@@ -70,8 +73,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
     file://horizon-use-full-package-path-to-test-directories.patch \
     "
 
-SRCREV="9b37723a21e88c29732e2a4a9eeeecb9ecf19204"
-PV="2015.1.0b2+git${SRCPV}"
+SRCREV = "b99cf48ff346494198fb9740495eacc14fa406bf"
+PV = "2015.1.0+git${SRCPV}p1"
 S = "${WORKDIR}/git"
 
 inherit setuptools update-rc.d python-dir default_configs openstackchef monitor
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-lrdragndrop_1.0.2.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-lrdragndrop_1.0.2.2.bb
new file mode 100644
index 0000000..1bc71a3
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-angular-lrdragndrop_1.0.2.2.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "LrDragNDrop javascript library packaged for setuptools"
+HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-lrdragndrop"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=92d5d5d8e51c0c2f4f6db4a084a59173"
+
+SRCNAME = "XStatic-Angular-lrdragndrop"
+SRC_URI = "http://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "afd682cab9f436cf22b025dfcabaa225"
+SRC_URI[sha256sum] = "1cf04495981db5dfd5536441e17ec69bb18d624f847ddc203f3259d81b10a77e"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+DEPENDS += " \
+        python-pip \
+        "
+
+RDEPENDS_${PN} += " \
+        "
diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-magic-search_0.2.5.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-magic-search_0.2.5.1.bb
new file mode 100644
index 0000000..23fb832
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-xstatic-magic-search_0.2.5.1.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "An AngularJS directive that provides a UI for both faceted filtering and as-you-type filtering"
+HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Magic-Search"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=e3d8469611ec04e52d71f2e293d54e9c"
+
+SRCNAME = "XStatic-Magic-Search"
+SRC_URI = "http://pypi.python.org/packages/source/X/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "cfb8a82129fffbe1f5c6339240cb6139"
+SRC_URI[sha256sum] = "9b2f35a5792f4e763e6dc319036e3676f3e18f46153096f3ab5e507177ec007e"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+DEPENDS += " \
+        "
+
+RDEPENDS_${PN} += " \
+        "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 36/40] python-horizon: upgrade to 2015.1.2

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-horizon_git.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index b7c0046..779878d 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -62,10 +62,9 @@ RDEPENDS_${PN} += " python-django \
     python-django-pyscss \
     "
 
-PR = "r3"
 SRCNAME = "horizon"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
     file://horizon.init \
     file://fix_bindir_path.patch \
     file://openstack-dashboard-apache.conf \
@@ -73,8 +72,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
     file://horizon-use-full-package-path-to-test-directories.patch \
     "
 
-SRCREV = "b99cf48ff346494198fb9740495eacc14fa406bf"
-PV = "2015.1.0+git${SRCPV}p1"
+SRCREV = "bccc3dcba65275e099137c8ca37f1077e87120d5"
+PV = "2015.1.2+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit setuptools update-rc.d python-dir default_configs openstackchef monitor
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 37/40] python-horizon: remove dependency on lesscpy

[Josep Puigdemont]

Since 94b64b6eb059bdf287a5ffdc517b8480368a735a, horizon does not
depend on lesscpy anymore.

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-horizon_git.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index 779878d..eca780e 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -22,7 +22,6 @@ RDEPENDS_${PN} += " python-django \
     python-keystoneclient \
     python-troveclient \
     python-saharaclient \
-    python-lesscpy \
     python-novaclient \
     python-nose-exclude \
     python-neutronclient \
@@ -176,7 +175,6 @@ INITSCRIPT_PARAMS_${SRCNAME} = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
 RDEPENDS_${SRCNAME}-apache = "\
     apache2 \
     mod-wsgi \
-    python-lesscpy \
     memcached \
     python-memcached \
     "
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 38/40] python-lesscpy: remove recipe

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../0001-lesscpy-remove-explicit-python3.patch     | 23 ----------------
 ...02-Description-Fixup-for-python3.3-compat.patch | 31 ----------------------
 .../recipes-devtools/python/python-lesscpy_0.9j.bb | 28 -------------------
 3 files changed, 82 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-lesscpy/0001-lesscpy-remove-explicit-python3.patch
 delete mode 100644 meta-openstack/recipes-devtools/python/python-lesscpy/0002-Description-Fixup-for-python3.3-compat.patch
 delete mode 100644 meta-openstack/recipes-devtools/python/python-lesscpy_0.9j.bb

diff --git a/meta-openstack/recipes-devtools/python/python-lesscpy/0001-lesscpy-remove-explicit-python3.patch b/meta-openstack/recipes-devtools/python/python-lesscpy/0001-lesscpy-remove-explicit-python3.patch
deleted file mode 100644
index 36dc7dc..0000000
--- a/meta-openstack/recipes-devtools/python/python-lesscpy/0001-lesscpy-remove-explicit-python3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3331202e96593d47b8e3a253777ea94537fc08f2 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Wed, 30 Oct 2013 23:09:56 -0400
-Subject: [PATCH 1/2] lesscpy: remove explicit python3
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- bin/lesscpy |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/lesscpy b/bin/lesscpy
-index 4613f9e..0834996 100755
---- a/bin/lesscpy
-+++ b/bin/lesscpy
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/env python
- """
-     Lesscpy run script
-     <jtm@robot.is>
--- 
-1.7.10.4
-
diff --git a/meta-openstack/recipes-devtools/python/python-lesscpy/0002-Description-Fixup-for-python3.3-compat.patch b/meta-openstack/recipes-devtools/python/python-lesscpy/0002-Description-Fixup-for-python3.3-compat.patch
deleted file mode 100644
index b5da15a..0000000
--- a/meta-openstack/recipes-devtools/python/python-lesscpy/0002-Description-Fixup-for-python3.3-compat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8b9fb203948ca752d848cee951ccde2954abcfe3 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Wed, 30 Oct 2013 23:17:28 -0400
-Subject: [PATCH 2/2] Description: Fixup for python3.3 compat Author: James
- Page <james.page@ubuntu.com> Forwarded:
- https://github.com/robotis/Lesscpy/pull/23
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- lesscpy/scripts/compiler.py |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/lesscpy/scripts/compiler.py b/lesscpy/scripts/compiler.py
-index f6b92c7..93dabd3 100644
---- a/lesscpy/scripts/compiler.py
-+++ b/lesscpy/scripts/compiler.py
-@@ -84,8 +84,9 @@ def run():
-     """Run compiler
-     """
-     aparse = argparse.ArgumentParser(description='LessCss Compiler',
--                                     epilog='<< jtm@robot.is @_o >>',
--                                     version=VERSION_STR)
-+                                     epilog='<< jtm@robot.is @_o >>')
-+    aparse.add_argument('-v', '--version', action='version',
-+                        version=VERSION_STR)
-     aparse.add_argument('-I', '--include', action="store", type=str,
-                         help="Included less-files (comma separated)")
-     aparse.add_argument('-V', '--verbose', action="store_true",
--- 
-1.7.10.4
-
diff --git a/meta-openstack/recipes-devtools/python/python-lesscpy_0.9j.bb b/meta-openstack/recipes-devtools/python/python-lesscpy_0.9j.bb
deleted file mode 100644
index 3bee660..0000000
--- a/meta-openstack/recipes-devtools/python/python-lesscpy_0.9j.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Python lesscpy: Python LESS Compiler"
-HOMEPAGE = "https://pypi.python.org/pypi/lesscpy"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a01aae31681ac25b4c46f98d627b9b5d"
-
-PR = "r0"
-SRCNAME = "lesscpy"
-
-SRC_URI = "https://pypi.python.org/packages/source/l/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-           file://0001-lesscpy-remove-explicit-python3.patch \
-           file://0002-Description-Fixup-for-python3.3-compat.patch \
-           "
-
-DEPENDS += "python-ply"
-RDEPENDS_${PN} += "python-ply"
-
-SRC_URI[md5sum] = "a9587da0148463d6521f386294c9d6f3"
-SRC_URI[sha256sum] = "fa01d435a1ab3abafba683519bdc7aca5e19399e96225e1a8bc1d660b566364d"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-DISTUTILS_INSTALL_ARGS = "--root=${D} \
-    --prefix=${prefix} \
-    --install-lib=${PYTHON_SITEPACKAGES_DIR} \
-    --install-data=${datadir}"
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 39/40] Openstack doesn't depend on lockfile anymore

[Josep Puigdemont]

Openstack uses oslo.concurrency now, following commits removed the
depedency on lockfile for each respective component:
	ceilometer: ddcc118a4c13fb88a08d437de86c8e2d6f9cb23f
	cinder: a497b4a214b89cb2b387f227c208cfdae62ad6b1
	heat: c889bf64ee03b7aa4168b2451359770f1cabccb7
	horizon: 366f9527e6234874495b70d104d49b4f3de2d522
	oslo.db: c34c32e09ed1f170dfe62c7daedf0cd60f57a833

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 meta-openstack/recipes-devtools/python/python-ceilometer_git.bb | 1 -
 meta-openstack/recipes-devtools/python/python-cinder_git.bb     | 1 -
 meta-openstack/recipes-devtools/python/python-heat_git.bb       | 1 -
 meta-openstack/recipes-devtools/python/python-horizon_git.bb    | 1 -
 meta-openstack/recipes-devtools/python/python-oslo.db_1.7.2.bb  | 1 -
 5 files changed, 5 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index e734d32..c3a69ee 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -197,7 +197,6 @@ RDEPENDS_${PN} += " \
 	python-routes \
 	python-webob \
 	python-greenlet \
-	python-lockfile \
 	python-pastedeploy \
 	python-paste \
 	python-sqlalchemy-migrate \
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index 9276d1f..d8b3f86 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -202,7 +202,6 @@ RDEPENDS_${PN} += "lvm2 \
 	python-routes \
 	python-webob \
 	python-greenlet \
-	python-lockfile \
 	python-pastedeploy \
 	python-paste \
 	python-sqlalchemy-migrate \
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
index 87e93c7..5926cc0 100644
--- a/meta-openstack/recipes-devtools/python/python-heat_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb
@@ -179,7 +179,6 @@ RDEPENDS_${PN} += " \
 	python-routes \
 	python-webob \
 	python-greenlet \
-	python-lockfile \
 	python-pastedeploy \
 	python-paste \
 	python-sqlalchemy-migrate \
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index eca780e..a351bc4 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -29,7 +29,6 @@ RDEPENDS_${PN} += " python-django \
     python-pbr \
     python-six \
     python-swiftclient \
-    python-lockfile \
     python-pyyaml \
     python-pint \
     python-xstatic \
diff --git a/meta-openstack/recipes-devtools/python/python-oslo.db_1.7.2.bb b/meta-openstack/recipes-devtools/python/python-oslo.db_1.7.2.bb
index 3f2dd95..a381263 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.db_1.7.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.db_1.7.2.bb
@@ -23,7 +23,6 @@ RDEPENDS_${PN} += " \
        python-alembic \
        python-babel \
        python-iso8601 \
-       python-lockfile \
        python-oslo.config \
        python-sqlalchemy \
        python-sqlalchemy-migrate \
-- 
2.1.0

[meta-cloud-services][fido-kilo][PATCH 40/40] python-lockfile: remove recipe

[Josep Puigdemont]

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../recipes-devtools/python/python-lockfile_0.9.1.bb    | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-lockfile_0.9.1.bb

diff --git a/meta-openstack/recipes-devtools/python/python-lockfile_0.9.1.bb b/meta-openstack/recipes-devtools/python/python-lockfile_0.9.1.bb
deleted file mode 100644
index 0449f08..0000000
--- a/meta-openstack/recipes-devtools/python/python-lockfile_0.9.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Platform-independent file locking module"
-HOMEPAGE = "http://code.google.com/p/pylockfile/"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2340dffbbfea534b58f1349984eeef72"
-
-PR = "r0"
-SRCNAME = "lockfile"
-
-SRC_URI = "https://pypi.python.org/packages/source/l/lockfile/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "ce61468d4c1263e3005737bbed2641f0"
-SRC_URI[sha256sum] = "23da589c91f59cb7c644d5ce5df539d448341bd479917d6dde973f82e2719147"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils 
-- 
2.1.0

Re: [meta-cloud-services][fido-kilo][PATCH 00/40] upgrade to Kilo 2015.1.2

[Bruce Ashfield]

[-- Attachment #1: Type: text/plain, Size: 9310 bytes --]

On Wed, Dec 2, 2015 at 11:32 AM, Josep Puigdemont <josep.puigdemont@enea.com
> wrote:

> This series of patches are an upgrade to the latest Kilo release of
> Openstack (2015.1.2).
>
> python-wsme had the wrong license.
>
> There are a couple of cherry-picks from master too.
>
> layer.conf has been modified to select the required version of the
> recipes python-six (1.9.0) and python-psutil (1.2.1).
>
> Dependency on python-lockfile and python-lesscpy has been removed, as
> Openstack is not using them anymore. The recipes have been removed too, but
> this is put in a separate commit, in case you want to preserve them.
>

I went ahead and merged the series as-is, complete with the removal of the
unnecessary packages. Part of what I insist about meta-cloud-services, is
that
it isn't just a collection of packages, but more a set of components that do
something, and that are all used.

So if we don't use them any more, then they aren't tested by system level
use
cases .. and I can drop them.

If I'm proven wrong, they are just a revert away!

Bruce


>
> This is part of a larger patch set to bring fido-kilo to a more functional
> state.
>
> Jackie Huang (1):
>   python-xstatic-angular-irdragndrop: add new recipe
>
> Josep Puigdemont (38):
>   python-tooz: updated to 0.13.3 (kilo latest)
>   python-wsme: upgrade to 0.8.0, set proper license
>   python-pycadf: upgrade to 0.8.0 (kilo)
>   layer.conf: prefer python-six 1.9.0
>   python-stevedore: upgrade to 1.3.0 (kilo)
>   python-oslo.config: upgrade to 1.9.3 (kilo)
>   python-oslo.i18n: upgrade to 1.5.0 (kilo)
>   python-oslo.utils: update to 1.4.0, add dependencies
>   python-oslo.concurrency: updated to 1.8.2 (kilo)
>   python-oslo.context: upgrade to 0.2.0 (kilo)
>   python-oslo.db: upgrade to 1.7.2 (kilo)
>   python-wrapt: add recipe
>   python-debtcollector: add recipe
>   python-oslo.log: update to 1.0.0, add dependencies
>   python-oslo.serialization: upgrade to 1.4.0
>   python-oslo.middleware: upgrade to 1.0.0
>   python-trollius: add recipe
>   python-aioeventlet: add recipe
>   python-oslo.messaging: upgrade to 1.8.3
>   python-oslo.rootwrap: upgrade to 1.6.0
>   python-psutil: add recipe
>   layer.conf: prefer 1.2.1 version of python-psutil
>   python-cinderclient: upgrade to 1.1.2
>   python-glanceclient: upgrade to 0.17.3
>   python-jsonrpclib: add recipe
>   python-keystonemiddleware: upgrade to 1.5.2
>   python-nova: upgrade to 2015.1.2
>   python-neutron: upgrade to 2015.1.2
>   neutron ml2 plugin: enable gre in [agent] section
>   python-cryptography,-vectors: add 0.8.1
>   python-oslo.policy: add new recipe
>   python-keystone: upgrade to 2015.1.2
>   python-keystoneclient: upgrade to 1.3.3
>   python-horizon: upgrade to 2015.1.2
>   python-horizon: remove dependency on lesscpy
>   python-lesscpy: remove recipe
>   Openstack doesn't depend on lockfile anymore
>   python-lockfile: remove recipe
>
> Mark Asselstine (1):
>   horizon: add missing dependencies to address startup errors
>
>  meta-openstack/conf/layer.conf                     |  2 +
>  .../python/python-aioeventlet_0.4.bb               | 14 +++++++
>  .../python/python-ceilometer_git.bb                |  1 -
>  .../recipes-devtools/python/python-cinder_git.bb   |  1 -
>  .../python/python-cinderclient_git.bb              |  7 ++--
>  .../python/python-cryptography-vectors_0.8.1.bb    | 14 +++++++
>  .../python/python-cryptography/run-ptest           |  2 +
>  .../python/python-cryptography_0.8.1.bb            | 46
> ++++++++++++++++++++++
>  .../python/python-debtcollector_0.3.0.bb           | 22 +++++++++++
>  .../python/python-glanceclient_git.bb              | 18 ++++-----
>  .../recipes-devtools/python/python-heat_git.bb     |  1 -
>  .../recipes-devtools/python/python-horizon_git.bb  | 13 +++---
>  .../python/python-jsonrpclib_0.1.6.bb              | 11 ++++++
>  .../recipes-devtools/python/python-keystone_git.bb |  9 +++--
>  .../python/python-keystoneclient_git.bb            |  8 ++--
>  .../python/python-keystonemiddleware_git.bb        |  7 ++--
>  .../0001-lesscpy-remove-explicit-python3.patch     | 23 -----------
>  ...02-Description-Fixup-for-python3.3-compat.patch | 31 ---------------
>  .../recipes-devtools/python/python-lesscpy_0.9j.bb | 28 -------------
>  .../python/python-lockfile_0.9.1.bb                | 17 --------
>  .../recipes-devtools/python/python-neutron_git.bb  | 13 +++---
>  .../recipes-devtools/python/python-nova_git.bb     |  9 +++--
>  ...y_1.5.0.bb => python-oslo.concurrency_1.8.2.bb} | 14 +++++--
>  ...config_1.6.1.bb => python-oslo.config_1.9.3.bb} |  4 +-
>  .../python/python-oslo.context_git.bb              |  9 ++---
>  ...on-oslo.db_1.5.0.bb => python-oslo.db_1.7.2.bb} |  7 +---
>  ...slo.i18n_1.4.0.bb => python-oslo.i18n_1.5.0.bb} |  5 ++-
>  .../recipes-devtools/python/python-oslo.log_git.bb | 11 +++---
>  .../python/python-oslo.messaging_git.bb            | 23 +++++++----
>  ...re_0.4.0.bb => python-oslo.middleware_1.0.0.bb} | 16 ++++----
>  .../python/python-oslo.policy_0.3.2.bb             | 29 ++++++++++++++
>  ...wrap_1.5.0.bb => python-oslo.rootwrap_1.6.0.bb} |  7 ++--
>  .../python/python-oslo.serialization_git.bb        | 11 ++++--
>  .../python/python-oslo.utils_git.bb                | 12 ++++--
>  .../recipes-devtools/python/python-psutil_1.2.1.bb | 16 ++++++++
>  ...thon-pycadf_0.6.0.bb => python-pycadf_0.8.0.bb} |  6 +--
>  ...tevedore_1.2.0.bb => python-stevedore_1.3.0.bb} | 13 ++----
>  .../{python-tooz_0.4.bb => python-tooz_0.13.3.bb}  |  6 +--
>  .../recipes-devtools/python/python-trollius_2.0.bb | 10 +++++
>  .../recipes-devtools/python/python-wrapt_1.10.5.bb | 11 ++++++
>  .../{python-wsme_0.6.bb => python-wsme_0.8.0.bb}   | 14 ++++---
>  .../python-xstatic-angular-irdragndrop_1.0.2.2.bb  | 22 +++++++++++
>  .../python-xstatic-angular-lrdragndrop_1.0.2.2.bb  | 22 +++++++++++
>  .../python/python-xstatic-magic-search_0.2.5.1.bb  | 21 ++++++++++
>  44 files changed, 366 insertions(+), 220 deletions(-)
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-aioeventlet_0.4.bb
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-cryptography-vectors_0.8.1.bb
>  create mode 100644
> meta-openstack/recipes-devtools/python/python-cryptography/run-ptest
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-cryptography_0.8.1.bb
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-debtcollector_0.3.0.bb
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-jsonrpclib_0.1.6.bb
>  delete mode 100644
> meta-openstack/recipes-devtools/python/python-lesscpy/0001-lesscpy-remove-explicit-python3.patch
>  delete mode 100644
> meta-openstack/recipes-devtools/python/python-lesscpy/0002-Description-Fixup-for-python3.3-compat.patch
>  delete mode 100644 meta-openstack/recipes-devtools/python/
> python-lesscpy_0.9j.bb
>  delete mode 100644 meta-openstack/recipes-devtools/python/
> python-lockfile_0.9.1.bb
>  rename meta-openstack/recipes-devtools/python/{
> python-oslo.concurrency_1.5.0.bb => python-oslo.concurrency_1.8.2.bb}
> (61%)
>  rename meta-openstack/recipes-devtools/python/{
> python-oslo.config_1.6.1.bb => python-oslo.config_1.9.3.bb} (79%)
>  rename meta-openstack/recipes-devtools/python/{python-oslo.db_1.5.0.bb
> => python-oslo.db_1.7.2.bb} (78%)
>  rename meta-openstack/recipes-devtools/python/{python-oslo.i18n_1.4.0.bb
> => python-oslo.i18n_1.5.0.bb} (77%)
>  rename meta-openstack/recipes-devtools/python/{
> python-oslo.middleware_0.4.0.bb => python-oslo.middleware_1.0.0.bb} (60%)
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-oslo.policy_0.3.2.bb
>  rename meta-openstack/recipes-devtools/python/{
> python-oslo.rootwrap_1.5.0.bb => python-oslo.rootwrap_1.6.0.bb} (76%)
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-psutil_1.2.1.bb
>  rename meta-openstack/recipes-devtools/python/{python-pycadf_0.6.0.bb =>
> python-pycadf_0.8.0.bb} (81%)
>  rename meta-openstack/recipes-devtools/python/{python-stevedore_1.2.0.bb
> => python-stevedore_1.3.0.bb} (53%)
>  rename meta-openstack/recipes-devtools/python/{python-tooz_0.4.bb =>
> python-tooz_0.13.3.bb} (81%)
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-trollius_2.0.bb
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-wrapt_1.10.5.bb
>  rename meta-openstack/recipes-devtools/python/{python-wsme_0.6.bb =>
> python-wsme_0.8.0.bb} (56%)
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-xstatic-angular-irdragndrop_1.0.2.2.bb
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-xstatic-angular-lrdragndrop_1.0.2.2.bb
>  create mode 100644 meta-openstack/recipes-devtools/python/
> python-xstatic-magic-search_0.2.5.1.bb
>
> --
> 2.1.0
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"

[-- Attachment #2: Type: text/html, Size: 17417 bytes --]