1 files changed, 24 insertions, 19 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
index 0417ce58..9fa23ed8 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 SRCNAME = "glance"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https \
            file://glance.init \
            file://glance-api.service \
            file://glance-registry.service \
@@ -25,8 +25,8 @@ USER = "glance"
 GROUP = "glance"
 
 USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system ${GROUP}"
-USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/glance -s /bin/false -g ${GROUP} ${USER}"
+GROUPADD_PARAM:${PN} = "--system ${GROUP}"
+USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/glance -s /bin/false -g ${GROUP} ${USER}"
 
 GLANCE_DEFAULT_STORE ?= "file"
 GLANCE_KNOWN_STORES ?= "glance.store.rbd.Store,\
@@ -56,13 +56,13 @@ python () {
 }
 SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST"
 
-do_install_prepend() {
+do_install:prepend() {
     sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/functional/__init__.py
     sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/unit/base.py
     sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/utils.py
 }
 
-do_install_append() {
+do_install:append() {
     SRC_SYSCONFDIR=${S}${sysconfdir}
     GLANCE_CONF_DIR=${D}${sysconfdir}/glance
 
@@ -140,26 +140,26 @@ do_install_append() {
 
 PACKAGES += " ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-registry"
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${libdir}/* \
     ${datadir}/etc/${SRCNAME}* \
     "
 
-FILES_${SRCNAME} = "${bindir}/* \
+FILES:${SRCNAME} = "${bindir}/* \
     ${sysconfdir}/${SRCNAME}/* \
     ${localstatedir}/* \
     "
 
-FILES_${SRCNAME}-setup = " \
+FILES:${SRCNAME}-setup = " \
     ${systemd_unitdir}/system/glance-init.service \
     "
 
-FILES_${SRCNAME}-api = " \
+FILES:${SRCNAME}-api = " \
     ${bindir}/glance-api \
     ${systemd_unitdir}/system/glance-api.service \
     "
 
-FILES_${SRCNAME}-registry = "\
+FILES:${SRCNAME}-registry = "\
     ${bindir}/glance-registry \
     ${systemd_unitdir}/system/glance-registry.service \
     "
@@ -169,7 +169,12 @@ DEPENDS += " \
         python-pbr \
         "
 
-RDEPENDS_${PN} += " \
+# Satisfy setup.py 'setup_requires'
+DEPENDS += " \
+        python-pbr-native \
+        "
+
+RDEPENDS:${PN} += " \
         coreutils \
         python-pbr \
         python-sqlalchemy \
@@ -213,22 +218,22 @@ RDEPENDS_${PN} += " \
         python-monotonic \
         "
 
-RDEPENDS_${SRCNAME} = " \
+RDEPENDS:${SRCNAME} = " \
         ${PN} \
         postgresql \
         postgresql-client \
         python-psycopg2 \
         "
 
-RDEPENDS_${SRCNAME}-api = "${SRCNAME}"
-RDEPENDS_${SRCNAME}-registry = "${SRCNAME}"
-RDEPENDS_${SRCNAME}-setup = "postgresql keystone-setup sudo ${SRCNAME}"
-RDEPENDS_${SRCNAME}-tests = "python-psutil qpid-python bash"
+RDEPENDS:${SRCNAME}-api = "${SRCNAME}"
+RDEPENDS:${SRCNAME}-registry = "${SRCNAME}"
+RDEPENDS:${SRCNAME}-setup = "postgresql keystone-setup sudo ${SRCNAME}"
+RDEPENDS:${SRCNAME}-tests = "python-psutil qpid-python bash"
 
 SYSTEMD_PACKAGES = "${SRCNAME}-api ${SRCNAME}-registry ${SRCNAME}-setup"
-SYSTEMD_SERVICE_${SRCNAME}-api = "glance-api.service"
-SYSTEMD_SERVICE_${SRCNAME}-registry = "glance-registry.service"
-SYSTEMD_SERVICE_${SRCNAME}-setup = "glance-init.service"
+SYSTEMD_SERVICE:${SRCNAME}-api = "glance-api.service"
+SYSTEMD_SERVICE:${SRCNAME}-registry = "glance-registry.service"
+SYSTEMD_SERVICE:${SRCNAME}-setup = "glance-init.service"
 
 MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
 MONITOR_SERVICE_${SRCNAME} = "glance"