]> Frank Brehm's Git Trees - pixelpark/create-terraform.git/commitdiff
Fixing lib/cr_tf/app.py
authorFrank Brehm <frank.brehm@pixelpark.com>
Fri, 3 Sep 2021 10:16:08 +0000 (12:16 +0200)
committerFrank Brehm <frank.brehm@pixelpark.com>
Fri, 3 Sep 2021 10:16:08 +0000 (12:16 +0200)
lib/cr_tf/app.py
lib/cr_tf/terraform/vm.py

index a0bf26465c5d70226d1a57a18558d52ba7aa107e..983272dc2db16fbccea52a727d7876502098c03e 100644 (file)
@@ -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:
index 3b41c6f0cbbc769f83a643108fb32997ba9d7910..d44fe72d66ad9166e09748cf645a4e25432cdea2 100644 (file)
@@ -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__)