aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonbou...@apache.org
Subject git commit: Remove appapp references from schema
Date Tue, 18 Feb 2014 22:52:47 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master 88bc46d03 -> cb17ae551


Remove appapp references from schema

Reviewed at https://reviews.apache.org/r/18163/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/cb17ae55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/cb17ae55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/cb17ae55

Branch: refs/heads/master
Commit: cb17ae551a433078cb61d3a12641b7ff099f3a65
Parents: 88bc46d
Author: Jonathan Boulle <jon@twopensource.com>
Authored: Tue Feb 18 14:52:33 2014 -0800
Committer: Jonathan Boulle <jon@twitter.com>
Committed: Tue Feb 18 14:52:33 2014 -0800

----------------------------------------------------------------------
 src/main/python/apache/aurora/client/config.py      | 14 +-------------
 src/main/python/apache/aurora/config/schema/base.py | 12 ------------
 2 files changed, 1 insertion(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cb17ae55/src/main/python/apache/aurora/client/config.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/config.py b/src/main/python/apache/aurora/client/config.py
index 32ac6cc..1fe5db4 100644
--- a/src/main/python/apache/aurora/client/config.py
+++ b/src/main/python/apache/aurora/client/config.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-'''Library of utilities called by the mesos client binary
+'''Library of utilities called by the aurora client binary
 '''
 
 from __future__ import print_function
@@ -36,17 +36,6 @@ from pystachio import Empty, Ref
 from twitter.common import app, log
 
 
-APPAPP_DEPRECATION_WARNING = """
-The use of app-app is deprecated. Please reach out to mesos-team@twitter.com for advice on
-migrating your application away from app-app layouts to an alternative packaging solution.
-"""
-
-
-def _warn_on_appapp_layouts(config):
-  if config.raw().has_layout():
-    deprecation_warning(APPAPP_DEPRECATION_WARNING)
-
-
 CRON_DEPRECATION_WARNING = """
 The "cron_policy" parameter to Jobs has been renamed to "cron_collision_policy".
 Please update your Jobs accordingly.
@@ -189,7 +178,6 @@ def populate_namespaces(config, env=None):
   _warn_on_deprecated_cron_policy(config)
   _warn_on_deprecated_daemon_job(config)
   _warn_on_deprecated_health_check_interval_secs(config)
-  _warn_on_appapp_layouts(config)
   return config
 
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cb17ae55/src/main/python/apache/aurora/config/schema/base.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/schema/base.py b/src/main/python/apache/aurora/config/schema/base.py
index 0d52b39..4a086b3 100644
--- a/src/main/python/apache/aurora/config/schema/base.py
+++ b/src/main/python/apache/aurora/config/schema/base.py
@@ -25,15 +25,6 @@ class MesosContext(Struct):
   instance    = Required(Integer)
 
 
-# AppApp layout setup
-class AppPackage(Struct):
-  name    = Required(String)
-  version = Default(String, 'latest')
-
-class AppLayout(Struct):
-  packages = Default(List(AppPackage), [])
-
-
 # The object bound into the {{packer}} namespace.
 # Referenced by
 #  {{packer[role][name][version]}}
@@ -91,7 +82,6 @@ class Announcer(Struct):
 # The executorConfig populated inside of TaskConfig.
 class MesosTaskInstance(Struct):
   task                       = Required(Task)
-  layout                     = AppLayout
   instance                   = Required(Integer)
   role                       = Required(String)
   announce                   = Announcer
@@ -130,8 +120,6 @@ class MesosJob(Struct):
   health_check_config        = HealthCheckConfig
   task_links                 = Map(String, String)
 
-  layout        = AppLayout      # DEPRECATED in favor of directory sandboxes
-
   enable_hooks = Default(Boolean, False)  # enable client API hooks; from env python-list
'hooks'
 
 


Mime
View raw message