check_feature_template: allow relaxed check of template existence

When config option relaxed_feature_template_check is true
(default: false), only display a warning if the template existence
cannot be assessed rather than raising an exception. This allows
to support direct use of features defined in the plenary templates
(e.g. features from the template library).

Contributes to quattor#111

Change-Id: I0b3319cd39a2c962da0464c511a2c42de2595407

etc/aqd.conf.defaults

@@ -352,6 +352,9 @@ template_extension = .tpl
 object_declarations_template = false
 # Use rack name in machine namespace
 machine_ns_rack_fullname = False
+# When true, only display a warning if a feature template doesn't
+# exist in a domain Git repository
+relaxed_feature_template_check = False
 
 [tool_timeout]
 # If set to True, timeout will be set to 'default_value' for any tools run via subprocess

lib/aquilon/worker/commands/bind_feature.py

@@ -141,7 +141,7 @@ def do_link(self, session, logger, dbfeature, params):
         q = q.filter(or_(*filters))
 
         for dbdomain in q:
-            check_feature_template(self.config, dbarchetype, dbfeature,
+            check_feature_template(self.config, logger, dbarchetype, dbfeature,
                                    dbdomain)
 
         add_link(session, logger, dbfeature, params)

lib/aquilon/worker/commands/manage_list.py

@@ -181,7 +181,7 @@ def render(self, session, logger, plenaries, domain, sandbox, force,
 
                 for dbarch, featureset in features.items():
                     for dbfeature in featureset:
-                        check_feature_template(self.config, dbarch, dbfeature,
+                        check_feature_template(self.config, logger, dbarch, dbfeature,
                                                dbbranch)
 
         for dbobj in objects:

lib/aquilon/worker/dbwrappers/feature.py

@@ -27,7 +27,6 @@
 from aquilon.worker.templates import PlenaryHost, PlenaryPersonality
 from aquilon.worker.templates.domain import template_branch_basedir
 
-
 def add_link(session, logger, dbfeature, params):
     FeatureLink.get_unique(session, feature=dbfeature, preclude=True,
                            **params)
@@ -59,7 +58,7 @@ def add_link(session, logger, dbfeature, params):
     dbfeature.links.append(FeatureLink(**params))
 
 
-def check_feature_template(config, dbarchetype, dbfeature, dbdomain):
+def check_feature_template(config, logger, dbarchetype, dbfeature, dbdomain):
     basedir = template_branch_basedir(config, dbdomain)
     # Features can be defined either in the archetype directory or as
     # features shared by all the archetypes if they are defined in basedir
@@ -73,8 +72,12 @@ def check_feature_template(config, dbarchetype, dbfeature, dbdomain):
             if os.path.exists("{}/config.{}" .format(feature_dir, ext)):
                 return
 
-    raise ArgumentError("{0} does not have templates present in {1:l} "
-                        "for {2:l}.".format(dbfeature, dbdomain, dbarchetype))
+    if config.getboolean("panc", "relaxed_feature_template_check"):
+        logger.client_info("WARNING: {0} templates not present in {1:l} for {2:l} "
+                           "(assumed to be present in plenary templates).".format(dbfeature, dbdomain, dbarchetype))
+    else:
+        raise ArgumentError("{0} does not have templates present in {1:l} "
+                            "for {2:l}.".format(dbfeature, dbdomain, dbarchetype))
 
 
 def get_affected_plenaries(session, dbfeature, plenaries,

lib/aquilon/worker/dbwrappers/host.py

@@ -84,7 +84,7 @@ def create_host(session, logger, config, dbhw, dbarchetype, domain=None,
         pre, post = host_features(dbstage)
         hw_features = hardware_features(dbstage, dbhw.model)
         for dbfeature in pre | post | hw_features:
-            check_feature_template(config, dbarchetype, dbfeature, dbbranch)
+            check_feature_template(config, logger, dbarchetype, dbfeature, dbbranch)
 
     if not osname:
         if config.has_option(section, "default_osname"):