From 1fb0335243b4d0cdeda4462a8f0fdf01a8a89cf5 Mon Sep 17 00:00:00 2001 From: James Cassell Date: Mon, 3 Jun 2019 10:56:03 -0400 Subject: [PATCH] group_chars: default change warning only when needed --- changelogs/fragments/group-chars-ignore.yaml | 4 ++++ lib/ansible/inventory/group.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/group-chars-ignore.yaml diff --git a/changelogs/fragments/group-chars-ignore.yaml b/changelogs/fragments/group-chars-ignore.yaml new file mode 100644 index 00000000000..08c507da803 --- /dev/null +++ b/changelogs/fragments/group-chars-ignore.yaml @@ -0,0 +1,4 @@ +--- +bugfixes: +- suppress "default will change" warnings for ``TRANSFORM_INVALID_GROUP_CHARS`` + setting when non-default option value is chosen diff --git a/lib/ansible/inventory/group.py b/lib/ansible/inventory/group.py index 810d57a2714..6d5e19ef592 100644 --- a/lib/ansible/inventory/group.py +++ b/lib/ansible/inventory/group.py @@ -48,8 +48,10 @@ def to_safe_group_name(name, replacer="_", force=False, silent=False): warn = 'Invalid characters were found in group names but not replaced, use -vvvv to see details' # remove this message after 2.10 AND changing the default to 'always' - display.deprecated('The TRANSFORM_INVALID_GROUP_CHARS settings is set to allow bad characters in group names by default,' - ' this will change, but still be user configurable on deprecation', version='2.10') + group_chars_setting, group_chars_origin = C.config.get_config_value_and_origin('TRANSFORM_INVALID_GROUP_CHARS') + if group_chars_origin == 'default': + display.deprecated('The TRANSFORM_INVALID_GROUP_CHARS settings is set to allow bad characters in group names by default,' + ' this will change, but still be user configurable on deprecation', version='2.10') if warn: display.warning(warn)