alpha_omega 0.0.69 → 0.0.70

data/lib/alpha_omega/utils.rb

@@ -3,26 +3,67 @@ require 'yaml'
 
 module AlphaOmega
 
-  def self.echo_magic
+  def self.magic_prefix
     "eea914aaa8dde6fdae29242b1084a2b0415eefaf"
   end
 
-  def self.default_pods_tasks
-    Proc.new do |config, pod_name, pod, mix_pods|
-      # world task accumulates all.* after tasks
-      config.task "world" do
-      end
+  def self.node_defaults(node, pods_config, opsdb, env_pod, this_pod, node_name)
+    node["node_name"] = node_name
 
-      config.task "world.echo" do
-      end
+    # defaults
+    node["run_list"] ||= []
+    node["cap_group"] ||= []
+    node["nagios_group"] ||= []
+    node["private_aliases"] ||= []
+    node["node"] = nil
 
-      # each pod task sets the pod context for host/group tasks
-      config.task pod_name do
-        set :current_pod, pod_name
-      end
+    # enrich with pods config
+    node["env_pod"] = env_pod
+    node.deep_merge!(pods_config[env_pod])
+
+    # enrich with opsdb
+    node.deep_merge!(opsdb[env_pod][node_name])
+
+    node["run_list"] = node["run_list"].clone # TODO without a clone, node.run_list also updates pods_config.env_pod.run_list
+
+    # derive
+    node["fq_domain"] = %w(env_pod env_dc dc_domain).collect {|s| node[s] }.uniq.join(".")
+    node["fq_name"] = %w(node_name env_pod env_dc dc_domain).collect {|s| node[s] }.uniq.join(".")
+    node["p_name"] = "#{node["node_name"]}.#{node["env_pod"]}"
+
+    # check if managed
+    if "default" != env_pod # TODO get rid of default, use this_pod
+      node["q_name"] = "#{node["node_name"]}.#{node["env_pod"]}"
+      node["managed"] = true
+    else
+      node["q_name"] = node["node_name"]
+      node["managed"] = false
+    end
+
+    # check if infra pod
+    if node["env_pod"] == node["env_dc"]
+      node["infra"] = true
+    else
+      node["infra"] = false
+      node["infra_domain"] = "#{node["env_dc"]}.#{node["dc_domain"]}"
+    end
 
-      config.task "#{pod_name}.echo" do
-        set :current_pod, pod_name
+    node["run_list"].concat pods_config[env_pod]["run_list"] if pods_config[env_pod].key? "run_list"
+
+    node
+  end
+
+  def self.default_pods_tasks
+    Proc.new do |config, pod_name, pod, mix_pods, pods_config, opsdb, this_pod|
+      [ "", ".echo", ".yaml" ].each do |tsuffix|
+         # world task accumulates all.* after tasks
+        config.task "world#{tsuffix}" do
+        end
+
+        # each pod task sets the pod context for host/group tasks
+        config.task "#{pod_name}#{tsuffix}" do
+          set :current_pod, pod_name
+        end
       end
 
       hosts =
@@ -31,30 +72,31 @@ module AlphaOmega
             role :app, remote_name
           end
         
-          config.task task_name do
-            after task_name, "#{task_name}.#{current_pod}"
-          end
-
           config.task "#{task_name}.#{pod_name}.echo" do
-            puts "#{AlphaOmega.echo_magic} #{remote_name}"
+            puts "#{AlphaOmega.magic_prefix} #{remote_name}"
           end
         
-          config.task "#{task_name}.echo" do
-            after "#{task_name}.echo", "#{task_name}.#{current_pod}.echo"
+          config.task "#{task_name}.#{pod_name}.yaml" do
+            n = self.node_defaults(node, pods_config. opsdb, pod_name, this_pod, task_name)
+            StringIO.new({ remote_name => n }.to_yaml).lines.each {|l| puts "#{AlphaOmega.magic_prefix} #{l}" }
+          end
+        
+          [ "", ".echo", ".yaml" ].eeach do |tsuffix|
+            config.task "#{task_name}#{tsuffix}" do
+              after "#{task_name}#{tsuffix}", "#{task_name}.#{current_pod}#{tsuffix}"
+            end
           end
-
         end
 
       AlphaOmega.what_groups hosts do |task_name, nodes|
         if task_name == "all"
           # simulate all podXX all
-          unless pod_name == "default"
-            config.after "world", pod_name
-            config.after "world.echo", "#{pod_name}.echo"
+          [ "", ".echo", ".yaml" ].each do |tsuffix|
+            unless pod_name == "default"
+              config.after "world#{tsuffix}", "#{pod_name}#{tsuffix}"
+            end
+            config.after "world#{tsuffix}", "#{task_name}#{tsuffix}"
           end
-          
-          config.after "world", task_name
-          config.after "world.echo", "#{task_name}.echo"
         end
 
         config.task "#{task_name}.#{pod_name}" do
@@ -71,11 +113,21 @@ module AlphaOmega
           end
         end
 
-        config.task task_name do
-          after task_name, "#{task_name}.#{current_pod}"
+        config.task "#{task_name}.#{pod_name}.echo" do
+          unless mix_pods
+            if last_pod && last_pod != pod_name
+              puts "ERROR: cannot call tasks that mix different dc_env (last pod = #{last_pod}, current pod = #{pod_name})"
+              exit 1
+            end
+          end
+
+          set :last_pod, pod_name
+          nodes.keys.sort.each do |remote_name|
+            puts "#{AlphaOmega.magic_prefix} #{remote_name}"
+          end
         end
 
-        config.task "#{task_name}.#{pod_name}.echo" do
+        config.task "#{task_name}.#{pod_name}.yaml" do
           unless mix_pods
             if last_pod && last_pod != pod_name
               puts "ERROR: cannot call tasks that mix different dc_env (last pod = #{last_pod}, current pod = #{pod_name})"
@@ -85,19 +137,24 @@ module AlphaOmega
 
           set :last_pod, pod_name
           nodes.keys.sort.each do |remote_name|
-            puts "#{AlphaOmega.echo_magic} #{remote_name}"
+            n = self.node_defaults(node, pods_config. opsdb, pod_name, this_pod, task_name)
+            StringIO.new({ remote_name => n }.to_yaml).lines.each {|l| puts "#{AlphaOmega.magic_prefix} #{l}" }
           end
         end
 
-        config.task "#{task_name}.echo" do
-          after "#{task_name}.echo", "#{task_name}.#{current_pod}.echo"
+        [ "", ".echo", ".yaml" ].each do |tsuffix|
+          config.task "#{task_name}#{tsuffix}" do
+            after "#{task_name}#{tsuffix}", "#{task_name}.#{current_pod}#{tsuffix}"
+          end
         end
       end
     end
   end
 
   def self.setup_pods (config, node_home, mix_pods = true)
-    self.what_pods(config, node_home) { |config, pod_name, pod| self.default_pods_tasks.call(config, pod_name, pod, mix_pods) }
+    self.what_pods(config, node_home) do |config, pod_name, pod, pods_config, opsdb, this_pod| 
+      self.default_pods_tasks.call(config, pod_name, pod, mix_pods, pods_config, opsdb, this_pod) 
+    end
   end
 
   def self.what_branch (allowed = %w(production master develop))
@@ -126,24 +183,34 @@ module AlphaOmega
   end
 
   def self.what_pods (config, node_home)
-    pods = { 
-      "default" => {
-        "nodes_spec" => "#{node_home}/nodes/*.yaml",
-        "node_suffix" => ""
-      }
-    }
+    # pods config
+    pods_config = YAML.load(File.read("#{node_home}/config/pods.yml"))
+
+    # opsdb config
+    opsdb = Dir["#{node_home}/config/pod/*.yaml"].inject({}) do |acc, fname|
+      env_pod = File.basename fname, ".yaml"
+      acc[env_pod] = YAML.load(File.read(fname))
+      acc
+    end
 
-    yield config, "default", pods["default"]
+    pods = { }
+
+    this_pod = File.read("/etc/podname").strip
+    pods["default"] = {
+      "nodes_spec" => "#{node_home}/pods/#{this_pod}/*.yaml",
+      "node_suffix" => ""
+    }
+    yield config, "default", pods[this_pod], pods_config. opsdb, this_pod # TODO get rid of default and use this_pod
 
     this_host = Socket.gethostname.chomp.split(".")[0]
-    this_node = YAML.load(File.read("#{node_home}/nodes/#{this_host}.yaml"))
+    this_node = YAML.load(File.read("#{node_home}/pods/#{this_pod}/#{this_host}.yaml"))
+
     (this_node["pods"] || []).each do |pod_name|
       pods[pod_name] = { 
         "nodes_spec" => "#{node_home}/pods/#{pod_name}/*.yaml",
         "node_suffix" => ".#{pod_name}"
       }
-
-      yield config, pod_name, pods[pod_name]
+      yield config, pod_name, pods[pod_name], pods_config, opsdb, this_pod
     end
 
     pods
@@ -187,6 +254,4 @@ module AlphaOmega
 
     cap_groups
   end
-
 end
-

data/lib/alpha_omega/version.rb

@@ -1,3 +1,3 @@
 module AlphaOmega
-  Version = "0.0.69"
+  Version = "0.0.70"
 end

data/libexec/dna

@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+export LOCAL_ONLY=true
+
+{
+cap $(for a in "$@"; do yaml $a.yaml; done)
+} 2>&1  | grep eea914aaa8dde6fdae29242b1084a2b0415eefaf | sed 's#eea914aaa8dde6fdae29242b1084a2b0415eefaf ##'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 149
+  hash: 147
   prerelease: 
   segments: 
   - 0
   - 0
-  - 69
-  version: 0.0.69
+  - 70
+  version: 0.0.70
 platform: ruby
 authors: 
 - David Nghiem
@@ -62,7 +62,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: HeSYINUvSBZfxqA-capistrano
+  name: deep_merge
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -76,7 +76,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: HeSYINUvSBZfxqA-capistrano_colors
+  name: HeSYINUvSBZfxqA-capistrano
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -90,7 +90,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: HeSYINUvSBZfxqA-capistrano_log
+  name: HeSYINUvSBZfxqA-capistrano_colors
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -103,6 +103,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: HeSYINUvSBZfxqA-capistrano_log
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
 description: Common reciples for persistent capistrano releases
 email: 
 - nghidav@gmail.com
@@ -117,29 +131,30 @@ files:
 - LICENSE
 - README.mkd
 - Procfile.rb
+- libexec/rollback
+- libexec/stage
+- libexec/patch
 - libexec/compare
 - libexec/check
-- libexec/patch
 - libexec/deploy
-- libexec/stage
+- libexec/shell
+- libexec/dna
 - libexec/cook
 - libexec/hosts
-- libexec/shell
-- libexec/rollback
-- lib/alpha_omega/deploy/remote_dependency.rb
-- lib/alpha_omega/deploy/strategy/base.rb
-- lib/alpha_omega/deploy/strategy/remote.rb
-- lib/alpha_omega/deploy/strategy/checkout.rb
+- lib/alpha_omega/deploy.rb
+- lib/alpha_omega/version.rb
+- lib/alpha_omega/deploy/scm.rb
 - lib/alpha_omega/deploy/dependencies.rb
-- lib/alpha_omega/deploy/local_dependency.rb
-- lib/alpha_omega/deploy/strategy.rb
 - lib/alpha_omega/deploy/templates/maintenance.rhtml
-- lib/alpha_omega/deploy/scm.rb
-- lib/alpha_omega/deploy/scm/git.rb
+- lib/alpha_omega/deploy/strategy.rb
 - lib/alpha_omega/deploy/scm/base.rb
+- lib/alpha_omega/deploy/scm/git.rb
+- lib/alpha_omega/deploy/strategy/base.rb
+- lib/alpha_omega/deploy/strategy/checkout.rb
+- lib/alpha_omega/deploy/strategy/remote.rb
+- lib/alpha_omega/deploy/local_dependency.rb
+- lib/alpha_omega/deploy/remote_dependency.rb
 - lib/alpha_omega/utils.rb
-- lib/alpha_omega/version.rb
-- lib/alpha_omega/deploy.rb
 - bin/alpha_omega
 has_rdoc: true
 homepage: https://github.com/HeSYINUvSBZfxqA/alpha_omega