Reverting logic of execution of PowerDNS actions.

diff --git a/lib/create_terraform/app.py b/lib/create_terraform/app.py
index ec5fb1b0e1a0fffee1b0f0938b80b4c4c2627e64..40721c8e09cc8fb3873f10abcc4fa07d08407f17 100644 (file)
--- a/lib/create_terraform/app.py
+++ b/lib/create_terraform/app.py
@@ -42,7 +42,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.3.5'
+__version__ = '1.3.6'
 LOG = logging.getLogger(__name__)
 
 SIGNAL_NAMES = {
@@ -417,10 +417,8 @@ class CrTfApplication(BaseApplication):
         pdns_group = self.arg_parser.add_argument_group(_('PowerDNS options'))
 
         pdns_group.add_argument(
-            '--no-pdns', action="store_true", dest='no_pdns',
-            help=_(
-                "Don't execute any PowerDNS checks or actions. In this case it's on yours "
-                "to ensure existence of all necessary IP addresses.")
+            '--pdns', action="store_true", dest='do_pdns',
+            help=_('Execute PowerDNS checks or actions.')
         )
 
         pdns_group.add_argument(
@@ -482,8 +480,8 @@ class CrTfApplication(BaseApplication):
     # -------------------------------------------------------------------------
     def perform_arg_parser_pdns(self):
 
-        if self.args.no_pdns:
-            self.config.no_pdns = True
+        if self.args.do_pdns:
+            self.config.no_pdns = False
         if self.args.pdns_master:
             self.config.pdns_master_server = self.args.pdns_master
         if self.args.pdns_api_port:

diff --git a/lib/create_terraform/config.py b/lib/create_terraform/config.py
index b69d34b91c342d302bfbdacc05de7f81faba07a3..c32341370c73addf182209394edbd63601816584 100644 (file)
--- a/lib/create_terraform/config.py
+++ b/lib/create_terraform/config.py
@@ -140,7 +140,7 @@ class CrTfConfiguration(BaseConfiguration):
         self._vsphere_tag_os_rhel_name = self.default_vsphere_tag_os_rhel_name
         self._vsphere_tag_os_rhel_desc = self.default_vsphere_tag_os_rhel_desc
 
-        self._no_pdns = False
+        self._no_pdns = True
 
         self.puppet_envs_add = set()
         self.puppet_envs_delete = set()

diff --git a/locale/create_terraform.pot b/locale/create_terraform.pot
index 4c4246f9db34a34f9edfc2bcb19a0648f94350b9..154e6a38b169235b37a5af7b0e0e1daf40ea6a87 100644 (file)
--- a/locale/create_terraform.pot
+++ b/locale/create_terraform.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: create_terraform 1.8.10\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2024-05-24 10:34+0200\n"
+"POT-Creation-Date: 2024-05-24 11:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <frank.brehm@pixelpark.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,104 +107,102 @@ msgid "PowerDNS options"
 msgstr ""
 
 #: lib/create_terraform/app.py:421
-msgid ""
-"Don't execute any PowerDNS checks or actions. In this case it's on yours to ensure existence of "
-"all necessary IP addresses."
+msgid "Execute PowerDNS checks or actions."
 msgstr ""
 
-#: lib/create_terraform/app.py:427
+#: lib/create_terraform/app.py:425
 msgid "HOST"
 msgstr ""
 
-#: lib/create_terraform/app.py:428
+#: lib/create_terraform/app.py:426
 msgid "The hostname or address of the PowerDNS master server (Default: {!r})."
 msgstr ""
 
-#: lib/create_terraform/app.py:434
+#: lib/create_terraform/app.py:432
 msgid "PORT"
 msgstr ""
 
-#: lib/create_terraform/app.py:435
+#: lib/create_terraform/app.py:433
 msgid "The port number of the PowerDNS API (Default: {})."
 msgstr ""
 
-#: lib/create_terraform/app.py:440
+#: lib/create_terraform/app.py:438
 msgid "KEY"
 msgstr ""
 
-#: lib/create_terraform/app.py:441
+#: lib/create_terraform/app.py:439
 msgid "The key accessing to the PDNS API."
 msgstr ""
 
-#: lib/create_terraform/app.py:446
+#: lib/create_terraform/app.py:444
 msgid "Should PDNS API requests executed per HTTPS?"
 msgstr ""
 
-#: lib/create_terraform/app.py:450
+#: lib/create_terraform/app.py:448
 msgid "PATH"
 msgstr ""
 
-#: lib/create_terraform/app.py:451
+#: lib/create_terraform/app.py:449
 msgid "The path prefix in the URL for PDNS API requests (Default: {!r})."
 msgstr ""
 
-#: lib/create_terraform/app.py:457
+#: lib/create_terraform/app.py:455
 msgid "YAML_FILE"
 msgstr ""
 
-#: lib/create_terraform/app.py:458
+#: lib/create_terraform/app.py:456
 msgid "The YAML-file with the definition of the VMs to create with terraform."
 msgstr ""
 
-#: lib/create_terraform/app.py:502
+#: lib/create_terraform/app.py:500
 msgid "Starting {a!r}, version {v!r} ..."
 msgstr ""
 
-#: lib/create_terraform/app.py:511
+#: lib/create_terraform/app.py:509
 msgid "Create Terraform environment"
 msgstr ""
 
-#: lib/create_terraform/app.py:518
+#: lib/create_terraform/app.py:516
 msgid "No handler object available."
 msgstr ""
 
-#: lib/create_terraform/app.py:525
+#: lib/create_terraform/app.py:523
 msgid "Please input the {}."
 msgstr ""
 
-#: lib/create_terraform/app.py:526 lib/create_terraform/app.py:530
+#: lib/create_terraform/app.py:524 lib/create_terraform/app.py:528
 msgid "vSphere user name"
 msgstr ""
 
-#: lib/create_terraform/app.py:528
+#: lib/create_terraform/app.py:526
 msgid "Name"
 msgstr ""
 
-#: lib/create_terraform/app.py:530 lib/create_terraform/app.py:559
+#: lib/create_terraform/app.py:528 lib/create_terraform/app.py:557
 msgid "No {} given."
 msgstr ""
 
-#: lib/create_terraform/app.py:534
+#: lib/create_terraform/app.py:532
 msgid "Setting user for vSphere {vs!r} to {usr!r}."
 msgstr ""
 
-#: lib/create_terraform/app.py:551
+#: lib/create_terraform/app.py:549
 msgid "User password of {!r}"
 msgstr ""
 
-#: lib/create_terraform/app.py:553
+#: lib/create_terraform/app.py:551
 msgid "Password for user {u!r} of vSphere {n} on {h!r}"
 msgstr ""
 
-#: lib/create_terraform/app.py:559
+#: lib/create_terraform/app.py:557
 msgid "password of vSphere user"
 msgstr ""
 
-#: lib/create_terraform/app.py:563
+#: lib/create_terraform/app.py:561
 msgid "Setting passwort of vSphere {vs!r} user {usr!r}."
 msgstr ""
 
-#: lib/create_terraform/app.py:582
+#: lib/create_terraform/app.py:580
 msgid "Executing {} ..."
 msgstr ""
 

diff --git a/locale/de_DE/LC_MESSAGES/create_terraform.po b/locale/de_DE/LC_MESSAGES/create_terraform.po
index 47035fbef664f3cf11b37d707f5fec0c17edbf21..a99a1c57a9ad082a2c005faf6c0fff31ac5195cd 100644 (file)
--- a/locale/de_DE/LC_MESSAGES/create_terraform.po
+++ b/locale/de_DE/LC_MESSAGES/create_terraform.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: create_terraform 1.8.10\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2024-05-24 10:34+0200\n"
-"PO-Revision-Date: 2024-05-24 10:35+0200\n"
+"POT-Creation-Date: 2024-05-24 11:48+0200\n"
+"PO-Revision-Date: 2024-05-24 11:50+0200\n"
 "Last-Translator: Frank Brehm <frank.brehm@pixelpark.com>\n"
 "Language: de_DE\n"
 "Language-Team: Frank Brehm <frank.brehm@pixelpark.com>\n"
@@ -114,106 +114,102 @@ msgid "PowerDNS options"
 msgstr "PowerDNS-Optionen"
 
 #: lib/create_terraform/app.py:421
-msgid ""
-"Don't execute any PowerDNS checks or actions. In this case it's on yours to ensure existence of "
-"all necessary IP addresses."
-msgstr ""
-"Kein Ausführen irgendwelcher PowerDNS-Checks oder -Aktionen. In diesem Fall liegt es an Dir "
-"selbst, die Existenz aller notwendigen IP-Adressen abzusichern."
+msgid "Execute PowerDNS checks or actions."
+msgstr "PowerDNS Checks oder Aktionen ausführen."
 
-#: lib/create_terraform/app.py:427
+#: lib/create_terraform/app.py:425
 msgid "HOST"
 msgstr "HOST"
 
-#: lib/create_terraform/app.py:428
+#: lib/create_terraform/app.py:426
 msgid "The hostname or address of the PowerDNS master server (Default: {!r})."
 msgstr "Der Hostname oder die Adresse des PowerDNS-Masterservers (Vorgabe: {!r})."
 
-#: lib/create_terraform/app.py:434
+#: lib/create_terraform/app.py:432
 msgid "PORT"
 msgstr "PORT"
 
-#: lib/create_terraform/app.py:435
+#: lib/create_terraform/app.py:433
 msgid "The port number of the PowerDNS API (Default: {})."
 msgstr "Die Portnummer der PowerDNS-API (Vorgabe: {})."
 
-#: lib/create_terraform/app.py:440
+#: lib/create_terraform/app.py:438
 msgid "KEY"
 msgstr "SCHLÜSSEL"
 
-#: lib/create_terraform/app.py:441
+#: lib/create_terraform/app.py:439
 msgid "The key accessing to the PDNS API."
 msgstr "Der Schlüssel, um auf die PDNS-API zuzugreifen."
 
-#: lib/create_terraform/app.py:446
+#: lib/create_terraform/app.py:444
 msgid "Should PDNS API requests executed per HTTPS?"
 msgstr "Sollen die PDNS-API-Zugriffe mittels HTTP ausgeführt werden?"
 
-#: lib/create_terraform/app.py:450
+#: lib/create_terraform/app.py:448
 msgid "PATH"
 msgstr "PFAD"
 
-#: lib/create_terraform/app.py:451
+#: lib/create_terraform/app.py:449
 msgid "The path prefix in the URL for PDNS API requests (Default: {!r})."
 msgstr "Der Pfad-Präfix in der URL der PDNS-API-Zugriffe (Vorgane: {!r})."
 
-#: lib/create_terraform/app.py:457
+#: lib/create_terraform/app.py:455
 msgid "YAML_FILE"
 msgstr "YAML_DATEI"
 
-#: lib/create_terraform/app.py:458
+#: lib/create_terraform/app.py:456
 msgid "The YAML-file with the definition of the VMs to create with terraform."
 msgstr "Die YAML-Datei mit den Definitionen der mittels Terraform zu erstellenden VMs."
 
-#: lib/create_terraform/app.py:502
+#: lib/create_terraform/app.py:500
 msgid "Starting {a!r}, version {v!r} ..."
 msgstr "Starte {a!r}, Version {v!r} …"
 
-#: lib/create_terraform/app.py:511
+#: lib/create_terraform/app.py:509
 msgid "Create Terraform environment"
 msgstr "Erstelle Terraform-Umgebung"
 
-#: lib/create_terraform/app.py:518
+#: lib/create_terraform/app.py:516
 msgid "No handler object available."
 msgstr "Kein Handler-Objekt verfügbar."
 
-#: lib/create_terraform/app.py:525
+#: lib/create_terraform/app.py:523
 msgid "Please input the {}."
 msgstr "Bitte den {} eingeben."
 
-#: lib/create_terraform/app.py:526 lib/create_terraform/app.py:530
+#: lib/create_terraform/app.py:524 lib/create_terraform/app.py:528
 msgid "vSphere user name"
 msgstr "vSphere-Nutzernamen"
 
-#: lib/create_terraform/app.py:528
+#: lib/create_terraform/app.py:526
 msgid "Name"
 msgstr "Name"
 
-#: lib/create_terraform/app.py:530 lib/create_terraform/app.py:559
+#: lib/create_terraform/app.py:528 lib/create_terraform/app.py:557
 msgid "No {} given."
 msgstr "Kein {} angegeben."
 
-#: lib/create_terraform/app.py:534
+#: lib/create_terraform/app.py:532
 msgid "Setting user for vSphere {vs!r} to {usr!r}."
 msgstr "Setze Cluster von {n!r} auf {c!r} …"
 
-#: lib/create_terraform/app.py:551
+#: lib/create_terraform/app.py:549
 msgid "User password of {!r}"
 msgstr "Nutzerpasswort von {!r}"
 
-#: lib/create_terraform/app.py:553
+#: lib/create_terraform/app.py:551
 msgid "Password for user {u!r} of vSphere {n} on {h!r}"
 msgstr "Passwort für Nutzer {u!r} in vSphere {n} auf {h!r}"
 
-#: lib/create_terraform/app.py:559
+#: lib/create_terraform/app.py:557
 msgid "password of vSphere user"
 msgstr "Passwort des vSphere-Nutzers"
 
-#: lib/create_terraform/app.py:563
+#: lib/create_terraform/app.py:561
 msgid "Setting passwort of vSphere {vs!r} user {usr!r}."
 msgstr "Setze das Passwort von Nutzer {usr!r} in vSphere {vs!r}."
 
-#: lib/create_terraform/app.py:582
+#: lib/create_terraform/app.py:580
 msgid "Executing {} ..."
 msgstr "Führe {} aus …"
 
@@ -1284,7 +1280,9 @@ msgstr "Datastore der VM {vm!r}: {ds!r}."
 msgid ""
 "{prefix} - Existing VM '{name}' in vSphere {vs!r} is currently located in folder '{cur_f}' "
 "instead in '{exp_f}'."
-msgstr "Die existierende VM '{name}' in vSphere {vs!r} ist aktuell im Ordner '{cur_f}' anstelle von '{exp_f}' plaziert."
+msgstr ""
+"{prefix} - Die existierende VM '{name}' in vSphere {vs!r} ist aktuell im Ordner '{cur_f}' "
+"anstelle von '{exp_f}' plaziert."
 
 #: lib/create_terraform/handler/vmware.py:646 lib/create_terraform/handler/vmware.py:670
 msgid "CAUTION!"
@@ -2137,3 +2135,13 @@ msgstr "Gefundene .mo-Datei: {!r}"
 #~ msgid "Using faked root password {!r} - but this is currently not used."
 #~ msgstr "Verwendung des gefakten Root-Passwortes {!r} - dieses wird aber gegenwärtig nicht verwendet."
 
+#~ msgid ""
+#~ "Don't execute any PowerDNS checks or actions. In"
+#~ " this case it's on yours to ensure existence "
+#~ "of all necessary IP addresses."
+#~ msgstr ""
+#~ "Kein Ausführen irgendwelcher PowerDNS-Checks oder "
+#~ "-Aktionen. In diesem Fall liegt es an Dir "
+#~ "selbst, die Existenz aller notwendigen IP-Adressen "
+#~ "abzusichern."
+

diff --git a/locale/en_US/LC_MESSAGES/create_terraform.po b/locale/en_US/LC_MESSAGES/create_terraform.po
index f4c68ea7d3421acb6b41f39ce783b8f32d121858..d5850ca77a49b5c15171924ffa84e8d9c69f968e 100644 (file)
--- a/locale/en_US/LC_MESSAGES/create_terraform.po
+++ b/locale/en_US/LC_MESSAGES/create_terraform.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: create_terraform 1.8.10\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2024-05-24 10:34+0200\n"
-"PO-Revision-Date: 2024-05-24 10:38+0200\n"
+"POT-Creation-Date: 2024-05-24 11:48+0200\n"
+"PO-Revision-Date: 2024-05-24 11:50+0200\n"
 "Last-Translator: Frank Brehm <frank.brehm@pixelpark.com>\n"
 "Language: en_US\n"
 "Language-Team: Frank Brehm <frank.brehm@pixelpark.com>\n"
@@ -113,106 +113,102 @@ msgid "PowerDNS options"
 msgstr "PowerDNS options"
 
 #: lib/create_terraform/app.py:421
-msgid ""
-"Don't execute any PowerDNS checks or actions. In this case it's on yours to ensure existence of "
-"all necessary IP addresses."
-msgstr ""
-"Don't execute any PowerDNS checks or actions. In this case it's on yours to ensure existence of "
-"all necessary IP addresses."
+msgid "Execute PowerDNS checks or actions."
+msgstr "Execute PowerDNS checks or actions."
 
-#: lib/create_terraform/app.py:427
+#: lib/create_terraform/app.py:425
 msgid "HOST"
 msgstr "HOST"
 
-#: lib/create_terraform/app.py:428
+#: lib/create_terraform/app.py:426
 msgid "The hostname or address of the PowerDNS master server (Default: {!r})."
 msgstr "The hostname or address of the PowerDNS master server (Default: {!r})."
 
-#: lib/create_terraform/app.py:434
+#: lib/create_terraform/app.py:432
 msgid "PORT"
 msgstr "PORT"
 
-#: lib/create_terraform/app.py:435
+#: lib/create_terraform/app.py:433
 msgid "The port number of the PowerDNS API (Default: {})."
 msgstr "The port number of the PowerDNS API (Default: {})."
 
-#: lib/create_terraform/app.py:440
+#: lib/create_terraform/app.py:438
 msgid "KEY"
 msgstr "KEY"
 
-#: lib/create_terraform/app.py:441
+#: lib/create_terraform/app.py:439
 msgid "The key accessing to the PDNS API."
 msgstr "The key accessing to the PDNS API."
 
-#: lib/create_terraform/app.py:446
+#: lib/create_terraform/app.py:444
 msgid "Should PDNS API requests executed per HTTPS?"
 msgstr "Should PDNS API requests executed per HTTPS?"
 
-#: lib/create_terraform/app.py:450
+#: lib/create_terraform/app.py:448
 msgid "PATH"
 msgstr "PATH"
 
-#: lib/create_terraform/app.py:451
+#: lib/create_terraform/app.py:449
 msgid "The path prefix in the URL for PDNS API requests (Default: {!r})."
 msgstr "The path prefix in the URL for PDNS API requests (Default: {!r})."
 
-#: lib/create_terraform/app.py:457
+#: lib/create_terraform/app.py:455
 msgid "YAML_FILE"
 msgstr "YAML_FILE"
 
-#: lib/create_terraform/app.py:458
+#: lib/create_terraform/app.py:456
 msgid "The YAML-file with the definition of the VMs to create with terraform."
 msgstr "The YAML-file with the definition of the VMs to create with terraform."
 
-#: lib/create_terraform/app.py:502
+#: lib/create_terraform/app.py:500
 msgid "Starting {a!r}, version {v!r} ..."
 msgstr "Starting {a!r}, version {v!r} …"
 
-#: lib/create_terraform/app.py:511
+#: lib/create_terraform/app.py:509
 msgid "Create Terraform environment"
 msgstr "Create Terraform environment"
 
-#: lib/create_terraform/app.py:518
+#: lib/create_terraform/app.py:516
 msgid "No handler object available."
 msgstr "No handler object available."
 
-#: lib/create_terraform/app.py:525
+#: lib/create_terraform/app.py:523
 msgid "Please input the {}."
 msgstr "Please input the {}."
 
-#: lib/create_terraform/app.py:526 lib/create_terraform/app.py:530
+#: lib/create_terraform/app.py:524 lib/create_terraform/app.py:528
 msgid "vSphere user name"
 msgstr "vSphere user name"
 
-#: lib/create_terraform/app.py:528
+#: lib/create_terraform/app.py:526
 msgid "Name"
 msgstr "Name"
 
-#: lib/create_terraform/app.py:530 lib/create_terraform/app.py:559
+#: lib/create_terraform/app.py:528 lib/create_terraform/app.py:557
 msgid "No {} given."
 msgstr "No {} given."
 
-#: lib/create_terraform/app.py:534
+#: lib/create_terraform/app.py:532
 msgid "Setting user for vSphere {vs!r} to {usr!r}."
 msgstr "Setting user for vSphere {vs!r} to {usr!r}."
 
-#: lib/create_terraform/app.py:551
+#: lib/create_terraform/app.py:549
 msgid "User password of {!r}"
 msgstr "User password of {!r}"
 
-#: lib/create_terraform/app.py:553
+#: lib/create_terraform/app.py:551
 msgid "Password for user {u!r} of vSphere {n} on {h!r}"
 msgstr "Password for user {u!r} of vSphere {n} on {h!r}"
 
-#: lib/create_terraform/app.py:559
+#: lib/create_terraform/app.py:557
 msgid "password of vSphere user"
 msgstr "password of vSphere user"
 
-#: lib/create_terraform/app.py:563
+#: lib/create_terraform/app.py:561
 msgid "Setting passwort of vSphere {vs!r} user {usr!r}."
 msgstr "Setting passwort of vSphere {vs!r} user {usr!r}."
 
-#: lib/create_terraform/app.py:582
+#: lib/create_terraform/app.py:580
 msgid "Executing {} ..."
 msgstr "Executing {} …"
 
@@ -1962,3 +1958,12 @@ msgstr "Found .mo-file: {!r}"
 #~ msgid "Got data disk:"
 #~ msgstr "Got data disk:"
 
+#~ msgid ""
+#~ "Don't execute any PowerDNS checks or actions. In"
+#~ " this case it's on yours to ensure existence "
+#~ "of all necessary IP addresses."
+#~ msgstr ""
+#~ "Don't execute any PowerDNS checks or actions. In"
+#~ " this case it's on yours to ensure existence "
+#~ "of all necessary IP addresses."
+