Merge branch 'havana'

8 files changed, 30 insertions, 41 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-cliff/remove-distribute-dependency.patch b/meta-openstack/recipes-devtools/python/python-cliff/remove-distribute-dependency.patch
deleted file mode 100644
index 18aab4c..0000000
--- a/meta-openstack/recipes-devtools/python/python-cliff/remove-distribute-dependency.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: cliff-1.3.2/setup.py
-===================================================================
---- cliff-1.3.2.orig/setup.py
-+++ cliff-1.3.2/setup.py
-@@ -5,10 +5,6 @@ PROJECT = 'cliff'
- # Change docs/source/conf.py too!
- VERSION = '1.3.2'
- 
--# Bootstrap installation of Distribute
--import distribute_setup
--distribute_setup.use_setuptools()
--
- from setuptools import setup, find_packages
- 
- from distutils.util import convert_path
-@@ -22,7 +18,6 @@ except IOError:
-     long_description = ''
- 
- install_requires = [
--    'distribute',
-     'PrettyTable>=0.6,<0.8',
-     'cmd2==0.6.4',
- ]
diff --git a/meta-openstack/recipes-devtools/python/python-cliff_1.3.2.bb b/meta-openstack/recipes-devtools/python/python-cliff_1.4.5.bb
index 05de68b..793ceca 100644
--- a/meta-openstack/recipes-devtools/python/python-cliff_1.3.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-cliff_1.4.5.bb
@@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 PR = "r0"
 SRCNAME = "cliff"
 
-SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-           file://remove-distribute-dependency.patch"
+SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "a42f7894dbc70f42c0979042175f1b8f"
-SRC_URI[sha256sum] = "7c0250b5139993d04dcbb8b9d05376094b7271586b3698b4764c7c6f4697e0f8"
+SRC_URI[md5sum] = "21743e9e800cf526e88e420f366a4c5c"
+SRC_URI[sha256sum] = "0ec2c40e899cbb4d478aa946e1430600bf596ca2a3f12162a9514e9d580935ec"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-cmd2_0.6.4.bb b/meta-openstack/recipes-devtools/python/python-cmd2_0.6.7.bb
index bce95a4..9558cc6 100644
--- a/meta-openstack/recipes-devtools/python/python-cmd2_0.6.4.bb
+++ b/meta-openstack/recipes-devtools/python/python-cmd2_0.6.7.bb
@@ -2,15 +2,15 @@ DESCRIPTION = "Extra features for standard library's cmd module"
 HOMEPAGE = "http://packages.python.org/cmd2/"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://setup.py;beginline=21;endline=21;md5=25c0f7ede01b1eab41daf880e5791f05"
+LIC_FILES_CHKSUM = "file://setup.py;beginline=21;endline=21;md5=a00047b7e92e0781452d0beba4e7b44e"
 
 PR = "r0"
 SRCNAME = "cmd2"
 
 SRC_URI = "http://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "60a07255bbcb4342888b1574f46e56ea"
-SRC_URI[sha256sum] = "ff52cb800d931bbd0ce4b05bac0b024cf34ec3a04f66eadcb7d3f7dda42429ba"
+SRC_URI[md5sum] = "842df29ff2f72d64d7f0d917039c0e51"
+SRC_URI[sha256sum] = "8e98c7a1cfd106183559240b269e7cd9fe97e8342b5c05295f591aab6fd2f4f0"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
index a495a7d..84ef48b 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
@@ -19,6 +19,8 @@ debug = True
 verbose = True
 my_ip = %CONTROLLER_IP%
 glance_host = %CONTROLLER_IP%
+lock_path=/var/lock/nova/
+state_path=/var/run/nova/
 
 #VNC
 vnc_enabled = true
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.init b/meta-openstack/recipes-devtools/python/python-nova/nova.init
index 3a2bbac..c2882b6 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.init
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.init
@@ -30,7 +30,8 @@ start ()
 
     echo -n "Starting $DESC..."
 
-    start-stop-daemon --start --quiet --background \
+    sudo -u nova \
+        start-stop-daemon --start --quiet --background \
         --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON}
 
     if [ $? -eq 0 ]; then
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 6a065cb..9fb1daa 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
-DEPENDS = "sudo"
+DEPENDS = "sudo libvirt"
 
 PR = "r0"
 SRCNAME = "nova"
@@ -38,7 +38,7 @@ do_install_append() {
     NOVA_CONF_DIR=${D}/${sysconfdir}/nova
 
     install -d ${NOVA_CONF_DIR}
-    install -m 600 ${S}/etc/nova/policy.json ${NOVA_CONF_DIR}/
+    install -o nova -m 664 ${S}/etc/nova/policy.json ${NOVA_CONF_DIR}/
 
     # Deploy filters to /etc/nova/rootwrap.d
     install -m 755 -d ${NOVA_CONF_DIR}/rootwrap.d
@@ -57,8 +57,12 @@ do_install_append() {
     touch ${D}${sysconfdir}/sudoers.d/nova-rootwrap
     chmod 0440 ${D}${sysconfdir}/sudoers.d/nova-rootwrap
     chown root:root ${D}${sysconfdir}/sudoers.d/nova-rootwrap
+    # root user setup
     echo "root ALL=(root) NOPASSWD: ${bindir}/nova-rootwrap" > \
         ${D}${sysconfdir}/sudoers.d/nova-rootwrap
+    # nova user setup
+    echo "nova ALL=(root) NOPASSWD: ${bindir}/nova-rootwrap ${sysconfdir}/nova/rootwrap.conf *" >> \
+         ${D}${sysconfdir}/sudoers.d/nova-rootwrap
 
     # Configuration options
     sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" \
@@ -84,11 +88,11 @@ do_install_append() {
     sed -e "s:%CONTROLLER_HOST%:${CONTROLLER_HOST}:g" -i ${WORKDIR}/openrc
 
     # Copy the configuration file
-    install -m 664 ${WORKDIR}/nova.conf     ${NOVA_CONF_DIR}/nova.conf
-    install -m 664 ${WORKDIR}/api-paste.ini ${NOVA_CONF_DIR}
-    install -m 664 ${WORKDIR}/openrc        ${NOVA_CONF_DIR}
+    install -o nova -m 664 ${WORKDIR}/nova.conf     ${NOVA_CONF_DIR}/nova.conf
+    install -o nova -m 664 ${WORKDIR}/api-paste.ini ${NOVA_CONF_DIR}
+    install -o nova -m 664 ${WORKDIR}/openrc        ${NOVA_CONF_DIR}
 
-    install -d ${NOVA_CONF_DIR}/instances
+    install -o nova -d ${NOVA_CONF_DIR}/instances
 
     if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
@@ -136,7 +140,7 @@ pkg_postinst_${SRCNAME}-common () {
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "--system nova"
-USERADD_PARAM_${PN}  = "--system --home /var/lib/nova -g nova \
+USERADD_PARAM_${PN}  = "--system --home /var/lib/nova -g nova -G libvirt \
                         --no-create-home --shell /bin/false nova"
 
 PACKAGES += " ${SRCNAME}-setup ${SRCNAME}-common ${SRCNAME}-compute ${SRCNAME}-controller"
@@ -185,7 +189,8 @@ FILES_${SRCNAME}-api = " \
         ${sysconfdir}/init.d/nova-api \
 "
 
-RDEPENDS_${PN} = " python-modules \
+RDEPENDS_${PN} = " libvirt \
+                   python-modules \
                    python-misc \
                    python-argparse \
                    python-amqplib \
@@ -193,6 +198,7 @@ RDEPENDS_${PN} = " python-modules \
                    python-babel \
                    python-boto \
                    python-cinderclient \
+                   python-cliff \
                    python-cheetah \
                    python-eventlet \
                    python-feedparser \
diff --git a/meta-openstack/recipes-devtools/python/python-pyparsing_1.5.7.bb b/meta-openstack/recipes-devtools/python/python-pyparsing_2.0.1.bb
index 6db9dbf..32d9ebb 100644
--- a/meta-openstack/recipes-devtools/python/python-pyparsing_1.5.7.bb
+++ b/meta-openstack/recipes-devtools/python/python-pyparsing_2.0.1.bb
@@ -9,8 +9,8 @@ SRCNAME = "pyparsing"
 
 SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.zip"
 
-SRC_URI[md5sum] = "b86854857a368d6ccb4d5b6e76d0637f"
-SRC_URI[sha256sum] = "8a6329d4679fb249d4e0a4afbae6e041f9abbc299920d6efe5d8c4e9fb1407bc"
+SRC_URI[md5sum] = "dc7036a6f1ab01c3baed3d97af8d77c0"
+SRC_URI[sha256sum] = "7e1766ee747cca79fe172b670fd53ef58fc55d2b1804fd6c66d857abb62d143a"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-setuptools_1.4.bbappend b/meta-openstack/recipes-devtools/python/python-setuptools_1.4.bbappend
new file mode 100644
index 0000000..3c691d3
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-setuptools_1.4.bbappend
@@ -0,0 +1,4 @@
+# conflicting file prevention
+do_install_append() {
+        rm -f ${D}${libdir}/python*/site-packages/site.py*
+}
\ No newline at end of file