summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2016-03-18 16:50:10 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2016-03-21 10:19:41 -0400
commit0272d957bf5424acc425557e9a0a4a26c03b4401 (patch)
tree94c0c80419831b0573cd37a3ac3e21afeee673b0
parent2594110cff733c603f97a812238fddf6cdf746df (diff)
downloadmeta-cloud-services-0272d957bf5424acc425557e9a0a4a26c03b4401.tar.gz
openstackchef: add missing parameter to getVar
Builds are failing with: File: 'openstackchef_inc.bbclass', lineno: 624, function: deploychef_add_file_to_FILES_PN 0620: pkg_files = "FILES_%s" % pkg 0621: ldata.setVar("OVERRIDES", "%s:%s" % (pkg_files, overrides)) 0622: bb.data.update_data(ldata) 0623: *** 0624: dest_base = d.getVar('CHEF_TEMPLATE_BASE') 0625: pkg_imagedir = d.getVar('CHEF_ROOTFS_BASE', True) 0626: #Add the packages image base directory if it does not already exist 0627: if re.search(pkg_imagedir, files) == None: 0628: #All the directory and all files in it Exception: TypeError: getVar() takes at least 3 arguments (2 given) Add the required parameter to fix the build. Chef is planned to be removed from this layer in the near future, so this change is not tested. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack/classes/openstackchef_inc.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-openstack/classes/openstackchef_inc.bbclass b/meta-openstack/classes/openstackchef_inc.bbclass
index 9574008..b8757be 100644
--- a/meta-openstack/classes/openstackchef_inc.bbclass
+++ b/meta-openstack/classes/openstackchef_inc.bbclass
@@ -621,7 +621,7 @@ def deploychef_add_file_to_FILES_PN(d, conf_file=None):
621 ldata.setVar("OVERRIDES", "%s:%s" % (pkg_files, overrides)) 621 ldata.setVar("OVERRIDES", "%s:%s" % (pkg_files, overrides))
622 bb.data.update_data(ldata) 622 bb.data.update_data(ldata)
623 623
624 dest_base = d.getVar('CHEF_TEMPLATE_BASE') 624 dest_base = d.getVar('CHEF_TEMPLATE_BASE', True)
625 pkg_imagedir = d.getVar('CHEF_ROOTFS_BASE', True) 625 pkg_imagedir = d.getVar('CHEF_ROOTFS_BASE', True)
626 #Add the packages image base directory if it does not already exist 626 #Add the packages image base directory if it does not already exist
627 if re.search(pkg_imagedir, files) == None: 627 if re.search(pkg_imagedir, files) == None: