Merge "Add MASTER_NODE_EXTRA_PACKAGES env variable" into stable/mitaka
This commit is contained in:
commit
426617c6b5
@ -165,7 +165,8 @@ class EnvironmentModel(object):
|
||||
'nameserver': settings.DNS,
|
||||
'showmenu': 'yes' if settings.SHOW_FUELMENU else 'no',
|
||||
'wait_for_external_config': 'yes',
|
||||
'build_images': '1' if build_images else '0'
|
||||
'build_images': '1' if build_images else '0',
|
||||
'MASTER_NODE_EXTRA_PACKAGES': settings.MASTER_NODE_EXTRA_PACKAGES
|
||||
}
|
||||
# TODO(akostrikov) add tests for menu items/kernel parameters
|
||||
# TODO(akostrikov) refactor it.
|
||||
@ -193,6 +194,7 @@ class EnvironmentModel(object):
|
||||
" showmenu=%(showmenu)s\n"
|
||||
" wait_for_external_config=%(wait_for_external_config)s"
|
||||
" build_images=%(build_images)s\n"
|
||||
" MASTER_NODE_EXTRA_PACKAGES='%(MASTER_NODE_EXTRA_PACKAGES)s'\n"
|
||||
" <Enter>\n"
|
||||
) % params
|
||||
return keys
|
||||
|
@ -699,3 +699,5 @@ DOWNLOAD_FACTS = get_var_as_bool("DOWNLOAD_FACTS", False)
|
||||
TASK_BASED_ENGINE = get_var_as_bool("TASK_BASED_ENGINE", True)
|
||||
|
||||
FUEL_RELEASE_PATH = os.environ.get("FUEL_RELEASE_PATH")
|
||||
|
||||
MASTER_NODE_EXTRA_PACKAGES = os.environ.get("MASTER_NODE_EXTRA_PACKAGES", "")
|
||||
|
Loading…
Reference in New Issue
Block a user