pvcglue 0.1.35 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaf12e3960a155eaa657bf6c9df6d4e639f7f831
-  data.tar.gz: d7c70874016c80251470d75ce16298e41e2e4f6f
+  metadata.gz: f3ae17de32dcc278743d0ebdc618bb536b04a2c9
+  data.tar.gz: 0ad274d04632897a1f2a1d2e16ea7afa7397a4cf
 SHA512:
-  metadata.gz: 66e419dda49cfb9025d1d9c14466f503bc6a88e226d541a2f364cc6219ede59b8e5f7d96aefc43de880b76b41f375a3563a79182b318d3a5f127d6301f7d9fb9
-  data.tar.gz: 93674c75761f8494b11febd186d2d341faee6200bdcc2ed8b23b12c66b1c73ae96ee80d0b57cc1f5016d1d0a2cbdd131d584627fc44ea4e470be6801c7272365
+  metadata.gz: 10f8be4a858a89e2a638465200afb485d5e241036fa96a837ad03e0904027f6b0a775dc50533a553ca09c02fd19642d75976473c928e5b441254c5e89dddbb47
+  data.tar.gz: e298fef64b8d26a8df0a97b6561f2fc5294044fb66bddf17d0466c669e940977ebe351e8bfd1b625a90ccd21255e774fcafe7cc23967c0a13f93d2dea5eaea67

data/lib/pvcglue/cloud.rb

@@ -27,6 +27,10 @@ module Pvcglue
       @current_node
     end
 
+    def current_node_without_nil_check
+      @current_node
+    end
+
     def current_node_data
       current_node.values.first
     end
@@ -228,10 +232,22 @@ module Pvcglue
       stage[:domains]
     end
 
+    def web_nginx_http
+      current_node.values.first[:web_nginx_http] || []
+    end
+
+    def web_nginx_server
+      current_node.values.first[:web_nginx_server] || []
+    end
+
     def ssl_mode
       stage[:ssl].to_sym || :none
     end
 
+    def lb_nginx_load_balancing_method
+      stage[:lb_nginx_load_balancing_method]
+    end
+
     def delayed_job_args
       stage[:delayed_job_args]
     end

data/lib/pvcglue/packages.rb

@@ -4,24 +4,49 @@ module Pvcglue
       # puts nodes.inspect
       orca_suite = OrcaSuite.init(package_filter)
       nodes.each do |node, data|
+        old_current_node = ::Pvcglue.cloud.current_node_without_nil_check # this is being called recursively, so keep the original data...kinda a hack for now
         orca_node = ::Orca::Node.new(node, data[:public_ip], {user: user, port: Pvcglue.cloud.port_in_context(context)})
+        # puts "#"*800
+        # puts orca_node.name
+        # puts package.to_s
+        # puts "^"*80
         ::Pvcglue.cloud.current_node = {node => data}
         tries = 3
         begin
           begin
+            # puts "="*800
+            # puts orca_node.name
+            # puts package.to_s
+            # puts "^"*80
             orca_suite.run(orca_node.name, package.to_s, :apply)
           ensure
-            ::Pvcglue.cloud.current_node = nil
+            # puts "-"*800
+            # puts orca_node.name
+            # puts package.to_s
+            # puts "^"*80
+            ::Pvcglue.cloud.current_node = old_current_node
+
+            # ::Pvcglue.cloud.current_node = nil
             ::Pvcglue.cloud.current_hostname = nil
           end
-        rescue
+        rescue Exception => e
           tries -= 1
           if tries > 0
+            puts "\n"*10
+            puts "*"*80
+            puts "ERROR, retrying..."
+            puts e.message
+            puts "*"*80
             retry
           else
             puts "\n"*10
             puts "*"*80
-            puts "ERROR, retrying..."
+            puts "ERROR, not retrying, fatal."
+            puts e.message
+            e.backtrace.each { |line| puts line }
+            puts e.message
+            puts node.inspect
+            puts data.inspect
             puts "*"*80
           end
         end

data/lib/pvcglue/packages/monit-web.rb

@@ -3,7 +3,7 @@ package 'monit-web' do
 
   apply do
     #include /etc/monit/conf.d/*
-    sudo "ln -s #{Pvcglue.cloud.deploy_to_app_current_dir}/monitrc.#{Pvcglue.cloud.stage_name} /etc/monit/conf.d/#{Pvcglue.cloud.app_name}_#{Pvcglue.cloud.stage_name}.conf"
+    sudo "ln -sf #{Pvcglue.cloud.deploy_to_app_current_dir}/monitrc.#{Pvcglue.cloud.stage_name} /etc/monit/conf.d/#{Pvcglue.cloud.app_name}_#{Pvcglue.cloud.stage_name}.conf"
     # sudo 'service monit restart'
   end
 end

data/lib/pvcglue/templates/lb.sites-enabled.erb

@@ -1,6 +1,9 @@
 upstream <%= Pvcglue.cloud.app_and_stage_name %>_application  {
-  <% Pvcglue.cloud.nodes_in_stage('web').each do |_, node_config| %>
-  server <%= node_config[:private_ip] %> max_fails=1 fail_timeout=10s;
+  <% if Pvcglue.cloud.lb_nginx_load_balancing_method.present? %>
+  <%= Pvcglue.cloud.lb_nginx_load_balancing_method %>;
+  <% end %>
+<% Pvcglue.cloud.nodes_in_stage('web').each do |_, node_config| %>
+  server <%= node_config[:private_ip] %> <%= node_config[:lb_nginx_upstream_server]%>;
   <% end %>
 }
 

data/lib/pvcglue/templates/web.nginx.conf.erb

@@ -78,6 +78,10 @@ http {
       return      444;
   }
 
+<% Pvcglue.cloud.web_nginx_http.each do |option| %>
+  <%= "  #{option};\n" %>
+<% end %>
+
 	include /etc/nginx/conf.d/*.conf;
 	include /etc/nginx/sites-enabled/*;
 }

data/lib/pvcglue/templates/web.sites-enabled.erb

@@ -5,4 +5,11 @@ server {
   server_name        <%= Pvcglue.cloud.domains.join(' ') %>;
   rails_env          <%= Pvcglue.cloud.stage_name %>;
   root               <%= Pvcglue.cloud.deploy_to_app_current_public_dir %>;
+
+# Custom options from web_nginx_server
+
+<% Pvcglue.cloud.web_nginx_server.each do |option| %>
+  <%= "  #{option};\n" %>
+<% end %>
+
 }

data/lib/pvcglue/version.rb

@@ -1,3 +1,3 @@
 module Pvcglue
-  VERSION = "0.1.35"
+  VERSION = "0.1.36"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
 platform: ruby
 authors:
 - Andrew Lyric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: PVC_Glue summary