From 3c69e33cf8a775761fcb12c481c240918d069073 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 29 Jun 2018 08:39:34 -0600 Subject: [PATCH] Update config docs We moved custom_env_files to last in I1902f91a56822c4219c38aafe5f2baf6b61a0a05 so this updates the documentation around these configuration options. Change-Id: Ibf9f56c7c5a9d63b80d96f77fa74c43782f3c16a --- tripleoclient/config/standalone.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tripleoclient/config/standalone.py b/tripleoclient/config/standalone.py index 3791e2d85..fa2c1649a 100644 --- a/tripleoclient/config/standalone.py +++ b/tripleoclient/config/standalone.py @@ -137,8 +137,8 @@ class StandaloneConfig(BaseConfig): 'json format.' 'Its content overrides anything in t-h-t ' 'UndercloudNetConfigOverride. The processed ' - 'template is then passed in Heat via the top ' - 'scope undercloud_parameters.yaml file created in ' + 'template is then passed in Heat via the ' + 'undercloud_parameters.yaml file created in ' 'output_dir and used to configure the networking ' 'via run-os-net-config. If you wish to disable ' 'you can set this location to an empty file.' @@ -172,7 +172,10 @@ class StandaloneConfig(BaseConfig): cfg.ListOpt('custom_env_files', default=[], help=_('List of any custom environment yaml files to ' - 'use')), + 'use. These are applied after any other ' + 'configuration and can be used to override ' + 'any derived values. This should be used ' + 'only by advanced users.')), # docker config bits cfg.StrOpt('docker_registry_mirror', default='',