|
@@ -20,6 +20,10 @@ from django.utils.translation import ugettext_lazy as _t
|
|
|
from desktop.conf import AUTH_USERNAME as DEFAULT_AUTH_USERNAME, AUTH_PASSWORD as DEFAULT_AUTH_PASSWORD, \
|
|
from desktop.conf import AUTH_USERNAME as DEFAULT_AUTH_USERNAME, AUTH_PASSWORD as DEFAULT_AUTH_PASSWORD, \
|
|
|
AUTH_PASSWORD_SCRIPT, default_ssl_validate
|
|
AUTH_PASSWORD_SCRIPT, default_ssl_validate
|
|
|
from desktop.lib.conf import Config, ConfigSection, coerce_bool, coerce_password_from_script
|
|
from desktop.lib.conf import Config, ConfigSection, coerce_bool, coerce_password_from_script
|
|
|
|
|
+from desktop.lib.paths import get_config_root
|
|
|
|
|
+from hadoop.cluster import get_default_yarncluster
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_auth_username():
|
|
def get_auth_username():
|
|
@@ -34,6 +38,16 @@ def get_auth_password():
|
|
|
return password
|
|
return password
|
|
|
return DEFAULT_AUTH_PASSWORD.get()
|
|
return DEFAULT_AUTH_PASSWORD.get()
|
|
|
|
|
|
|
|
|
|
+def default_navigator_config_dir():
|
|
|
|
|
+ """Get from usual main Hue config directory"""
|
|
|
|
|
+ return get_config_root()
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+def default_navigator_url():
|
|
|
|
|
+ """Get from usual main Hue config directory"""
|
|
|
|
|
+ from metadata.metadata_sites import get_navigator_server_url
|
|
|
|
|
+ return get_navigator_server_url() + '/api'
|
|
|
|
|
+
|
|
|
|
|
|
|
|
def get_optimizer_url():
|
|
def get_optimizer_url():
|
|
|
return OPTIMIZER.API_URL.get() and OPTIMIZER.API_URL.get().strip('/')
|
|
return OPTIMIZER.API_URL.get() and OPTIMIZER.API_URL.get().strip('/')
|
|
@@ -125,12 +139,11 @@ NAVIGATOR = ConfigSection(
|
|
|
members=dict(
|
|
members=dict(
|
|
|
API_URL=Config(
|
|
API_URL=Config(
|
|
|
key='api_url',
|
|
key='api_url',
|
|
|
- help=_t('Base URL to Navigator API (e.g. - http://localhost:7187/api)'),
|
|
|
|
|
- default=None),
|
|
|
|
|
|
|
+ help=_t('Base URL to Navigator API.'),
|
|
|
|
|
+ dynamic_default=default_navigator_url),
|
|
|
AUTH_USERNAME=Config(
|
|
AUTH_USERNAME=Config(
|
|
|
key="auth_username",
|
|
key="auth_username",
|
|
|
help=_t("Auth username of the hue user used for authentications."),
|
|
help=_t("Auth username of the hue user used for authentications."),
|
|
|
- private=True,
|
|
|
|
|
dynamic_default=get_auth_username),
|
|
dynamic_default=get_auth_username),
|
|
|
AUTH_PASSWORD=Config(
|
|
AUTH_PASSWORD=Config(
|
|
|
key="auth_password",
|
|
key="auth_password",
|
|
@@ -143,5 +156,10 @@ NAVIGATOR = ConfigSection(
|
|
|
private=True,
|
|
private=True,
|
|
|
type=coerce_password_from_script,
|
|
type=coerce_password_from_script,
|
|
|
default=None),
|
|
default=None),
|
|
|
|
|
+ CONF_DIR = Config(
|
|
|
|
|
+ key='conf_dir',
|
|
|
|
|
+ help=_t('Navigator configuration directory, where navigator.client.properties is located.'),
|
|
|
|
|
+ dynamic_default=default_navigator_config_dir
|
|
|
|
|
+ )
|
|
|
)
|
|
)
|
|
|
)
|
|
)
|