summaryrefslogtreecommitdiffstats
path: root/meta-openstack
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-10-02 13:36:45 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2013-10-03 01:16:44 -0400
commit40fb67227cf3dc76ea7e35af1086c0288c8c351a (patch)
tree44869fd24ec1919213b22d09cd038d49f72cba77 /meta-openstack
parentca21057bd38ba8e3922e26736d7e7600ee9d660e (diff)
downloadmeta-cloud-services-40fb67227cf3dc76ea7e35af1086c0288c8c351a.tar.gz
nova: use ${sysconfdir} instead of ${NOVA_CONF_DIR}
${NOVA_CONF_DIR} points to the staging/build directories, so it shouldn't be placed into on-target config files. Using ${sysconfdir} is the right, on-target, directory to use. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack')
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova.inc b/meta-openstack/recipes-devtools/python/python-nova.inc
index be46460..01483e7 100644
--- a/meta-openstack/recipes-devtools/python/python-nova.inc
+++ b/meta-openstack/recipes-devtools/python/python-nova.inc
@@ -42,7 +42,7 @@ do_install_append() {
42 42
43 # Set up rootwrap.conf, pointing to /etc/nova/rootwrap.d 43 # Set up rootwrap.conf, pointing to /etc/nova/rootwrap.d
44 install -m 644 ${S}/etc/nova/rootwrap.conf ${NOVA_CONF_DIR}/ 44 install -m 644 ${S}/etc/nova/rootwrap.conf ${NOVA_CONF_DIR}/
45 sed -e "s:^filters_path=.*$:filters_path=${NOVA_CONF_DIR}/rootwrap.d:" \ 45 sed -e "s:^filters_path=.*$:filters_path=${sysconfdir}/nova/rootwrap.d:" \
46 -i ${NOVA_CONF_DIR}/rootwrap.conf 46 -i ${NOVA_CONF_DIR}/rootwrap.conf
47 chown root:root $NOVA_CONF_DIR/rootwrap.conf 47 chown root:root $NOVA_CONF_DIR/rootwrap.conf
48 48