alpha_omega 0.0.157 → 0.0.158

data/VERSION

@@ -1 +1 @@
-0.0.157
+0.0.158

data/lib/alpha_omega/deploy.rb

@@ -49,7 +49,6 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
 
   _cset(:run_method)        { fetch(:use_sudo, true) ? :sudo : :run }
 
-  _cset :current_pod, "default"
   _cset :last_pod, nil
   _cset :local_only, ENV['LOCAL_ONLY'] ? true : false
 

data/lib/alpha_omega/utils.rb

@@ -9,7 +9,6 @@ module AlphaOmega
   end
 
   def self.node_defaults(node, pods_config, opsdb, env_pod, this_pod, node_name)
-    env_pod = this_pod if env_pod == "default" # TODO get rid of default
     node_name = node_name.split(".").first
 
     node["node_name"] = node_name
@@ -36,7 +35,7 @@ module AlphaOmega
     node["p_name"] = "#{node["node_name"]}.#{node["env_pod"]}"
 
     # check if managed
-    if this_pod != env_pod # TODO get rid of default, use this_pod
+    if this_pod != env_pod
       node["q_name"] = "#{node["node_name"]}.#{node["env_pod"]}"
       node["managed"] = true
     else
@@ -111,9 +110,7 @@ module AlphaOmega
         if task_name == "all"
           # simulate all podXX all
           %w(app echo yaml).each do |tsuffix|
-            unless pod_name == "default"
-              config.after "world.#{tsuffix}", "#{pod_name}.#{tsuffix}" # podXX, hence the guard for default
-            end
+            config.after "world.#{tsuffix}", "#{pod_name}.#{tsuffix}" # podXX
             config.after "world.#{tsuffix}", "#{task_name}.#{tsuffix}" # all
           end
         end
@@ -174,11 +171,11 @@ module AlphaOmega
     n = File.exists?("#{node_home}/pods/#{this_pod}/#{this_host}.yaml") ? YAML.load(File.read("#{node_home}/pods/#{this_pod}/#{this_host}.yaml")) : JSON.load(File.read("#{node_home}/pods/#{this_pod}/#{this_host}.json"))
     this_node = AlphaOmega.node_defaults(n, pods_config, opsdb, this_pod, this_pod, this_host)
 
-    pods["default"] = {
+    pods[this_pod] = {
       "nodes_specs" => [ "#{node_home}/pods/#{this_pod}/*.yaml", "#{node_home}/pods/#{this_pod}/*.json" ],
       "node_suffix" => ""
     }
-    yield config, "default", pods["default"], pods_config, opsdb, this_pod, this_node # TODO get rid of default and use this_pod
+    yield config, this_pod, pods[this_pod], pods_config, opsdb, this_pod, this_node
 
     (this_node["pods"] || []).each do |pod_name|
       pods[pod_name] = { 

data/libexec/activate

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/build

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/bump

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/check

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/compare

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/config

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/debug

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/deploy

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/dist

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/dna

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/hosts

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/invoke

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/lock

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/migrate

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/plan

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/release

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/restart

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/rollback

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/shell

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/stage

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

data/libexec/unlock

@@ -135,14 +135,12 @@ esac
 
 export LOCAL_ONLY=true
 
-default_pod=$(cat /etc/podname 2>&- || true)
-
 case "$(basename $0)" in
   invoke)
     export COMMAND="$1"; shift
 
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default.app"; else echo $a.app; fi; done)
+      set $(for a in "$@"; do echo $a.app; done)
     fi
 
     LOCAL_ONLY=
@@ -157,7 +155,7 @@ case "$(basename $0)" in
     ;;
   *)
     if [[ -n $1 ]]; then
-      set $(for a in "$@"; do if [[ $default_pod = $a ]]; then echo "default"; else echo $a; fi; done)
+      set $(for a in "$@"; do echo $a; done)
     fi
 
     case "$(basename $0)" in

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 293
+  hash: 291
   prerelease: 
   segments: 
   - 0
   - 0
-  - 157
-  version: 0.0.157
+  - 158
+  version: 0.0.158
 platform: ruby
 authors: 
 - David Nghiem