Rename include_pan option into include_pan_core_templates

- Change implemented for host, cluster and metacluster Change-Id: I216423a06fa49b259d2b3bb3240e2241a9f16f4b
quattor · May 23, 2018 · 73fabe7 · 73fabe7
1 parent fea8f5b
commit 73fabe7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/etc/aqd.conf.defaults b/etc/aqd.conf.defaults
@@ -346,7 +346,8 @@ gzip_output = false
 # only used if gzip_output = true
 transparent_gzip = true
 template_extension = .tpl
-include_pan = True
+# Control include of pan/units and pan/functions in plenary templates
+include_pan_core_templates = True
 
 [tool_timeout]
 # If set to True, timeout will be set to 'default_value' for any tools run via subprocess

diff --git a/lib/aquilon/worker/templates/cluster.py b/lib/aquilon/worker/templates/cluster.py
@@ -202,7 +202,7 @@ def body(self, lines):
         pan_assign(lines, "/",
                    StructureTemplate(path,
                                      {"metadata": PanValue("/metadata")}))
-        pan_include(lines, "archetype/base")
+        pan_include_if_exists(lines, "archetype/base")
 
         for servinst in sorted(self.dbobj.services_used,
                                key=attrgetter('service.name', 'name')):
@@ -217,7 +217,7 @@ def body(self, lines):
 
         path = PlenaryPersonalityBase.template_name(self.dbobj.personality_stage)
         pan_include(lines, path)
-        pan_include(lines, "archetype/final")
+        pan_include_if_exists(lines, "archetype/final")
 
 
 class PlenaryClusterClient(Plenary):

diff --git a/lib/aquilon/worker/templates/host.py b/lib/aquilon/worker/templates/host.py
@@ -379,7 +379,7 @@ def body(self, lines):
         lines.append("")
 
         # Load units and functions that may be used by hostdata
-        if self.config.getboolean("panc", "include_pan"):
+        if self.config.getboolean("panc", "include_pan_core_templates"):
                 pan_include(lines, ["pan/units", "pan/functions"])
                 lines.append("")
 

diff --git a/lib/aquilon/worker/templates/metacluster.py b/lib/aquilon/worker/templates/metacluster.py
@@ -130,15 +130,15 @@ def body(self, lines):
         pan_assign(lines, "/",
                    StructureTemplate("clusterdata/%s" % self.dbobj.name,
                                      {"metadata": PanValue("/metadata")}))
-        pan_include(lines, "archetype/base")
+        pan_include_if_exists(lines, "archetype/base")
 
         for servinst in sorted(self.dbobj.services_used):
             path = PlenaryServiceInstanceClientDefault.template_name(servinst)
             pan_include(lines, path)
 
         path = PlenaryPersonalityBase.template_name(self.dbobj.personality_stage)
         pan_include(lines, path)
-        pan_include(lines, "archetype/final")
+        pan_include_if_exists(lines, "archetype/final")
 
 
 Plenary.handlers[MetaCluster] = PlenaryMetaCluster