Starting (but not continuing) with vm_has_docs flag

diff --git a/lib/cr_vmware_tpl/config/__init__.py b/lib/cr_vmware_tpl/config/__init__.py
index 276b742a17b0f01555f6c0a8b3f98ba79693174e..b08d15755c84af020ba326166dbeccab18771a20 100644 (file)
--- a/lib/cr_vmware_tpl/config/__init__.py
+++ b/lib/cr_vmware_tpl/config/__init__.py
@@ -38,7 +38,7 @@ from .eval import ConfigEval
 from .ldap import LdapConnectionInfo, LdapConnectionDict
 from .timeouts import ConfigTimeouts
 
-__version__ = '3.2.0'
+__version__ = '3.3.0'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -177,6 +177,8 @@ class CrTplConfiguration(BaseMultiConfig, ConfigCobbler, ConfigTimeouts, ConfigE
         self.cobbler_profile_given = False
         self.template_name_given = False
 
+        self._vm_has_docs = False
+
         self._root_password = self.default_root_password
 
         self.private_ssh_key = None
@@ -356,6 +358,12 @@ class CrTplConfiguration(BaseMultiConfig, ConfigCobbler, ConfigTimeouts, ConfigE
         """The password of the RHSM user."""
         return self._rhsm_pwd
 
+    # -------------------------------------------------------------------------
+    @property
+    def vm_has_docs(self):
+        """Flag, that the RPM packages should be installed with documentation and man pages."""
+        return self._vm_has_docs
+
     # -------------------------------------------------------------------------
     def as_dict(self, short=True):
         """
@@ -383,6 +391,7 @@ class CrTplConfiguration(BaseMultiConfig, ConfigCobbler, ConfigTimeouts, ConfigE
         res['rhsm_user'] = self.rhsm_user
         res['system_ks'] = self.system_ks
         res['snippets_dir'] = self.snippets_dir
+        res['vm_has_docs'] = self.vm_has_docs
 
         res['cobbler_distros'] = {}
         for distro in self.cobbler_distros.keys():

diff --git a/lib/cr_vmware_tpl/config/eval.py b/lib/cr_vmware_tpl/config/eval.py
index 54aa083b08d19bdaec292885a35e7046eda54c2c..6af249cd16aeac1a874688c9f460e4afac41fc2f 100644 (file)
--- a/lib/cr_vmware_tpl/config/eval.py
+++ b/lib/cr_vmware_tpl/config/eval.py
@@ -15,7 +15,7 @@ import os
 import ipaddress
 
 # Third party modules
-from fb_tools.common import pp
+from fb_tools.common import pp, to_bool
 
 # Own modules
 from .. import DEFAULT_TIMEOUT, MAX_TIMEOUT
@@ -192,6 +192,8 @@ class ConfigEval():
         re_swap_space = re.compile(r'^\s*swap[-_]?space(?:[-_]?mb)?\s*$', re.IGNORECASE)
         re_rhsm_user = re.compile(r'^\s*rhsm[-_]?user\s*$', re.IGNORECASE)
         re_rhsm_pwd = re.compile(r'^\s*rhsm[-_]?(?:pwd|password)\s*$', re.IGNORECASE)
+        re_has_docs = re.compile(
+            r'^\s*(?:vm[-_]?)?has[-_]?doc(?:s|umentation)?\s*$', re.IGNORECASE)
 
         for key in section.keys():
             value = section[key]
@@ -251,6 +253,9 @@ class ConfigEval():
             if re_rhsm_pwd.match(key):
                 self._rhsm_pwd = value
                 continue
+            if re_has_docs.match(key):
+                self._vm_has_docs = to_bool(value)
+                continue
 
         return