Przeglądaj źródła

HUE-5846 [metadata] Another update properties from service to server

Romain Rigaux 8 lat temu
rodzic
commit
9b611f6505

+ 9 - 9
desktop/conf.dist/hue.ini

@@ -1634,25 +1634,25 @@
     ## navmetaserver_auth_type=CMDB
 
     # Username of the CM user used for authentication.
-    ## navmetadataservice_cmdb_user=hue
+    ## navmetadataserver_cmdb_user=hue
     # CM password of the user used for authentication.
-    ## navmetadataservice_cmdb_password=
+    ## navmetadataserver_cmdb_password=
     # Execute this script to produce the CM password. This will be used when the plain password is not set.
-    # navmetadataservice_cmdb_password_script=
+    # navmetadataserver_cmdb_password_script=
 
     # Username of the LDAP user used for authentication.
-    ## navmetadataservice_ldap_user=hue
+    ## navmetadataserver_ldap_user=hue
     # LDAP password of the user used for authentication.
-    ## navmetadataservice_ldap_ppassword=
+    ## navmetadataserver_ldap_ppassword=
     # Execute this script to produce the LDAP password. This will be used when the plain password is not set.
-    ## navmetadataservice_ldap_password_script=
+    ## navmetadataserver_ldap_password_script=
 
     # Username of the SAML user used for authentication.
-    ## navmetadataservice_saml_user=hue
+    ## navmetadataserver_saml_user=hue
     ## SAML password of the user used for authentication.
-    # navmetadataservice_saml_password=
+    # navmetadataserver_saml_password=
     # Execute this script to produce the SAML password. This will be used when the plain password  is not set.
-    ## navmetadataservice_saml_password_script=
+    ## navmetadataserver_saml_password_script=
 
     # Perform Sentry privilege filtering.
     # Default to true automatically if the cluster is secure.

+ 9 - 9
desktop/conf/pseudo-distributed.ini.tmpl

@@ -1638,25 +1638,25 @@
     ## navmetaserver_auth_type=CMDB
 
     # Username of the CM user used for authentication.
-    ## navmetadataservice_cmdb_user=hue
+    ## navmetadataserver_cmdb_user=hue
     # CM password of the user used for authentication.
-    ## navmetadataservice_cmdb_password=
+    ## navmetadataserver_cmdb_password=
     # Execute this script to produce the CM password. This will be used when the plain password is not set.
-    # navmetadataservice_cmdb_password_script=
+    # navmetadataserver_cmdb_password_script=
 
     # Username of the LDAP user used for authentication.
-    ## navmetadataservice_ldap_user=hue
+    ## navmetadataserver_ldap_user=hue
     # LDAP password of the user used for authentication.
-    ## navmetadataservice_ldap_ppassword=
+    ## navmetadataserver_ldap_ppassword=
     # Execute this script to produce the LDAP password. This will be used when the plain password is not set.
-    ## navmetadataservice_ldap_password_script=
+    ## navmetadataserver_ldap_password_script=
 
     # Username of the SAML user used for authentication.
-    ## navmetadataservice_saml_user=hue
+    ## navmetadataserver_saml_user=hue
     ## SAML password of the user used for authentication.
-    # navmetadataservice_saml_password=
+    # navmetadataserver_saml_password=
     # Execute this script to produce the SAML password. This will be used when the plain password  is not set.
-    ## navmetadataservice_saml_password_script=
+    ## navmetadataserver_saml_password_script=
 
     # Perform Sentry privilege filtering.
     # Default to true automatically if the cluster is secure.

+ 10 - 10
desktop/libs/metadata/src/metadata/conf.py

@@ -185,53 +185,53 @@ NAVIGATOR = ConfigSection(
       help=_t('Base URL to Navigator API.'),
       dynamic_default=default_navigator_url),
     AUTH_TYPE=Config(
-      key="navmetadataservice_auth_type",
+      key="navmetadataserver_auth_type",
       help=_t("Which authentication to use: CM or external via LDAP or SAML."),
       default='CMDB'),
 
     AUTH_CM_USERNAME=Config(
-      key="navmetadataservice_cmdb_user",
+      key="navmetadataserver_cmdb_user",
       help=_t("Username of the CM user used for authentication."),
       dynamic_default=get_auth_username),
     AUTH_CM_PASSWORD=Config(
-      key="navmetadataservice_cmdb_password",
+      key="navmetadataserver_cmdb_password",
       help=_t("CM password of the user used for authentication."),
       private=True,
       dynamic_default=get_navigator_cm_password),
     AUTH_CM_PASSWORD_SCRIPT=Config(
-      key="navmetadataservice_cmdb_password_script",
+      key="navmetadataserver_cmdb_password_script",
       help=_t("Execute this script to produce the CM password. This will be used when the plain password is not set."),
       private=True,
       type=coerce_password_from_script,
       default=None),
 
     AUTH_LDAP_USERNAME=Config(
-      key="navmetadataservice_ldap_user",
+      key="navmetadataserver_ldap_user",
       help=_t("Username of the LDAP user used for authentication."),
       dynamic_default=get_auth_username),
     AUTH_LDAP_PASSWORD=Config(
-      key="navmetadataservice_ldap_password",
+      key="navmetadataserver_ldap_password",
       help=_t("LDAP password of the user used for authentication."),
       private=True,
       dynamic_default=get_navigator_ldap_password),
     AUTH_LDAP_PASSWORD_SCRIPT=Config(
-      key="navmetadataservice_ldap_password_script",
+      key="navmetadataserver_ldap_password_script",
       help=_t("Execute this script to produce the LDAP password. This will be used when the plain password is not set."),
       private=True,
       type=coerce_password_from_script,
       default=None),
 
     AUTH_SAML_USERNAME=Config(
-      key="navmetadataservice_saml_user",
+      key="navmetadataserver_saml_user",
       help=_t("Username of the SAML user used for authentication."),
       dynamic_default=get_auth_username),
     AUTH_SAML_PASSWORD=Config(
-      key="navmetadataservice_saml_password",
+      key="navmetadataserver_saml_password",
       help=_t("SAML password of the user used for authentication."),
       private=True,
       dynamic_default=get_navigator_saml_password),
     AUTH_SAML_PASSWORD_SCRIPT=Config(
-      key="navmetadataservice_saml_password_script",
+      key="navmetadataserver_saml_password_script",
       help=_t("Execute this script to produce the SAML password. This will be used when the plain password  is not set."),
       private=True,
       type=coerce_password_from_script,