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