marathon_deploy 0.1.4 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 884ea617a0e4c63705678c9d0766ca51982ea41c
4
- data.tar.gz: afe7332da66115b54462198675541cb475ca277e
3
+ metadata.gz: b8e3ee556e194509d638fac844a510c602a923e3
4
+ data.tar.gz: b99de7f4d18f002038f98d2614235a11457544b6
5
5
  SHA512:
6
- metadata.gz: 2c1851bc346ce106c2b93ebe93fe30d51bd6fc6c9a2b648fa46de315ba76c2b93191c8832ceeb368908ff8d59984a9f7606540f2bf45fde43b0b3d6228812217
7
- data.tar.gz: c55c630d6d040c606f7c11a818b51320fccffbdfcf74ba8c5e8b96fefa86953b10344562690a9b90484209c88cfaac8d904302859d1fe894427330f0f543e104
6
+ metadata.gz: 83d4e11680e45508ee05f621a32faf35dca37fcbcce3f0ec8ef25b5b9daef342a938cfaeab98fab18934e90f08b0c8c3aaceb666eafbaabe4177724fdaac0625
7
+ data.tar.gz: 7941378b977abf85df89b6e1d3cc5f8ec5abd1a0b332a931361ec49cb308a71ecc6dcc6035f2f5797942779f5853db055bfc5ff9b02080fae596781067e09af9
data/bin/marathon_deploy CHANGED
@@ -82,15 +82,15 @@ noop = options[:noop]
82
82
  environment = MarathonDeploy::Environment.new(options[:environment])
83
83
 
84
84
  marathon_endpoints = Array.new
85
- if (options[:marathon_endpoints].nil?)
86
- if (environment.is_production?)
87
- marathon_endpoints = MarathonDeploy::MarathonDefaults::DEFAULT_PRODUCTION_MARATHON_ENDPOINTS
85
+ if (options[:marathon_endpoints].nil?)
86
+ if (environment.is_production?)
87
+ marathon_endpoints = MarathonDeploy::MarathonDefaults::DEFAULT_PRODUCTION_MARATHON_ENDPOINTS
88
+ else
89
+ marathon_endpoints = MarathonDeploy::MarathonDefaults::DEFAULT_PREPRODUCTION_MARATHON_ENDPOINTS
90
+ end
88
91
  else
89
- marathon_endpoints = MarathonDeploy::MarathonDefaults::DEFAULT_PREPRODUCTION_MARATHON_ENDPOINTS
92
+ marathon_endpoints = options[:marathon_endpoints]
90
93
  end
91
- else
92
- marathon_endpoints = options[:marathon_endpoints]
93
- end
94
94
 
95
95
  begin
96
96
  application = MarathonDeploy::Application.new(:deployfile => deployfile, :force => options[:force])
@@ -23,14 +23,12 @@ module MarathonDeploy
23
23
 
24
24
  @@preproduction_override = {
25
25
  :instances => 5,
26
- :mem => 512,
27
- :cpus => 0.1
26
+ :mem => 4096,
27
+ :cpus => 0.5
28
28
  }
29
29
 
30
30
  @@preproduction_env = {
31
- :DATACENTER_NUMBER => "44",
32
- :JAVA_XMS => "64m",
33
- :JAVA_XMX => "128m"
31
+ :DATACENTER_NUMBER => "44"
34
32
  }
35
33
 
36
34
  @@required_marathon_env_variables = %w[]
@@ -1,3 +1,3 @@
1
1
  module MarathonDeploy
2
- VERSION = "0.1.4"
2
+ VERSION = "0.1.5"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: marathon_deploy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Colby
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-08-02 00:00:00.000000000 Z
11
+ date: 2015-08-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: logger
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
148
148
  version: '0'
149
149
  requirements: []
150
150
  rubyforge_project:
151
- rubygems_version: 2.4.5
151
+ rubygems_version: 2.4.6
152
152
  signing_key:
153
153
  specification_version: 4
154
154
  summary: Mesos/Marathon deployment tool.