From b8d57c0b6c4a2935cfcf00dd7b888932aeb5436e Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Thu, 14 Jan 2021 18:36:09 +0100 Subject: [PATCH] Dedup host entries in the exported data for stacks Do not add extra host entries for VIPs for stacks deployed off the exported data, since it already contains those entries This is done by setting AddVipsToEtcHosts to False. Then a stack is deployed, no more VIPs will be added into /etc/hosts of the targeted hosts. Change-Id: Iba03aed76fab1977e2b51ef69e8e08a493152ed6 Closes-bug: #1911792 Signed-off-by: Bogdan Dobrelya (cherry picked from commit e3c118756fa056602afe47136aaae77e3170b8bc) --- tripleoclient/tests/v1/test_overcloud_export.py | 3 ++- tripleoclient/v1/overcloud_export.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tripleoclient/tests/v1/test_overcloud_export.py b/tripleoclient/tests/v1/test_overcloud_export.py index 37c323ac5..7c5f03fac 100644 --- a/tripleoclient/tests/v1/test_overcloud_export.py +++ b/tripleoclient/tests/v1/test_overcloud_export.py @@ -59,7 +59,8 @@ class TestOvercloudExport(utils.TestCommand): False, path) self.assertEqual( - {'parameter_defaults': {'key': 'value', + {'parameter_defaults': {'AddVipsToEtcHosts': False, + 'key': 'value', 'key0': 'value0'}}, mock_safe_dump.call_args[0][0]) diff --git a/tripleoclient/v1/overcloud_export.py b/tripleoclient/v1/overcloud_export.py index c3a6d5c86..0ffdac514 100644 --- a/tripleoclient/v1/overcloud_export.py +++ b/tripleoclient/v1/overcloud_export.py @@ -89,6 +89,9 @@ class ExportOvercloud(command.Command): not parsed_args.no_password_excludes) data.update(export.export_stack( clients.orchestration, stack, False, config_download_dir)) + # do not add extra host entries for VIPs for stacks deployed off that + # exported data, since it already contains those entries + data.update({'AddVipsToEtcHosts': False}) data = dict(parameter_defaults=data) # write the exported data