openstack
/
fuel-qa
Code Issues Proposed changes

Add MASTER_NODE_EXTRA_PACKAGES env variable 

This change allow to install any
additional packages from any additional
repository during install master-node.

Related-Bug: #1526544

Change-Id: I4b10ff432b385824595c0ac65b5282a2b81c859c
(cherry picked from commit 72830315e5)
This commit is contained in:
Ivan Suzdal 2016-06-06 18:43:52 +03:00 committed by Dmitry Teselkin
parent 38ec74630e
commit 4a2fdcde81
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuelweb_test/models/environment.py
View File

@ -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

2
fuelweb_test/settings.py
View File

@ -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", "")