marathon_deploy 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8e3ee556e194509d638fac844a510c602a923e3
-  data.tar.gz: b99de7f4d18f002038f98d2614235a11457544b6
+  metadata.gz: 5d671c15ac81368b5455e674664ff50a51513226
+  data.tar.gz: 0357ea94158650276083212c1bfeec11767a35c7
 SHA512:
-  metadata.gz: 83d4e11680e45508ee05f621a32faf35dca37fcbcce3f0ec8ef25b5b9daef342a938cfaeab98fab18934e90f08b0c8c3aaceb666eafbaabe4177724fdaac0625
-  data.tar.gz: 7941378b977abf85df89b6e1d3cc5f8ec5abd1a0b332a931361ec49cb308a71ecc6dcc6035f2f5797942779f5853db055bfc5ff9b02080fae596781067e09af9
+  metadata.gz: b15f9e3b4e55178e5d9c99a04fe04e96ea91f90f5c47bb4c3a63c9c7e159422b634db2d76fc5db6850de33607640908a8a99141d68e1d16e287e35256c62c88b
+  data.tar.gz: 4dc65daef367d3bb56a6de1ef5224d85cccf21fe6174497b81e723e9c52fc5b2f7479d89742b68178b69dd56933203d4c51bb2a71975097c73903f0bdc4a726b

data/TODO

@@ -1,4 +1,4 @@
 - SLACK notification
 - https://mesosphere.com/blog/2015/04/02/continuous-deployment-with-mesos-marathon-docker/
 - log to database
-- command line option for deployment-strategy: minimumHealthCapacity / maximumOverCapacity 
+- command line option for deployment-strategy: minimumHealthCapacity / maximumOverCapacity

data/bin/expand_macros

@@ -6,12 +6,10 @@ require 'marathon_deploy/version'
 require 'optparse'
 require 'logger'
 
-DEFAULT_TEMPLATE_FILENAME = 'dockerfile.tpl'
-
 options = {}
   
 # DEFAULTS
-options[:template] = DEFAULT_TEMPLATE_FILENAME
+options[:template] = 'dockerfile.tpl'
 options[:debug] = Logger::FATAL #Logger::INFO
 options[:outfile] = false
 options[:logfile] = false

data/bin/marathon_deploy

@@ -21,6 +21,7 @@ options[:logfile] = MarathonDeploy::MarathonDefaults::DEFAULT_LOGFILE
 options[:force] = MarathonDeploy::MarathonDefaults::DEFAULT_FORCE_DEPLOY
 options[:noop] = MarathonDeploy::MarathonDefaults::DEFAULT_NOOP
   
+  
 OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} [options]"
   opts.release =  MarathonDeploy::VERSION
@@ -57,6 +58,16 @@ OptionParser.new do |opts|
   
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
+    puts "   ----------------- Additional Info -----------------", <<-DESCRIPTION
+    * Marathon Env  variables:
+      - Env variables with the prefix "#{MarathonDeploy::MarathonDefaults::ENVIRONMENT_VARIABLE_PREFIX}" will be injected into the deployment plan.  
+      - The prefix "#{MarathonDeploy::MarathonDefaults::ENVIRONMENT_VARIABLE_PREFIX}" will be removed before being added to the marathon json payload.
+      - Example:  Env variable #{MarathonDeploy::MarathonDefaults::ENVIRONMENT_VARIABLE_PREFIX}DEBUG=True with be passed as DEBUG=True to the marathon-api.
+    * Macros:
+      - Marcos in the deploy yaml/json file use the format %%name%%.
+      - Macros in the deploy yaml/json file must have a corresponding Env variable with the same name.
+      - If any marcos are not defined by Env variables, deployment will fail.
+    DESCRIPTION
     exit
   end 
   

data/examples/{jondeploy.yaml → jondeploy.yml}

@@ -2,7 +2,6 @@
 cmd: while true; echo "HELLO WORLD $(date)"; do sleep 1 ; done 
 cpus: 0.5
 env:
-  APPLICATION_NAME: public-search-germany-webapp
   CONFIG_ASSEMBLER_BASE_URL: http://mobile-config-assembler.service.consul/config-assembler
   JAVA_XMS: 252m
   JAVA_XMX: 504m
@@ -10,6 +9,6 @@ env:
   SERVICE_8009_NAME: public-search-germany-webapp
   SERVICE_8009_TAGS: ajp
 id: public-search-germany-webapp
-instances: 6
+instances: 2
 mem: 32
 uris: []

data/lib/marathon_deploy/application.rb

@@ -8,7 +8,6 @@ module MarathonDeploy
   class Application
   
   attr_reader :json, :id
-  attr_accessor :envs
   
   def initialize(options={})
     default_options = {
@@ -52,7 +51,10 @@ module MarathonDeploy
     @json =  Utils.deep_symbolize(@json)  
       
     add_identifier if (options[:force])
-   
+      
+    inject_envs = ENV.select { |k,v| /^#{MarathonDeploy::MarathonDefaults::ENVIRONMENT_VARIABLE_PREFIX}/.match(k)  }
+    cleaned_envs = inject_envs.map { |k,v| [k.gsub(/^#{MarathonDeploy::MarathonDefaults::ENVIRONMENT_VARIABLE_PREFIX}/,''), v ] }.to_h    
+    self.add_envs cleaned_envs
   end
   
   def overlay_preproduction_settings

data/lib/marathon_deploy/marathon_defaults.rb

@@ -13,13 +13,14 @@ module MarathonDeploy
   DEFAULT_ENVIRONMENT_NAME = 'PREPRODUCTION'
   DEFAULT_PREPRODUCTION_MARATHON_ENDPOINTS = ['http://localhost:8080']
   DEFAULT_PRODUCTION_MARATHON_ENDPOINTS = ['http://paasmaster46-1.mobile.rz:8080']
-  DEFAULT_DEPLOYFILE = 'deploy.yaml'
+  DEFAULT_DEPLOYFILE = 'deploy.yml'
   DEFAULT_LOGFILE = false
   DEFAULT_LOGLEVEL = Logger::INFO
   MARATHON_APPS_REST_PATH = '/v2/apps/'
   MARATHON_DEPLOYMENT_REST_PATH = '/v2/deployments/'
   DEFAULT_FORCE_DEPLOY = false
   DEFAULT_NOOP = false
+  ENVIRONMENT_VARIABLE_PREFIX = 'MARATHON_DEPLOY_'
 
   @@preproduction_override = {
     :instances => 5,

data/lib/marathon_deploy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -101,15 +101,15 @@ files:
 - bin/json2yaml
 - bin/marathon_deploy
 - examples/deploy.json
-- examples/deploy.yaml
-- examples/jondeploy.yaml
-- examples/jondeploy2.yaml
-- examples/nohealthchecks.yaml
+- examples/deploy.yml
+- examples/jondeploy.yml
+- examples/jondeploy2.yml
+- examples/nohealthchecks.yml
 - examples/public-search-germany-webapp.pre.json
 - examples/run.sh
-- examples/simple-python-example.yaml
+- examples/simple-python-example.yml
 - examples/testout.json
-- examples/testout.yaml
+- examples/testout.yml
 - lib/marathon_deploy.rb
 - lib/marathon_deploy/application.rb
 - lib/marathon_deploy/deployment.rb