23 files changed, 71 insertions, 89 deletions
diff --git a/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb b/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb
index cb58e9df..23e326bb 100644
--- a/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb
+++ b/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb
@@ -2,7 +2,7 @@ SUMMARY = "An image containing the cirros cloud guest"
 DESCRIPTION = "CirrOS a tiny cloud guest"
 HOMEPAGE = "https://launchpad.net/cirros"
 
-LICENSE="GPLv2"
+LICENSE="GPL-2.0-only"
 
 SRC_URI = "http://download.cirros-cloud.net/${PV}/${PN}-${PV}-x86_64-disk.img"
 
@@ -19,4 +19,4 @@ do_install() {
 }
 
 PACKAGES = "cirros-guest-image"
-FILES_cirros-guest-image = "${ROOT_HOME}/images/*"
+FILES:cirros-guest-image = "${ROOT_HOME}/images/*"
diff --git a/meta-openstack/recipes-extended/images/openstack-image-aio.bb b/meta-openstack/recipes-extended/images/openstack-image-aio.bb
index 2fbb85e2..f01d0ed5 100644
--- a/meta-openstack/recipes-extended/images/openstack-image-aio.bb
+++ b/meta-openstack/recipes-extended/images/openstack-image-aio.bb
@@ -27,7 +27,7 @@ inherit identity
 inherit monitor
 
 # check for 5G of free space, so we use 5G as a starting point.
-IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000"
+IMAGE_ROOTFS_EXTRA_SPACE += "+ 5000000"
 
 POST_KEYSTONE_SETUP_COMMAND = "/etc/keystone/hybrid-backend-setup"
 
diff --git a/meta-openstack/recipes-extended/images/openstack-image-compute.bb b/meta-openstack/recipes-extended/images/openstack-image-compute.bb
index 897efc42..a725e2e9 100644
--- a/meta-openstack/recipes-extended/images/openstack-image-compute.bb
+++ b/meta-openstack/recipes-extended/images/openstack-image-compute.bb
@@ -19,6 +19,6 @@ inherit monitor
 
 # Ensure extra space for guest images, and rabbit MQ has a hard coded
 # check for 2G of free space, so we use 3G as a starting point.
-IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 3000000"
+IMAGE_ROOTFS_EXTRA_SPACE:append = " + 3000000"
 
 # ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
diff --git a/meta-openstack/recipes-extended/images/openstack-image-controller.bb b/meta-openstack/recipes-extended/images/openstack-image-controller.bb
index 6f324d84..96dc80c4 100644
--- a/meta-openstack/recipes-extended/images/openstack-image-controller.bb
+++ b/meta-openstack/recipes-extended/images/openstack-image-controller.bb
@@ -24,5 +24,5 @@ inherit monitor
 
 # Ensure extra space for guest images, and rabbit MQ has a hard coded
 # check for 2G of free space, so we use 5G as a starting point.
-IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000"
+IMAGE_ROOTFS_EXTRA_SPACE:append = " + 5000000"
 
diff --git a/meta-openstack/recipes-extended/iptables/iptables_openstack.inc b/meta-openstack/recipes-extended/iptables/iptables_openstack.inc
index 2a53557a..b26605d7 100644
--- a/meta-openstack/recipes-extended/iptables/iptables_openstack.inc
+++ b/meta-openstack/recipes-extended/iptables/iptables_openstack.inc
@@ -1,3 +1,3 @@
-RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \
+RRECOMMENDS:${PN} += "kernel-module-xt-conntrack \
                       kernel-module-xt-redirect \
                       "
diff --git a/meta-openstack/recipes-extended/libpam/libpam_openstack.inc b/meta-openstack/recipes-extended/libpam/libpam_openstack.inc
index ec858a7f..6ebb4a33 100644
--- a/meta-openstack/recipes-extended/libpam/libpam_openstack.inc
+++ b/meta-openstack/recipes-extended/libpam/libpam_openstack.inc
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI += "file://common-account"
 SRC_URI += "file://common-auth"
@@ -9,7 +9,7 @@ SRC_URI += "file://common-session-noninteractive"
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}"
 PACKAGECONFIG[OpenLDAP] = ",,,pam-plugin-mkhomedir nss-pam-ldapd"
 
-do_install_append() {
+do_install:append() {
     if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then
         install -m 755 -d ${D}/etc/pam.d/
         install -m 644 ${WORKDIR}/common-account ${D}/etc/pam.d/
diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_6.%.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_10.%.bbappend
index 025ee4ee..025ee4ee 100644
--- a/meta-openstack/recipes-extended/libvirt/libvirt_6.%.bbappend
+++ b/meta-openstack/recipes-extended/libvirt/libvirt_10.%.bbappend
diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc b/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc
index 0b0f0114..7d8a4603 100644
--- a/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc
+++ b/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc
@@ -5,9 +5,9 @@ PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \
 
 inherit useradd
 USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN}_append = " ;--system libvirt"
+GROUPADD_PARAM:${PN}:append = " ;--system libvirt"
 
-do_install_append() {
+do_install:append() {
 	sed -e "s:^#unix_sock_group =:unix_sock_group =:g" -i ${D}/etc/libvirt/libvirtd.conf
 	sed -e "s:^#unix_sock_rw_perms =:unix_sock_rw_perms =:g" -i ${D}/etc/libvirt/libvirtd.conf
 }
diff --git a/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc b/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc
index 33b1f61c..73cc86a8 100644
--- a/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc
+++ b/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc
@@ -1,3 +1,3 @@
-do_install_append() {
+do_install:append() {
 	sed -i '2i port=`grep "^server.port" /etc/lighttpd.conf`; if [ -z $port ]; then echo "server port not configured, not running lighttpd..."; exit 0; fi' ${D}/etc/init.d/lighttpd
 }
diff --git a/meta-openstack/recipes-extended/novnc/novnc_git.bb b/meta-openstack/recipes-extended/novnc/novnc_git.bb
index ee20e3b9..82dcd4b3 100644
--- a/meta-openstack/recipes-extended/novnc/novnc_git.bb
+++ b/meta-openstack/recipes-extended/novnc/novnc_git.bb
@@ -1,52 +1,33 @@
 DESCRIPTION = "HTML5 VNC client"
 HOMEPAGE = "https://github.com/kanaka/noVNC"
 SECTION = "web"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b428e7772bf00c07fb7b863b80358adf"
 
-PR = "r0"
+SRCREV = "9142f8f0f7b4a53447f5cfec3a797cbf0d6204a9"
+PV = "1.2.0+git${SRCPV}"
 
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ac06308a999996ffc2d24d81b3a39f1b"
-
-SRCREV = "8f12ca7a5a64144fe548cada332d5d19ef26a1fe"
-PV = "0.4+git${SRCPV}"
-
-SRC_URI = "git://github.com/kanaka/noVNC.git"
+SRC_URI = "git://github.com/kanaka/noVNC.git;branch=master;protocol=https"
 
 S = "${WORKDIR}/git"
 
-RDEPENDS_${PN} += "python-numpy"
-RDEPENDS_${PN} += "python-novnc"
-RDEPENDS_${PN} += "python-websockify"
-
 do_compile() {
     :
 }
 
+RDEPENDS:${PN} += " \
+	bash \
+"
+
 do_install() {
-    install -m 755 -d ${D}${bindir}/novnc
-    install -m 755 -d ${D}${datadir}/novnc/include
-
-    install -m 644 ${S}/vnc.html ${D}${datadir}/novnc
-    install -m 644 ${S}/vnc_auto.html ${D}${datadir}/novnc
-    install -m 644 ${S}/images/favicon.ico ${D}${datadir}/novnc
-    install -m 644 ${S}/include/base64.js ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/des.js ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/display.js ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/input.js ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/logo.js ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/base.css ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/blue.css ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/black.css ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/playback.js ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/rfb.js ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/ui.js ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/util.js ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/websock.js ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/webutil.js ${D}${datadir}/novnc/include
-    install -m 644 ${S}/include/jsunzip.js ${D}${datadir}/novnc/include
-
-    sed -i -e 's:#!/usr/bin/env bash:#!/bin/sh:' ${S}/utils/launch.sh	
-
-    install -m 755 ${S}/utils/launch.sh ${D}${bindir}/novnc-launch.sh
+    install -m 755 -d ${D}${datadir}/novnc
+   
+    cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/novnc
+ 
+    install -m 444 ${S}/vnc.html ${D}${datadir}/novnc/index.html
+    install -m 444 ${S}/vnc_lite.html ${D}${datadir}/novnc/vnc_auto.html
+
+    install -m 755 -d ${D}${bindir}
+    install ${S}/utils/launch.sh ${D}${bindir}/novnc_server
 }
 
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb
index e659c317..40172ca8 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     tempest \
     rally-api \
     rally-setup \
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
index e884af06..0f009e6c 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     cloud-init \
     postgresql \
     qemu \
@@ -28,7 +28,7 @@ RDEPENDS_${PN} = " \
     ${@bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-agent', '', d)} \
     "
 
-RRECOMMENDS_${PN} = " \
+RRECOMMENDS:${PN} = " \
     kernel-module-kvm \
     kernel-module-kvm-intel \
     kernel-module-kvm-amd \
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
index 80947688..851e3fa4 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " postgresql \
+RDEPENDS:${PN} = " postgresql \
     postgresql-client \
     python-psycopg2 \
     rabbitmq-server \
@@ -55,7 +55,7 @@ RDEPENDS_${PN} = " postgresql \
     ${@bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-core', '', d)} \
     "
 
-RRECOMMENDS_${PN} = " \
+RRECOMMENDS:${PN} = " \
     kernel-module-fuse \
     cloud-init \
     kernel-module-softdog \
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb
index fecbdc62..4806b2b6 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     packagegroup-core-tools-debug \
     "
 
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb
index 9273916c..0d561e01 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     vim \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xterm', '', d)} \
     "
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb
index 749a99fb..17d662cc 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     neutron-plugin-openvswitch \
     neutron-dhcp-agent \
     neutron-l3-agent \
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb
index 4bf657b2..6c703709 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Dummy packagegroup to provide virtual/monitoring"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 inherit packagegroup
@@ -13,8 +13,8 @@ PACKAGES = "\
 	${SRCNAME}-agent \
 "
 
-RDEPENDS_${SRCNAME}-core += "\
+RDEPENDS:${SRCNAME}-core += "\
 "
 
-RDEPENDS_${SRCNAME}-agent += "\
+RDEPENDS:${SRCNAME}-agent += "\
 "
diff --git a/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
index 9db46859..3a486b4f 100644
--- a/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
+++ b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
@@ -12,4 +12,5 @@ SRC_URI[sha256sum] = "3ca55a5aa11fbbd4e26cb4cdafc9658489c159acadceac60c89d4bfb5c
 
 S = "${WORKDIR}/qpid-${PV}/python"
 
-inherit distutils3
+inherit setuptools3
+
diff --git a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
index 933f5efd..9d8bfc68 100644
--- a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
+++ b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
@@ -4,7 +4,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7ab4c208aa62d92d7a03cc8e0a89c12b"
 SECTION = "mq"
 DEPENDS = "boost perl-native python3 util-linux cyrus-sasl"
-RDEPENDS_${PN} = "cyrus-sasl-bin"
+RDEPENDS:${PN} = "cyrus-sasl-bin"
 PR = "r0"
 
 SRC_URI = "http://archive.apache.org/dist/${PN}/${PV}/qpid-cpp-0.20.tar.gz \
@@ -32,28 +32,28 @@ EXTRA_OEMAKE += " CPPFLAGS=-Wno-unused-function \
         pythondir=${PYTHON_SITEPACKAGES_DIR} \
 "
 
-do_install_append() {
+do_install:append() {
      install -d ${D}${sysconfdir}/init.d
      install -m 0755 ${WORKDIR}/qpidd ${D}${sysconfdir}/init.d/qpidd
 }
 
 PACKAGES += "qmfgen qmfgen-python qmfgen-python-dbg"
 
-FILES_qmfgen = "${bindir}/qmf-gen"
+FILES:qmfgen = "${bindir}/qmf-gen"
 
-FILES_qmfgen-python = "${PYTHON_SITEPACKAGES_DIR}/*"
+FILES:qmfgen-python = "${PYTHON_SITEPACKAGES_DIR}/*"
 
-FILES_qmfgen-python-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/*"
+FILES:qmfgen-python-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/*"
 
-FILES_${PN} += "${libdir}/${PN}/tests/test_store.so"
+FILES:${PN} += "${libdir}/${PN}/tests/test_store.so"
 
-FILES_${PN}-dev += "${libdir}/${PN}/tests/test_store.so "
+FILES:${PN}-dev += "${libdir}/${PN}/tests/test_store.so "
 
-FILES_${PN}-dbg += "${libdir}/${PN}/${PN}/tests/.debug/* \
+FILES:${PN}-dbg += "${libdir}/${PN}/${PN}/tests/.debug/* \
                     ${libdir}/${PN}/tests/.debug/*  \
                     ${libdir}/${PN}/daemon/.debug/*"
 
-FILES_${PN}-doc += "${datadir}/qpidc/*"
+FILES:${PN}-doc += "${datadir}/qpidc/*"
 
 INITSCRIPT_NAME = "qpidd"
 INITSCRIPT_PARAMS = "defaults"
diff --git a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb
index 7f003fd6..7816003c 100644
--- a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb
+++ b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb
@@ -26,7 +26,7 @@ DEPENDS = " \
     coreutils-native\
 "
 
-RDEPENDS_${PN} = "erlang erlang-modules"
+RDEPENDS:${PN} = "erlang erlang-modules"
 
 do_compile() {
     oe_runmake
@@ -68,18 +68,18 @@ do_install() {
 inherit useradd update-rc.d systemd
 
 USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system rabbitmq"
-USERADD_PARAM_${PN}  = "--system --create-home --home /var/lib/rabbitmq \
+GROUPADD_PARAM:${PN} = "--system rabbitmq"
+USERADD_PARAM:${PN}  = "--system --create-home --home /var/lib/rabbitmq \
 			-g rabbitmq rabbitmq"
 
 INITSCRIPT_NAME = "rabbitmq-server"
 INITSCRIPT_PARAMS = "defaults"
 
-SYSTEMD_SERVICE_${PN} = "rabbitmq-server.service"
+SYSTEMD_SERVICE:${PN} = "rabbitmq-server.service"
 
-FILES_${PN} += " ${libdir}/rabbitmq/lib/${PN}-${PV}/* \
+FILES:${PN} += " ${libdir}/rabbitmq/lib/${PN}-${PV}/* \
                  ${localstatedir}/* \ 
                "
 
-FILES_${PN}-doc += "LICENSE* INSTALL"
-INSANE_SKIP_${PN} = "unsafe-references-in-scripts"
+FILES:${PN}-doc += "LICENSE* INSTALL"
+INSANE_SKIP:${PN} = "unsafe-references-in-scripts"
diff --git a/meta-openstack/recipes-extended/syslog/syslog-user.inc b/meta-openstack/recipes-extended/syslog/syslog-user.inc
index 57aba008..5c28ce40 100644
--- a/meta-openstack/recipes-extended/syslog/syslog-user.inc
+++ b/meta-openstack/recipes-extended/syslog/syslog-user.inc
@@ -5,6 +5,6 @@
 inherit useradd
 
 USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system syslog"
-USERADD_PARAM_${PN}  = "--system --home /var/log -g syslog syslog"
+GROUPADD_PARAM:${PN} = "--system syslog"
+USERADD_PARAM:${PN}  = "--system --home /var/log -g syslog syslog"
 
diff --git a/meta-openstack/recipes-extended/tempest/tempest_git.bb b/meta-openstack/recipes-extended/tempest/tempest_git.bb
index 48a286ce..4854516c 100644
--- a/meta-openstack/recipes-extended/tempest/tempest_git.bb
+++ b/meta-openstack/recipes-extended/tempest/tempest_git.bb
@@ -9,7 +9,7 @@ SRCNAME = "tempest"
 
 inherit setuptools3 identity hosts
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https \
            file://tempest.conf \
            file://logging.conf \
 "
@@ -61,7 +61,7 @@ python () {
     d.setVarFlags("USERCREATE_PARAM_%s-setup-admin" % d.getVar('SRCNAME',True), flags)
 }
 
-do_install_append() {
+do_install:append() {
     TEMPLATE_CONF_DIR=${S}${sysconfdir}/
     TEMPEST_CONF_DIR=${D}${sysconfdir}/${SRCNAME}
 
@@ -106,18 +106,18 @@ PACKAGES =+ "${SRCNAME}-tests \
              ${SRCNAME}-setup-admin \
              "
 
-FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tests/*"
+FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tests/*"
 
-FILES_${PN} = "${libdir}/* \
+FILES:${PN} = "${libdir}/* \
                ${sysconfdir}/* \
                ${bindir}/* \
 "
 
-ALLOW_EMPTY_${SRCNAME}-setup = "1"
-ALLOW_EMPTY_${SRCNAME}-setup-altdemo = "1"
-ALLOW_EMPTY_${SRCNAME}-setup-admin = "1"
+ALLOW_EMPTY:${SRCNAME}-setup = "1"
+ALLOW_EMPTY:${SRCNAME}-setup-altdemo = "1"
+ALLOW_EMPTY:${SRCNAME}-setup-admin = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ${SRCNAME}-tests \
         ${SRCNAME}-setup \
         ${SRCNAME}-setup-altdemo \
diff --git a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
index bf6b30f2..62e0df42 100644
--- a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
+++ b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=33ab1ce13e2312dddfad07f97f66321f"
 
 SRCNAME = "uwsgi"
-SRC_URI = "git://github.com/unbit/uwsgi.git;branch=uwsgi-2.0 \
+SRC_URI = "git://github.com/unbit/uwsgi.git;branch=uwsgi-2.0;protocol=https \
     file://Add-explicit-breaks-to-avoid-implicit-passthrough.patch \
     file://more-Add-explicit-breaks-to-avoid-implicit-passthrough.patch \
 "
@@ -26,8 +26,8 @@ DEPENDS += " \
         yajl \
         "
 
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
+# RDEPENDS:default: 
+RDEPENDS:${PN} += " \
         "
 
 CLEANBROKEN = "1"