From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Fri, 3 Sep 2021 10:16:08 +0000 (+0200)
Subject: Fixing lib/cr_tf/app.py
X-Git-Tag: 1.5.2^2~37
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d5a28b0e7d61a885186029cf47f951d6d81e06c5;p=pixelpark%2Fcreate-terraform.git

Fixing lib/cr_tf/app.py
---

diff --git a/lib/cr_tf/app.py b/lib/cr_tf/app.py
index a0bf264..983272d 100644
--- a/lib/cr_tf/app.py
+++ b/lib/cr_tf/app.py
@@ -45,7 +45,7 @@ from .xlate import __base_dir__ as __xlate_base_dir__
 from .xlate import __mo_file__ as __xlate_mo_file__
 from .xlate import XLATOR, LOCALE_DIR, DOMAIN
 
-__version__ = '1.1.2'
+__version__ = '1.1.3'
 LOG = logging.getLogger(__name__)
 
 SIGNAL_NAMES = {
@@ -255,10 +255,6 @@ class CrTfApplication(BaseApplication):
                         LOG.debug(_("Removing puppet environment {!r} ...").format(env))
                     TerraformVm.valid_puppet_environments.remove(env)
 
-        TerraformVm.valid_puppet_environments.sort()
-        LOG.debug(
-            _("Allowed puppet environments:") + ' ' + pp(TerraformVm.valid_puppet_environments))
-
         if self.config.puppet_envs_add:
             LOG.debug(_("Adding allowed puppet environments ..."))
             for env in self.config.puppet_envs_add:
@@ -267,6 +263,10 @@ class CrTfApplication(BaseApplication):
                         LOG.debug(_("Adding puppet environment {!r} ...").format(env))
                     TerraformVm.valid_puppet_environments.append(env)
 
+        TerraformVm.valid_puppet_environments.sort()
+        LOG.debug(
+            _("Allowed puppet environments:") + ' ' + pp(TerraformVm.valid_puppet_environments))
+
         self.perform_arg_parser_rest()
 
         if not self.config.pdns_api_key:
diff --git a/lib/cr_tf/terraform/vm.py b/lib/cr_tf/terraform/vm.py
index 3b41c6f..d44fe72 100644
--- a/lib/cr_tf/terraform/vm.py
+++ b/lib/cr_tf/terraform/vm.py
@@ -37,7 +37,7 @@ from .disk import TerraformDisk, TerraformDiskDict
 
 from .interface import TerraformInterface
 
-__version__ = '1.5.4'
+__version__ = '1.5.5'
 
 LOG = logging.getLogger(__name__)