openstack/deb-sahara
Code Issues Proposed changes

[CDH] Load missed configs from yarn-gateway.json

Browse Source 
All configs from yarn-gateway.json are missed. We should load them,
to allow configuring that configs.

Change-Id: Ia9ab393cfe4a199bbe52aa123d8cfbe27e3c7d41
Closes-bug: 1460645
This commit is contained in:
Vitaly Gridnev 2015-06-01 15:51:02 +03:00
parent aed6493f60
commit 69d00f117a
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sahara/plugins/cdh/v5/config_helper.py
View File

@ -126,6 +126,7 @@ secnamenode_confs = _load_json(path_to_config + 'hdfs-secondarynamenode.json')
yarn_confs = _load_json(path_to_config + 'yarn-service.json') yarn_confs = _load_json(path_to_config + 'yarn-service.json')
resourcemanager_confs = _load_json( resourcemanager_confs = _load_json(
path_to_config + 'yarn-resourcemanager.json') path_to_config + 'yarn-resourcemanager.json')
mapred_confs = _load_json(path_to_config + 'yarn-gateway.json')
nodemanager_confs = _load_json(path_to_config + 'yarn-nodemanager.json') nodemanager_confs = _load_json(path_to_config + 'yarn-nodemanager.json')
jobhistory_confs = _load_json(path_to_config + 'yarn-jobhistory.json') jobhistory_confs = _load_json(path_to_config + 'yarn-jobhistory.json')
oozie_service_confs = _load_json(path_to_config + 'oozie-service.json') oozie_service_confs = _load_json(path_to_config + 'oozie-service.json')
@ -173,6 +174,7 @@ def _get_ng_plugin_configs():
cfg += _init_configs(datanode_confs, 'DATANODE', 'node') cfg += _init_configs(datanode_confs, 'DATANODE', 'node')
cfg += _init_configs(secnamenode_confs, 'SECONDARYNAMENODE', 'node') cfg += _init_configs(secnamenode_confs, 'SECONDARYNAMENODE', 'node')
cfg += _init_configs(yarn_confs, 'YARN', 'cluster') cfg += _init_configs(yarn_confs, 'YARN', 'cluster')
cfg += _init_configs(mapred_confs, 'MAPREDUCE', 'node')
cfg += _init_configs(resourcemanager_confs, 'RESOURCEMANAGER', 'node') cfg += _init_configs(resourcemanager_confs, 'RESOURCEMANAGER', 'node')
cfg += _init_configs(nodemanager_confs, 'NODEMANAGER', 'node') cfg += _init_configs(nodemanager_confs, 'NODEMANAGER', 'node')
cfg += _init_configs(jobhistory_confs, 'JOBHISTORY', 'node') cfg += _init_configs(jobhistory_confs, 'JOBHISTORY', 'node')

2
sahara/plugins/cdh/v5_3_0/config_helper.py
View File

@ -183,6 +183,7 @@ secnamenode_confs = _load_json(path_to_config + 'hdfs-secondarynamenode.json')
yarn_confs = _load_json(path_to_config + 'yarn-service.json') yarn_confs = _load_json(path_to_config + 'yarn-service.json')
resourcemanager_confs = _load_json( resourcemanager_confs = _load_json(
path_to_config + 'yarn-resourcemanager.json') path_to_config + 'yarn-resourcemanager.json')
mapred_confs = _load_json(path_to_config + 'yarn-gateway.json')
nodemanager_confs = _load_json(path_to_config + 'yarn-nodemanager.json') nodemanager_confs = _load_json(path_to_config + 'yarn-nodemanager.json')
jobhistory_confs = _load_json(path_to_config + 'yarn-jobhistory.json') jobhistory_confs = _load_json(path_to_config + 'yarn-jobhistory.json')
oozie_service_confs = _load_json(path_to_config + 'oozie-service.json') oozie_service_confs = _load_json(path_to_config + 'oozie-service.json')
@ -255,6 +256,7 @@ def _get_ng_plugin_configs():
cfg += _init_configs(secnamenode_confs, 'SECONDARYNAMENODE', 'node') cfg += _init_configs(secnamenode_confs, 'SECONDARYNAMENODE', 'node')
cfg += _init_configs(yarn_confs, 'YARN', 'cluster') cfg += _init_configs(yarn_confs, 'YARN', 'cluster')
cfg += _init_configs(resourcemanager_confs, 'RESOURCEMANAGER', 'node') cfg += _init_configs(resourcemanager_confs, 'RESOURCEMANAGER', 'node')
cfg += _init_configs(mapred_confs, 'MAPREDUCE', 'node')
cfg += _init_configs(nodemanager_confs, 'NODEMANAGER', 'node') cfg += _init_configs(nodemanager_confs, 'NODEMANAGER', 'node')
cfg += _init_configs(jobhistory_confs, 'JOBHISTORY', 'node') cfg += _init_configs(jobhistory_confs, 'JOBHISTORY', 'node')
cfg += _init_configs(oozie_service_confs, 'OOZIE', 'cluster') cfg += _init_configs(oozie_service_confs, 'OOZIE', 'cluster')