Parcourir la source

[jobsub] Remove deprecated oozielib config

Romain Rigaux il y a 12 ans
Parent
commit
238d0a2bce

+ 1 - 26
apps/jobsub/src/jobsub/conf.py

@@ -14,22 +14,14 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Configuration for the job submission application"""
 
 import os.path
 
-from desktop.lib.conf import Config, coerce_bool
+from desktop.lib.conf import Config
 from desktop.lib import paths
 from django.utils.translation import ugettext_lazy as _
 
 
-# Deprecated! To remove in Hue 3.
-# All of the config is now in Oozie app.
-REMOTE_DATA_DIR = Config(
-  key="remote_data_dir",
-  default="/user/hue/jobsub",
-  help=_("Location on HDFS where the jobsub examples and templates are stored."))
-
 LOCAL_DATA_DIR = Config(
   key="local_data_dir",
   default=os.path.join(os.path.dirname(__file__), "..", "..", "data"),
@@ -41,20 +33,3 @@ SAMPLE_DATA_DIR = Config(
   default=paths.get_thirdparty_root("sample_data"),
   help=_("Location on local filesystem where sample data is stored."),
   private=True)
-
-
-# Deprecated! To remove in Hue 3
-# These configs were moved to desktop liboozie.
-# If liboozie is not configured these settings will be used.
-# They also have priority if liboozie defines them.
-OOZIE_URL = Config(
-  key='oozie_url',
-  help=_('Deprecated, use liboozie.conf.OOZIE_URL instead. '
-         'URL of Oozie server. This is required for job submission.'),
-  type=str)
-
-SECURITY_ENABLED = Config(
-  key="security_enabled",
-  help=_("Deprecated, use liboozie.conf.SECURITY_ENABLED instead. "
-         "Whether Oozie requires client to do perform Kerberos authentication"),
-  type=coerce_bool)

+ 0 - 2
desktop/conf.dist/hue.ini

@@ -491,8 +491,6 @@
 ###########################################################################
 
 [jobsub]
-  # Location on HDFS where the jobsub examples and templates are stored.
-  ## remote_data_dir=/user/hue/jobsub
 
   # Location on local FS where examples and template are stored.
   ## local_data_dir=..../data

+ 0 - 2
desktop/conf/pseudo-distributed.ini.tmpl

@@ -495,8 +495,6 @@
 ###########################################################################
 
 [jobsub]
-  # Location on HDFS where the jobsub examples and templates are stored.
-  ## remote_data_dir=/user/hue/jobsub
 
   # Location on local FS where examples and template are stored.
   ## local_data_dir=..../data

+ 2 - 13
desktop/libs/liboozie/src/liboozie/oozie_api.py

@@ -23,23 +23,12 @@ from desktop.conf import TIME_ZONE
 from desktop.lib.rest.http_client import HttpClient
 from desktop.lib.rest.resource import Resource
 
+from liboozie.conf import SECURITY_ENABLED
+from liboozie.conf import OOZIE_URL
 from liboozie.types import WorkflowList, CoordinatorList, Coordinator, Workflow,\
   CoordinatorAction, WorkflowAction, BundleList, Bundle, BundleAction
 from liboozie.utils import config_gen
 
-# Manage deprecation after HUE-792.
-# To Remove in Hue 3.
-import jobsub.conf as jobsub_conf
-
-if jobsub_conf.SECURITY_ENABLED.get() is not None:
-  from jobsub.conf import SECURITY_ENABLED
-else:
-  from liboozie.conf import SECURITY_ENABLED
-
-if jobsub_conf.OOZIE_URL.get() is not None:
-  from jobsub.conf import OOZIE_URL
-else:
-  from liboozie.conf import OOZIE_URL
 
 LOG = logging.getLogger(__name__)
 DEFAULT_USER = 'hue'