From 8bfba8e4ea9d79028918d69cb4e97ec75c0be986 Mon Sep 17 00:00:00 2001 From: Mihai Prica Date: Wed, 17 Jul 2013 11:54:20 +0300 Subject: python-nova: Minor refactoring Signed-off-by: Mihai Prica --- .../recipes-devtools/python/python-nova_2013.1.bb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'meta-openstack/recipes-devtools/python') diff --git a/meta-openstack/recipes-devtools/python/python-nova_2013.1.bb b/meta-openstack/recipes-devtools/python/python-nova_2013.1.bb index aeeacbc..8364fcc 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_2013.1.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_2013.1.bb @@ -37,7 +37,8 @@ do_install_append() { # Set up rootwrap.conf, pointing to /etc/nova/rootwrap.d install -m 644 ${S}/etc/nova/rootwrap.conf ${NOVA_CONF_DIR}/ - sed -e "s:^filters_path=.*$:filters_path=${NOVA_CONF_DIR}/rootwrap.d:" -i ${NOVA_CONF_DIR}/rootwrap.conf + sed -e "s:^filters_path=.*$:filters_path=${NOVA_CONF_DIR}/rootwrap.d:" \ + -i ${NOVA_CONF_DIR}/rootwrap.conf chown root:root $NOVA_CONF_DIR/rootwrap.conf # Set up the rootwrap sudoers for nova @@ -45,7 +46,8 @@ 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 - echo "root ALL=(root) NOPASSWD: ${bindir}/nova-rootwrap" > ${D}${sysconfdir}/sudoers.d/nova-rootwrap + echo "root ALL=(root) NOPASSWD: ${bindir}/nova-rootwrap" > \ + ${D}${sysconfdir}/sudoers.d/nova-rootwrap #Configuration options sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" \ @@ -78,6 +80,16 @@ GROUPADD_PARAM_${PN} = "--system nova" USERADD_PARAM_${PN} = "--system --home /var/lib/nova -g nova \ --no-create-home --shell /bin/false nova" +PACKAGES += "${SRCNAME}-common ${SRCNAME}-compute ${SRCNAME}-controller" + +pkg_postinst_${SRCNAME}-common () { + if [ "x$D" != "x" ]; then + exit 1 + fi + + echo "source /etc/nova/openrc" > /home/root/.bashrc +} + pkg_postinst_${SRCNAME}-controller () { if [ "x$D" != "x" ]; then exit 1 @@ -95,7 +107,6 @@ pkg_postinst_${SRCNAME}-controller () { nova-manage db sync } -PACKAGES += "${SRCNAME}-common ${SRCNAME}-compute ${SRCNAME}-controller" FILES_${PN} = "${libdir}/*" -- cgit v1.2.3-54-g00ecf