marathon_deploy 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 884ea617a0e4c63705678c9d0766ca51982ea41c
-  data.tar.gz: afe7332da66115b54462198675541cb475ca277e
+  metadata.gz: b8e3ee556e194509d638fac844a510c602a923e3
+  data.tar.gz: b99de7f4d18f002038f98d2614235a11457544b6
 SHA512:
-  metadata.gz: 2c1851bc346ce106c2b93ebe93fe30d51bd6fc6c9a2b648fa46de315ba76c2b93191c8832ceeb368908ff8d59984a9f7606540f2bf45fde43b0b3d6228812217
-  data.tar.gz: c55c630d6d040c606f7c11a818b51320fccffbdfcf74ba8c5e8b96fefa86953b10344562690a9b90484209c88cfaac8d904302859d1fe894427330f0f543e104
+  metadata.gz: 83d4e11680e45508ee05f621a32faf35dca37fcbcce3f0ec8ef25b5b9daef342a938cfaeab98fab18934e90f08b0c8c3aaceb666eafbaabe4177724fdaac0625
+  data.tar.gz: 7941378b977abf85df89b6e1d3cc5f8ec5abd1a0b332a931361ec49cb308a71ecc6dcc6035f2f5797942779f5853db055bfc5ff9b02080fae596781067e09af9

data/bin/marathon_deploy

@@ -82,15 +82,15 @@ noop = options[:noop]
 environment = MarathonDeploy::Environment.new(options[:environment])
     
 marathon_endpoints = Array.new
-if (options[:marathon_endpoints].nil?)
-  if (environment.is_production?)
-    marathon_endpoints = MarathonDeploy::MarathonDefaults::DEFAULT_PRODUCTION_MARATHON_ENDPOINTS
+  if (options[:marathon_endpoints].nil?)
+    if (environment.is_production?)
+      marathon_endpoints = MarathonDeploy::MarathonDefaults::DEFAULT_PRODUCTION_MARATHON_ENDPOINTS
+    else
+      marathon_endpoints = MarathonDeploy::MarathonDefaults::DEFAULT_PREPRODUCTION_MARATHON_ENDPOINTS
+    end
   else
-    marathon_endpoints = MarathonDeploy::MarathonDefaults::DEFAULT_PREPRODUCTION_MARATHON_ENDPOINTS
+    marathon_endpoints = options[:marathon_endpoints]
   end
-else
-  marathon_endpoints = options[:marathon_endpoints]
-end
  
 begin
   application = MarathonDeploy::Application.new(:deployfile => deployfile, :force => options[:force])

data/lib/marathon_deploy/marathon_defaults.rb

@@ -23,14 +23,12 @@ module MarathonDeploy
 
   @@preproduction_override = {
     :instances => 5,
-    :mem => 512,
-    :cpus => 0.1      
+    :mem => 4096,
+    :cpus => 0.5      
   } 
   
   @@preproduction_env = {
-    :DATACENTER_NUMBER => "44",
-    :JAVA_XMS => "64m",
-    :JAVA_XMX => "128m"
+    :DATACENTER_NUMBER => "44"
   }  
   
   @@required_marathon_env_variables = %w[]

data/lib/marathon_deploy/version.rb

@@ -1,3 +1,3 @@
 module MarathonDeploy
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Mesos/Marathon deployment tool.