From 007c3ab41566df410505416e59090f896af662a8 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Fri, 23 Aug 2024 21:21:24 +0200 Subject: [PATCH] Use collection as prefix for collections (#1013) Signed-off-by: Christian Berendt --- osism/commands/apply.py | 4 +--- osism/core/enums.py | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/osism/commands/apply.py b/osism/commands/apply.py index 78c81128..4e77982d 100644 --- a/osism/commands/apply.py +++ b/osism/commands/apply.py @@ -305,9 +305,7 @@ def handle_collection( ) if t: t.apply_async() - if dry_run: - logger.info("Dry run. No tasks are running in the background") - else: + if not dry_run: logger.info( f"All tasks of the collection {collection} are prepared for execution" ) diff --git a/osism/core/enums.py b/osism/core/enums.py index 6d88f2c3..06b1da86 100644 --- a/osism/core/enums.py +++ b/osism/core/enums.py @@ -182,7 +182,7 @@ ], ], ], - "all-infrastructure": [ + "collection-infrastructure": [ "openstackclient", "phpmyadmin", [ @@ -196,10 +196,10 @@ ], ], ], - "all-kubernetes": [ + "collection-kubernetes": [ ["kubernetes", ["kubeconfig", ["copy-kubeconfig"]]], ], - "all-openstack": [ + "collection-openstack": [ "horizon", [ "keystone", @@ -218,7 +218,7 @@ ], ], ], - "all-ceph": [ + "collection-ceph": [ [ "ceph", [ @@ -229,7 +229,7 @@ ], ], ], - "all-monitoring": [ + "collection-monitoring": [ ["prometheus", ["grafana"]], "netdata", ],