auser-poolparty 0.2.51 → 0.2.52
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Rakefile +2 -2
- data/lib/erlang/messenger/useful_snippets +1 -1
- data/lib/poolparty/base_packages/poolparty.rb +8 -8
- data/lib/poolparty/helpers/provisioners/master.rb +3 -3
- data/lib/poolparty/helpers/provisioners/slave.rb +1 -1
- data/lib/poolparty/templates/puppetrerun +1 -1
- data/lib/poolparty/version.rb +1 -1
- data/poolparty.gemspec +1 -1
- metadata +1 -1
    
        data/Rakefile
    CHANGED
    
    | @@ -42,6 +42,6 @@ end | |
| 42 42 |  | 
| 43 43 | 
             
            desc "Generate github gemspec and latest gem"
         | 
| 44 44 | 
             
            task :ghgem => [:local_deploy] do
         | 
| 45 | 
            -
              `mv #{::File.expand_path(::File.dirname(__FILE__))}/pkg/*.gem #{::File.expand_path(::File.dirname(__FILE__))}/pkg/poolparty | 
| 46 | 
            -
              `git add pkg/poolparty | 
| 45 | 
            +
              `mv #{::File.expand_path(::File.dirname(__FILE__))}/pkg/*.gem #{::File.expand_path(::File.dirname(__FILE__))}/pkg/poolparty.gem`
         | 
| 46 | 
            +
              `git add pkg/poolparty.gem -f`
         | 
| 47 47 | 
             
            end
         | 
| @@ -11,7 +11,7 @@ | |
| 11 11 | 
             
            % Get the load
         | 
| 12 12 | 
             
            % erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.46/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start
         | 
| 13 13 |  | 
| 14 | 
            -
            % cd /var/poolparty && gem uninstall poolparty && wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty | 
| 14 | 
            +
            % cd /var/poolparty && gem uninstall poolparty && wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty.gem?raw=true -O poolparty.gem 2>&1 && gem install --no-ri --no-rdoc poolparty.gem
         | 
| 15 15 |  | 
| 16 16 | 
             
            % LOAD TESTING
         | 
| 17 17 | 
             
            % ab -n 10000 -c 5 http://75.101.162.232/
         | 
| @@ -38,16 +38,16 @@ module PoolParty | |
| 38 38 |  | 
| 39 39 | 
             
                      has_gempackage(:name => "RubyInline", :download_url => "http://rubyforge.org/frs/download.php/45683/RubyInline-3.8.1.gem")
         | 
| 40 40 |  | 
| 41 | 
            -
                      has_gempackage(:name => "poolparty | 
| 41 | 
            +
                      has_gempackage(:name => "poolparty", :download_url => "http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty.gem?raw=true", :requires => [get_gempackage("ruby2ruby"), get_gempackage("RubyInline"), get_gempackage("ParseTree")])
         | 
| 42 42 |  | 
| 43 | 
            -
                      has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger", :requires => get_gempackage("poolparty | 
| 43 | 
            +
                      has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger", :requires => get_gempackage("poolparty"), :ifnot => "ps aux | grep beam | grep node")
         | 
| 44 44 | 
             
                      has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node", :requires => get_exec("build_messenger"), :ifnot => "ps aux | grep beam | grep node")
         | 
| 45 45 |  | 
| 46 46 | 
             
                    end
         | 
| 47 47 |  | 
| 48 48 | 
             
                    # execute_on_node do
         | 
| 49 49 | 
             
                      has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
         | 
| 50 | 
            -
                        requires get_gempackage("poolparty | 
| 50 | 
            +
                        requires get_gempackage("poolparty")
         | 
| 51 51 | 
             
                        command(PoolParty::Remote::RemoteInstance.puppet_rerun_commad)
         | 
| 52 52 | 
             
                      end
         | 
| 53 53 | 
             
                    # end
         | 
| @@ -64,20 +64,20 @@ module PoolParty | |
| 64 64 | 
             
                    # TODO: Update the offsetted times
         | 
| 65 65 | 
             
                    execute_on_master do          
         | 
| 66 66 | 
             
                      has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
         | 
| 67 | 
            -
                        requires get_gempackage("poolparty | 
| 67 | 
            +
                        requires get_gempackage("poolparty")
         | 
| 68 68 | 
             
                        command(PoolParty::Remote::RemoteInstance.puppet_master_rerun_command)
         | 
| 69 69 | 
             
                      end
         | 
| 70 70 | 
             
                      has_cron(:name => "Load handler", :user => Base.user, :minute => "*/4") do
         | 
| 71 | 
            -
                        requires get_gempackage("poolparty | 
| 71 | 
            +
                        requires get_gempackage("poolparty")
         | 
| 72 72 | 
             
                        command(". /etc/profile && cloud-handle-load")
         | 
| 73 73 | 
             
                      end
         | 
| 74 74 |  | 
| 75 75 | 
             
                      # TODO: Update this so it only runs when needed
         | 
| 76 | 
            -
                      has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty | 
| 76 | 
            +
                      has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty"), get_exec("build_messenger")], :ifnot => "ps aux | grep beam | grep master")
         | 
| 77 77 |  | 
| 78 | 
            -
                      has_exec(:name => "start client server", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty | 
| 78 | 
            +
                      has_exec(:name => "start client server", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty"), get_exec("build_messenger"), get_exec("start master messenger")], :ifnot => "ps aux | grep beam | grep client")
         | 
| 79 79 |  | 
| 80 | 
            -
                      has_cron({:name => "maintain script", :command => ". /etc/profile && which cloud-maintain | /bin/sh", :minute => "*/3", :requires => [get_gempackage("poolparty | 
| 80 | 
            +
                      has_cron({:name => "maintain script", :command => ". /etc/profile && which cloud-maintain | /bin/sh", :minute => "*/3", :requires => [get_gempackage("poolparty"), get_cron("puppetd runner"), get_cron("Load handler"), get_exec("start master messenger"), get_service("haproxy"), get_exec("start client server")]})
         | 
| 81 81 |  | 
| 82 82 | 
             
                      has_remotefile(:name => "/usr/bin/puppetcleaner") do
         | 
| 83 83 | 
             
                        mode 744
         | 
| @@ -108,12 +108,12 @@ wget http://rubyforge.org/frs/download.php/18698/lockfile-1.4.3.gem -O lockfile. | |
| 108 108 | 
             
            wget http://rubyforge.org/frs/download.php/45546/rubyforge-1.0.1.gem -O rubyforge.gem 2>&1
         | 
| 109 109 | 
             
            wget http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem -O rake.gem 2>&1
         | 
| 110 110 | 
             
            wget http://rubyforge.org/frs/download.php/45589/sexp_processor-3.0.0.gem -O sexp_processor.gem 2>&1
         | 
| 111 | 
            -
            wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty | 
| 111 | 
            +
            wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty.gem?raw=true -O poolparty.gem 2>&1
         | 
| 112 112 | 
             
            wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O amazon-ec2.gem 2>&1
         | 
| 113 113 |  | 
| 114 114 | 
             
            #{
         | 
| 115 115 | 
             
              %w(rake lockfile rubyforge hoe ZenTest sexp_processor flexmock logging activesupport 
         | 
| 116 | 
            -
                  RubyInline ParseTree ruby2ruby xml-simple poolparty | 
| 116 | 
            +
                  RubyInline ParseTree ruby2ruby xml-simple poolparty amazon-ec2).map do |dep|
         | 
| 117 117 | 
             
                "gem install --ignore-dependencies -y --no-ri --no-rdoc #{dep}.gem #{unix_hide_string}"
         | 
| 118 118 | 
             
              end.join("\n")
         | 
| 119 119 | 
             
            }
         | 
| @@ -129,7 +129,7 @@ wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O amazon- | |
| 129 129 | 
             
            # ps aux | grep puppetmaster | awk '{print $2}' | xargs kill #{unix_hide_string} # just in case
         | 
| 130 130 | 
             
            # rm -rf /etc/puppet/ssl
         | 
| 131 131 | 
             
            # # Start it back up
         | 
| 132 | 
            -
             | 
| 132 | 
            +
            /etc/init.d/puppetmaster start #{unix_hide_string}
         | 
| 133 133 | 
             
                    EOS
         | 
| 134 134 | 
             
                  end
         | 
| 135 135 |  | 
    
        data/lib/poolparty/version.rb
    CHANGED
    
    
    
        data/poolparty.gemspec
    CHANGED