panteras_api 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a54ac9fcba5c96bb7689355aa598b6ac95dd6ab1
-  data.tar.gz: 931caa7b4e480aa8fa10f44359dd5d595a3ad939
+  metadata.gz: eeb5ebc31839e45b1d91d08a03a821644a6603da
+  data.tar.gz: 2e5adbea11f05e82af189b12b46598e58b6647fd
 SHA512:
-  metadata.gz: 04e62cdc5f8ad188c5a146ab4649a87345da60b512d1620394bdb8f2fa027251984125f93804ccce4680cd5594da374e3c3a7f371f4dfd66e673b056fd1e9f64
-  data.tar.gz: 87fcb79ae69b7d03e25b429388a5a4fa0f646fed35a2dd295acb613f960a0b9ef3b90ced8235c241b6aa4bbf6175ee290835f41575888f8e36d1fa1b65f2658c
+  metadata.gz: 27e0c7f2826ee4eec93a4a082df45bb7d81d8b4a2f74303a98896c845a0a64173a4d568cfdf12a491b54b4a3141d5de022cd963498be6fa0e61e2a8459203722
+  data.tar.gz: 223f6a8d7a341ee53364e6cd531ffa5086a18998d155670a3bc1b76c29210f7bdfa338ab94edbf8ad2c946e96a48a91226b4b70d5b654790c107425f9958f582

data/bin/mesos_consul_consistency_check

@@ -94,24 +94,25 @@ Timeout::timeout(timeout_in_seconds) do
     #puts mesos.task_ids('chronos-config').sort
   end
 
-
-  ## MESOS LOCAL
-  puts "#" * 75 if config[:debug]
-  puts "* Mesos tasks ids for tasks running on #{my_fqdn}:" if config[:debug]
-  mesos_tasks = mesos.my_tasks_ids(my_fqdn, 'marathon').flatten
-  mesos_tasks = mesos_tasks + mesos.my_tasks_ids(my_fqdn, 'chronos-config').flatten
-  puts mesos_tasks.sort if config[:debug]
-  good_news << "#{mesos_tasks.size} mesos tasks running." if ! mesos_tasks.empty?
-
-
   ### MARATHON
   puts "#" * 75 if config[:debug]
   puts "* Marathon tasks on #{my_fqdn}:" if config[:debug]
   marathon = MarathonEndpoint.new(mesos.master_hostname, 8080, config[:marathon_username], config[:marathon_password])
+  if ! marathon.deployments.empty?
+    puts "Deployment in progess"
+    exit 0
+  end
   marathon_tasks = marathon.my_task_ids(my_fqdn, 'marathon')
   puts marathon_tasks.sort if config[:debug]
   good_news << "#{marathon_tasks.size} marathon tasks running."
 
+  ## MESOS LOCAL
+  puts "#" * 75 if config[:debug]
+  puts "* Mesos tasks ids for tasks running on #{my_fqdn}:" if config[:debug]
+  mesos_tasks = mesos.my_tasks_ids(my_fqdn, 'marathon').flatten
+  mesos_tasks = mesos_tasks + mesos.my_tasks_ids(my_fqdn, 'chronos-config').flatten
+  puts mesos_tasks.sort if config[:debug]
+  good_news << "#{mesos_tasks.size} mesos tasks running." if ! mesos_tasks.empty?
 
   ### CHRONOS
   puts "#" * 75 if config[:debug]

data/lib/panteras_api/marathon_endpoint.rb

@@ -17,7 +17,11 @@ class MarathonEndpoint
   def all_apps
     to_j(get_response_with_redirect(@host, '/v2/apps/', @port, @user, @passwd))[:apps]
   end
-  
+
+  def deployments
+    to_j(get_response_with_redirect(@host, '/v2/deployments', @port, @user, @passwd))
+  end
+
   def app_names
     raise StandardError, "Empty response from marathon", caller if all_apps.nil?
     all_apps.collect { |a| a[:id][1..-1] }

data/lib/panteras_api/version.rb

@@ -1,3 +1,3 @@
 module PanterasApi
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panteras_api
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler