port-authority 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 221e5235470801ff068ea1fd1cf29494ac4e5c7d
-  data.tar.gz: d916df00dc140f8d88692dc3df7dd1d427522e8a
+  metadata.gz: b9ae0f6c484615e82c028a5eda9b6b5d3c9fb59c
+  data.tar.gz: 02534027bd8e7f01bb56f7a110ae90124bc0e45c
 SHA512:
-  metadata.gz: 99168b0111a49424e6166a91a0586819b65df8007edfe766740df902bb922400c442ef58a52ae4611f3737d5f609b52bdabf92a24b319849d5fd3e1af669eae1
-  data.tar.gz: 12f4a20fc48a4606d9e841f5fbba75189294090f668d7f32822d236d39ebe979b871f3e2a4efc19ed395593d9ef174535989493ae25ecab29674e4ac11f8ffd2
+  metadata.gz: 951bcbc83d7b399e5ae00730f9f6bdf0845cf4340605d9b2300b6f03323ba8de9f2e4cfdb4cf275d72fe405cb72a08a9a786a25940b55259ec58a2f58cfebe0c
+  data.tar.gz: 53cb57289059b35c82ca6a57ac51375f1813011c2168203f376d8a09ce8687ff68abbf41c1efde9c20bd26535416eb5cf0389263ca1606b19fadbc853e781ce4

data/lib/port-authority/agent.rb

@@ -1,5 +1,4 @@
 require 'timeout'
-require 'digest/sha2'
 require 'json'
 require 'yaml'
 require 'port-authority'
@@ -146,15 +145,6 @@ module PortAuthority
       @@_threads.each_value(&:join)
     end
 
-    # Run command in Bash.
-    def shellcmd(*args)
-      cmd = args.join(' ').to_s
-      cksum = Digest::SHA256.hexdigest(args.join.to_s)[0..15]
-      Logger.debug "Executing shellcommand #{cksum} - #{cmd}"
-      ret = system cmd
-      Logger.debug "Shellcommand #{cksum} returned #{ret.to_s}"
-    end
-
     # Return hostname.
     def hostname
       @hostname ||= Socket.gethostname

data/lib/port-authority/agents/lbaas.rb

@@ -36,7 +36,6 @@ module PortAuthority
 
         FloatingIP.init!
         LoadBalancer.init!
-        LoadBalancer.container || ( LoadBalancer.pull! && LoadBalancer.create! )
 
         Logger.debug 'Waiting for threads to gather something...'
         sleep Config.lbaas[:interval]
@@ -73,7 +72,7 @@ module PortAuthority
                   Logger.notice 'FloatingIP is free :) assigning'
                   FloatingIP.handle! status_swarm
                   Logger.notice 'Notifying the network about change'
-                  FloatingIP.update_arp!
+                  FloatingIP.arp_update!
                 end
               end
             end

data/lib/port-authority/mechanism/floating_ip.rb

@@ -1,5 +1,6 @@
 # rubocop:disable Metrics/LineLength, Metrics/AbcSize
 require 'net/ping'
+require 'digest/sha2'
 
 module PortAuthority
   module Mechanism
@@ -11,17 +12,20 @@ module PortAuthority
 
       def init!
         @_icmp = Net::Ping::ICMP.new(Config.lbaas[:floating_ip])
+        Logger.debug(Config.lbaas.to_yaml)
       end
 
       # add or remove VIP on interface
       def handle!(leader)
-        return true if shellcmd Config.commands[:iproute], 'address', leader ? 'add' : 'delete', "#{Config.lbaas[:floating_ip]}/32", 'dev', Config.lbaas[:interface], '>/dev/null 2>&1'
+        return true if shellcmd Config.commands[:iproute], 'address', leader ? 'add' : 'delete', "#{Config.lbaas[:floating_ip]}/32", 'dev', Config.lbaas[:floating_iface], '>/dev/null 2>&1'
         false
       end
 
       # send gratuitous ARP to the network
       def arp_update!
-        return true if shellcmd Config.commands[:arping], '-U', '-q', '-c', Config.lbaas[:arping_count], '-I', Config.lbaas[:interface], Config.lbaas[:floating_ip]
+        # return true if shellcmd Config.commands[:arping], '-U', '-q', '-c', Config.lbaas[:arping_count], '-I', Config.lbaas[:floating_iface], Config.lbaas[:floating_ip]
+        return true if shellcmd Config.commands[:arping], '-U', '-q', '-c', Config.lbaas[:arping_count], '-I', Config.lbaas[:floating_iface], Config.lbaas[:floating_ip]
+
         false
       end
 
@@ -43,9 +47,19 @@ module PortAuthority
 
       # check whether the IP is registered anywhere
       def duplicate?
-        return true if shellcmd Config.commands[:arping], '-D', '-q', '-c', Config.lbaas[:arping_count], '-w', Config.lbaas[:arping_wait], '-I', Config.lbaas[:interface], Config.lbaas[:floating_ip]
-        false
+        return false if shellcmd Config.commands[:arping], '-D', '-q', '-c', Config.lbaas[:arping_count], '-w', Config.lbaas[:arping_wait], '-I', Config.lbaas[:floating_iface], Config.lbaas[:floating_ip]
+        true
       end
+
+      private
+      def shellcmd(*args)
+        cmd = args.join(' ').to_s
+        cksum = Digest::SHA256.hexdigest(args.join.to_s)[0..15]
+        Logger.debug "Executing shellcommand #{cksum} - #{cmd}"
+        ret = system cmd
+        Logger.debug "Shellcommand #{cksum} returned #{ret.to_s}"
+      end
+
     end
   end
 end

data/lib/port-authority/mechanism/load_balancer.rb

@@ -11,6 +11,7 @@ module PortAuthority
       def init!
         Docker.url = Config.lbaas[:docker_endpoint]
         Docker.options = { connect_timeout: Config.lbaas[:docker_timeout] || 10 }
+        self.container || ( self.pull! && self.create! )
       end
 
       def container
@@ -56,7 +57,7 @@ module PortAuthority
 
       def update!
         begin
-          self.stop! && start = true if self.up?
+          ( self.stop! && start = true ) if self.up?
           self.remove!
           self.pull!
           self.create!
@@ -69,19 +70,19 @@ module PortAuthority
       end
 
       def remove!
-        self.container.delete
+        @_container.delete
       end
 
       def up?
-        self.container.json['State']['Running']
+        @_container.json['State']['Running']
       end
 
       def start!
-        self.container.start
+        @_container.start
       end
 
       def stop!
-        self.container.stop
+        @_container.stop
       end
 
     end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: port-authority
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Radek 'blufor' Slavicinsky
+- Tomas 'arteal' Hejatko
+- Jan 'liquid' Kaufman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-01 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd
@@ -90,8 +92,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.25.0
-description: CLI Tools for PortAuthority
-email: radek.slavicinsky@gmail.com
+description: Highly opinionated PaaS based on Docker Swarm and ETCD
+email: cloud@prozeta.eu
 executables:
 - pa-lbaas-agent
 - pa-service-list
@@ -130,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Port Authority