fairchild-poolparty 1.1.4 → 1.1.5
Sign up to get free protection for your applications and to get access to all the features.
- data/README.txt +0 -12
- data/Rakefile +17 -1
- data/VERSION.yml +1 -1
- data/bin/cloud +20 -1
- data/bin/cloud-bootstrap +14 -4
- data/bin/cloud-configure +26 -9
- data/bin/cloud-contract +7 -7
- data/bin/cloud-describe +28 -0
- data/bin/cloud-expand +13 -6
- data/bin/cloud-list +3 -5
- data/bin/cloud-osxcopy +1 -1
- data/bin/cloud-provision +1 -1
- data/bin/cloud-show +6 -5
- data/bin/cloud-ssh +1 -3
- data/bin/cloud-start +8 -6
- data/bin/cloud-terminate +9 -7
- data/bin/server-cloud-elections +29 -18
- data/bin/server-ensure-provisioning +24 -29
- data/bin/server-list-active +10 -5
- data/bin/server-monitor.ru +18 -1
- data/bin/server-update-hosts +3 -3
- data/bin/server-write-new-nodes +1 -1
- data/config/jeweler.rb +12 -3
- data/lib/poolparty/aska/aska.rb +1 -12
- data/lib/poolparty/base_packages/haproxy.rb +26 -18
- data/lib/poolparty/base_packages/poolparty.rb +1 -1
- data/lib/poolparty/capistrano.rb +1 -1
- data/lib/poolparty/core/array.rb +12 -0
- data/lib/poolparty/core/hash.rb +12 -5
- data/lib/poolparty/core/nil.rb +8 -0
- data/lib/poolparty/core/object.rb +15 -5
- data/lib/poolparty/core/string.rb +28 -2
- data/lib/poolparty/dependency_resolver/chef_resolver.rb +106 -79
- data/lib/poolparty/dependency_resolver/dependency_resolver.rb +1 -1
- data/lib/poolparty/dependency_resolver/dependency_resolver_cloud_extensions.rb +5 -4
- data/lib/poolparty/dependency_resolver/puppet_resolver.rb +44 -17
- data/lib/poolparty/helpers/console.rb +1 -1
- data/lib/poolparty/helpers/optioner.rb +9 -2
- data/lib/poolparty/lite.rb +12 -2
- data/lib/poolparty/modules/callbacks.rb +44 -0
- data/lib/poolparty/modules/cloud_dsl.rb +17 -11
- data/lib/poolparty/modules/cloud_resourcer.rb +29 -21
- data/lib/poolparty/modules/definable_resource.rb +1 -1
- data/lib/poolparty/modules/pinger.rb +28 -0
- data/lib/poolparty/modules/resourcing_dsl.rb +7 -3
- data/lib/poolparty/modules/thread_pool.rb +107 -106
- data/lib/poolparty/modules/user_helpers.rb +20 -0
- data/lib/poolparty/monitors/base_monitor.rb +32 -81
- data/lib/poolparty/monitors/monitor_rack.rb +60 -69
- data/lib/poolparty/monitors/monitors/favicon_monitor.rb +12 -0
- data/lib/poolparty/monitors/monitors/load_monitor.rb +9 -15
- data/lib/poolparty/monitors/monitors/memory_monitor.rb +48 -48
- data/lib/poolparty/monitors/monitors/neighborhood_monitor.rb +77 -0
- data/lib/poolparty/monitors/{stats_monitor.rb → monitors/stats_monitor.rb} +29 -24
- data/lib/poolparty/monitors/monitors/time_monitor.rb +15 -0
- data/lib/poolparty/net/messenger.rb +2 -0
- data/lib/poolparty/net/remoter/cloud_control.rb +177 -227
- data/lib/poolparty/net/remoter/connections.rb +10 -18
- data/lib/poolparty/net/remoter/interactive.rb +24 -90
- data/lib/poolparty/net/remoter_base.rb +98 -25
- data/lib/poolparty/net/remoter_bases/ec2/ec2.rb +83 -66
- data/lib/poolparty/net/remoter_bases/vmrun/utilities/vm_disk.rb +12 -0
- data/lib/poolparty/net/remoter_bases/vmrun/utilities/vmx.rb +33 -0
- data/lib/poolparty/net/remoter_bases/vmrun/utilities/vmx_file.rb +117 -0
- data/lib/poolparty/net/remoter_bases/vmrun/vmrun.rb +165 -0
- data/lib/poolparty/net/remoter_bases/vmrun/vmrun_instance.rb +71 -0
- data/lib/poolparty/{base_packages → plugins}/bind.rb +1 -1
- data/lib/poolparty/plugins/chef.rb +71 -71
- data/lib/poolparty/plugins/chef_deploy.rb +58 -0
- data/lib/poolparty/plugins/{deploydirectory.rb → deploy_directory.rb} +12 -3
- data/lib/poolparty/plugins/dynomite.rb +14 -0
- data/lib/poolparty/plugins/gem_package.rb +37 -0
- data/lib/poolparty/plugins/line_in_file.rb +1 -0
- data/lib/poolparty/plugins/nanite.rb +41 -0
- data/lib/poolparty/{base_packages → plugins}/tokyo_tyrant.rb +1 -1
- data/lib/poolparty/poolparty/cloud.rb +36 -35
- data/lib/poolparty/poolparty/default.rb +2 -11
- data/lib/poolparty/poolparty/key.rb +15 -12
- data/lib/poolparty/poolparty/neighborhoods.rb +54 -21
- data/lib/poolparty/poolparty/plugin.rb +6 -9
- data/lib/poolparty/poolparty/plugin_model.rb +5 -5
- data/lib/poolparty/poolparty/pool.rb +8 -4
- data/lib/poolparty/poolparty/poolparty_base_class.rb +20 -11
- data/lib/poolparty/poolparty/resource.rb +9 -5
- data/lib/poolparty/poolparty/service.rb +3 -1
- data/lib/poolparty/provision/boot_strapper.rb +47 -24
- data/lib/poolparty/provision/configurations/chef.rb +7 -4
- data/lib/poolparty/provision/dr_configure.rb +80 -25
- data/lib/poolparty/resources/cron.rb +8 -0
- data/lib/poolparty/resources/directory.rb +1 -1
- data/lib/poolparty/resources/file.rb +16 -0
- data/lib/poolparty/resources/package.rb +7 -2
- data/lib/poolparty/resources/service.rb +4 -3
- data/lib/poolparty/resources/symlink.rb +0 -8
- data/lib/poolparty/schema.rb +35 -20
- data/lib/poolparty/templates/haproxy.conf +27 -25
- data/lib/poolparty/templates/monitor.ru +3 -3
- data/lib/poolparty/verification/verifier_base.rb +17 -0
- data/lib/poolparty/verification/verifiers/ping.rb +17 -0
- data/lib/poolparty/verification/verify.rb +74 -0
- data/lib/poolparty.rb +8 -9
- data/lib/poolpartycl.rb +14 -0
- data/spec/bin/server-list-active_spec.rb +2 -0
- data/spec/poolparty/base_packages/haproxy_spec.rb +1 -1
- data/spec/poolparty/core/array_spec.rb +3 -1
- data/spec/poolparty/core/ordered_hash_spec.rb +2 -2
- data/spec/poolparty/dependency_resolver/chef_resolver_spec.rb +9 -15
- data/spec/poolparty/dependency_resolver/dependency_resolver_cloud_extensions_spec.rb +6 -6
- data/spec/poolparty/dependency_resolver/puppet_resolver_spec.rb +121 -124
- data/spec/poolparty/net/remote_spec.rb +287 -286
- data/spec/poolparty/net/remoter_bases/ec2_mocks_and_stubs.rb +1 -1
- data/spec/poolparty/net/remoter_bases/ec2_remote_instance_spec.rb +7 -8
- data/spec/poolparty/net/remoter_bases/ec2_spec.rb +22 -7
- data/spec/poolparty/net/remoter_spec.rb +48 -45
- data/spec/poolparty/poolparty/cloud_spec.rb +15 -22
- data/spec/poolparty/poolparty/key_spec.rb +4 -4
- data/spec/poolparty/poolparty/neighborhoods_spec.rb +1 -2
- data/spec/poolparty/poolparty/plugin_spec.rb +2 -2
- data/spec/poolparty/poolparty/resource_spec.rb +4 -5
- data/spec/poolparty/poolparty_base_class_spec.rb +82 -78
- data/spec/poolparty/resources/package_spec.rb +0 -3
- data/spec/poolparty/spec_helper.rb +4 -4
- data/tasks/development.rake +9 -0
- data/test/poolparty/core/array_test.rb +21 -0
- data/test/poolparty/core/hash_test.rb +14 -1
- data/test/poolparty/core/string_test.rb +29 -0
- data/test/poolparty/dependency_resolver/puppet_resolver_test.rb +106 -0
- data/test/poolparty/modules/callbacks_test.rb +40 -0
- data/test/poolparty/modules/cloud_dsl_test.rb +25 -0
- data/test/poolparty/net/remoter_bases/vmrun/vmrun_test.rb +50 -0
- data/test/poolparty/net/remoter_test.rb +14 -0
- data/test/poolparty/poolparty/neighborhood_test.rb +23 -0
- data/test/poolparty/poolparty/poolparty_base_class_test.rb +84 -0
- data/test/poolparty/verification/verify_test.rb +49 -0
- data/test/test_helper.rb +4 -1
- data/test/test_poolparty.rb +6 -5
- data/vendor/chef/apache2/attributes/apache.rb +1 -1
- data/vendor/chef/apache2/templates/default/default-site.erb +1 -1
- data/vendor/chef/chef-deploy/LICENSE +201 -0
- data/vendor/chef/chef-deploy/README.rdoc +24 -0
- data/vendor/chef/chef-deploy/Rakefile +57 -0
- data/vendor/chef/chef-deploy/TODO +4 -0
- data/vendor/chef/chef-deploy/lib/chef-deploy/cached_deploy.rb +230 -0
- data/vendor/chef/chef-deploy/lib/chef-deploy/git.rb +132 -0
- data/vendor/chef/chef-deploy/lib/chef-deploy/subversion.rb +98 -0
- data/vendor/chef/chef-deploy/lib/chef-deploy.rb +183 -0
- metadata +57 -252
- data/bin/cloud-run +0 -18
- data/bin/cloud-stats +0 -17
- data/bin/ec2-list-active +0 -24
- data/bin/pool +0 -31
- data/bin/pool-describe +0 -8
- data/bin/pool-generate +0 -18
- data/bin/pool-init +0 -28
- data/bin/pool-list +0 -30
- data/bin/pool-start +0 -26
- data/bin/server-list-instances +0 -15
- data/lib/erlang/messenger/Emakefile +0 -1
- data/lib/erlang/messenger/Makefile +0 -15
- data/lib/erlang/messenger/README +0 -5
- data/lib/erlang/messenger/Rakefile +0 -72
- data/lib/erlang/messenger/control +0 -11
- data/lib/erlang/messenger/ebin/client.app +0 -19
- data/lib/erlang/messenger/ebin/master.app +0 -19
- data/lib/erlang/messenger/ebin/node.app +0 -19
- data/lib/erlang/messenger/ebin/packager.app +0 -19
- data/lib/erlang/messenger/ebin/pm_client_rel-0.1.rel +0 -1
- data/lib/erlang/messenger/ebin/pm_master_rel-0.1.rel +0 -1
- data/lib/erlang/messenger/ebin/pm_node_rel-0.1.rel +0 -1
- data/lib/erlang/messenger/include/defines.hrl +0 -27
- data/lib/erlang/messenger/lib/eunit/AUTHORS +0 -2
- data/lib/erlang/messenger/lib/eunit/CHANGELOG +0 -14
- data/lib/erlang/messenger/lib/eunit/COPYING +0 -504
- data/lib/erlang/messenger/lib/eunit/Makefile +0 -28
- data/lib/erlang/messenger/lib/eunit/NOTES +0 -276
- data/lib/erlang/messenger/lib/eunit/README +0 -3
- data/lib/erlang/messenger/lib/eunit/doc/edoc-info +0 -3
- data/lib/erlang/messenger/lib/eunit/doc/erlang.png +0 -0
- data/lib/erlang/messenger/lib/eunit/doc/eunit.html +0 -172
- data/lib/erlang/messenger/lib/eunit/doc/index.html +0 -17
- data/lib/erlang/messenger/lib/eunit/doc/modules-frame.html +0 -12
- data/lib/erlang/messenger/lib/eunit/doc/overview-summary.html +0 -984
- data/lib/erlang/messenger/lib/eunit/doc/overview.edoc +0 -980
- data/lib/erlang/messenger/lib/eunit/doc/packages-frame.html +0 -11
- data/lib/erlang/messenger/lib/eunit/doc/stylesheet.css +0 -55
- data/lib/erlang/messenger/lib/eunit/ebin/autoload.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/code_monitor.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit.app +0 -21
- data/lib/erlang/messenger/lib/eunit/ebin/eunit.appup +0 -1
- data/lib/erlang/messenger/lib/eunit/ebin/eunit.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_autoexport.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_data.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_lib.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_proc.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_serial.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_server.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_striptests.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_test.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_tests.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_tty.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/file_monitor.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/examples/eunit_examples.erl +0 -339
- data/lib/erlang/messenger/lib/eunit/examples/fib.erl +0 -19
- data/lib/erlang/messenger/lib/eunit/examples/tests.txt +0 -1
- data/lib/erlang/messenger/lib/eunit/include/eunit.hrl +0 -313
- data/lib/erlang/messenger/lib/eunit/src/Makefile +0 -46
- data/lib/erlang/messenger/lib/eunit/src/autoload.erl +0 -388
- data/lib/erlang/messenger/lib/eunit/src/code_monitor.erl +0 -243
- data/lib/erlang/messenger/lib/eunit/src/eunit.app.src +0 -21
- data/lib/erlang/messenger/lib/eunit/src/eunit.appup.src +0 -1
- data/lib/erlang/messenger/lib/eunit/src/eunit.erl +0 -196
- data/lib/erlang/messenger/lib/eunit/src/eunit_autoexport.erl +0 -102
- data/lib/erlang/messenger/lib/eunit/src/eunit_data.erl +0 -798
- data/lib/erlang/messenger/lib/eunit/src/eunit_internal.hrl +0 -48
- data/lib/erlang/messenger/lib/eunit/src/eunit_lib.erl +0 -682
- data/lib/erlang/messenger/lib/eunit/src/eunit_proc.erl +0 -552
- data/lib/erlang/messenger/lib/eunit/src/eunit_serial.erl +0 -157
- data/lib/erlang/messenger/lib/eunit/src/eunit_server.erl +0 -340
- data/lib/erlang/messenger/lib/eunit/src/eunit_striptests.erl +0 -64
- data/lib/erlang/messenger/lib/eunit/src/eunit_test.erl +0 -334
- data/lib/erlang/messenger/lib/eunit/src/eunit_tests.erl +0 -45
- data/lib/erlang/messenger/lib/eunit/src/eunit_tty.erl +0 -272
- data/lib/erlang/messenger/lib/eunit/src/file_monitor.erl +0 -409
- data/lib/erlang/messenger/lib/eunit/sys.config +0 -9
- data/lib/erlang/messenger/lib/eunit/vsn.mk +0 -1
- data/lib/erlang/messenger/pm_client_rel-0.1.boot +0 -0
- data/lib/erlang/messenger/pm_client_rel-0.1.script +0 -238
- data/lib/erlang/messenger/pm_master_rel-0.1.boot +0 -0
- data/lib/erlang/messenger/pm_master_rel-0.1.script +0 -239
- data/lib/erlang/messenger/pm_node_rel-0.1.boot +0 -0
- data/lib/erlang/messenger/pm_node_rel-0.1.script +0 -237
- data/lib/erlang/messenger/src/client_app.erl +0 -39
- data/lib/erlang/messenger/src/client_server.erl +0 -60
- data/lib/erlang/messenger/src/master_app.erl +0 -39
- data/lib/erlang/messenger/src/node_app.erl +0 -39
- data/lib/erlang/messenger/src/pm_client.erl +0 -49
- data/lib/erlang/messenger/src/pm_client_supervisor.erl +0 -38
- data/lib/erlang/messenger/src/pm_cluster.erl +0 -61
- data/lib/erlang/messenger/src/pm_event_manager.erl +0 -27
- data/lib/erlang/messenger/src/pm_master.erl +0 -215
- data/lib/erlang/messenger/src/pm_master_event_handler.erl +0 -72
- data/lib/erlang/messenger/src/pm_master_supervisor.erl +0 -39
- data/lib/erlang/messenger/src/pm_node.erl +0 -200
- data/lib/erlang/messenger/src/pm_node_supervisor.erl +0 -38
- data/lib/erlang/messenger/src/pm_packager.erl +0 -76
- data/lib/erlang/messenger/src/pm_spawner.erl +0 -213
- data/lib/erlang/messenger/src/pm_strings.erl +0 -11
- data/lib/erlang/messenger/src/utils.erl +0 -72
- data/lib/erlang/messenger/useful_snippets +0 -17
- data/lib/poolparty/monitors/monitors/server_monitor.rb +0 -7
- data/lib/poolparty/monitors/monitors/web_monitor.rb +0 -18
- data/lib/poolparty/monitors/neighborhood_monitor.rb +0 -24
- data/lib/poolparty/monitors.rb +0 -6
- data/lib/poolparty/net/remoter/lists.rb +0 -12
- data/lib/poolparty/poolparty/custom_resource.rb +0 -45
- data/lib/poolparty/resources/custom_service.rb +0 -30
- data/lib/poolparty/services/gem_package.rb +0 -52
- data/lib/poolparty/version.rb +0 -15
- data/spec/poolparty/plugins/svn_spec.rb +0 -16
- data/spec/poolparty/poolparty/custom_resource_spec.rb +0 -79
- data/vendor/gems/butterfly/History.txt +0 -4
- data/vendor/gems/butterfly/PostInstall.txt +0 -2
- data/vendor/gems/butterfly/README.rdoc +0 -48
- data/vendor/gems/butterfly/Rakefile +0 -62
- data/vendor/gems/butterfly/VERSION.yml +0 -4
- data/vendor/gems/butterfly/bin/flutter +0 -4
- data/vendor/gems/butterfly/butterfly.gemspec +0 -37
- data/vendor/gems/butterfly/examples/config.ru +0 -15
- data/vendor/gems/butterfly/examples/my_app.rb +0 -12
- data/vendor/gems/butterfly/lib/butterfly.rb +0 -14
- data/vendor/gems/butterfly/lib/handler.rb +0 -48
- data/vendor/gems/butterfly/lib/request.rb +0 -29
- data/vendor/gems/butterfly/lib/response.rb +0 -49
- data/vendor/gems/butterfly/script/console +0 -10
- data/vendor/gems/butterfly/script/destroy +0 -14
- data/vendor/gems/butterfly/script/generate +0 -14
- data/vendor/gems/butterfly/test/test_adapter_base.rb +0 -23
- data/vendor/gems/butterfly/test/test_butterfly_request.rb +0 -46
- data/vendor/gems/butterfly/test/test_butterfly_response.rb +0 -43
- data/vendor/gems/butterfly/test/test_butterfly_server.rb +0 -16
- data/vendor/gems/butterfly/test/test_default.rb +0 -12
- data/vendor/gems/butterfly/test/test_helper.rb +0 -6
- data/vendor/gems/dslify/History.txt +0 -4
- data/vendor/gems/dslify/Manifest.txt +0 -25
- data/vendor/gems/dslify/PostInstall.txt +0 -5
- data/vendor/gems/dslify/README.txt +0 -60
- data/vendor/gems/dslify/Rakefile +0 -56
- data/vendor/gems/dslify/config/hoe.rb +0 -73
- data/vendor/gems/dslify/config/requirements.rb +0 -15
- data/vendor/gems/dslify/dslify.gemspec +0 -40
- data/vendor/gems/dslify/lib/dslify/dslify.rb +0 -69
- data/vendor/gems/dslify/lib/dslify/version.rb +0 -10
- data/vendor/gems/dslify/lib/dslify.rb +0 -7
- data/vendor/gems/dslify/script/console +0 -10
- data/vendor/gems/dslify/script/destroy +0 -14
- data/vendor/gems/dslify/script/generate +0 -14
- data/vendor/gems/dslify/script/txt2html +0 -82
- data/vendor/gems/dslify/setup.rb +0 -1585
- data/vendor/gems/dslify/tasks/deployment.rake +0 -34
- data/vendor/gems/dslify/tasks/environment.rake +0 -7
- data/vendor/gems/dslify/tasks/website.rake +0 -17
- data/vendor/gems/dslify/test/test_dslify.rb +0 -114
- data/vendor/gems/dslify/website/index.html +0 -86
- data/vendor/gems/dslify/website/index.txt +0 -83
- data/vendor/gems/dslify/website/javascripts/rounded_corners_lite.inc.js +0 -285
- data/vendor/gems/dslify/website/stylesheets/screen.css +0 -138
- data/vendor/gems/dslify/website/template.html.erb +0 -48
- data/vendor/gems/parenting/History.txt +0 -4
- data/vendor/gems/parenting/Manifest.txt +0 -13
- data/vendor/gems/parenting/PostInstall.txt +0 -2
- data/vendor/gems/parenting/README.rdoc +0 -47
- data/vendor/gems/parenting/Rakefile +0 -28
- data/vendor/gems/parenting/lib/parenting/base.rb +0 -65
- data/vendor/gems/parenting/lib/parenting.rb +0 -10
- data/vendor/gems/parenting/parenting.gemspec +0 -39
- data/vendor/gems/parenting/script/console +0 -10
- data/vendor/gems/parenting/script/destroy +0 -14
- data/vendor/gems/parenting/script/generate +0 -14
- data/vendor/gems/parenting/test/file_to_eval.rb +0 -9
- data/vendor/gems/parenting/test/test_helper.rb +0 -5
- data/vendor/gems/parenting/test/test_parenting.rb +0 -89
- data/vendor/gems/suitcase/LICENSE +0 -20
- data/vendor/gems/suitcase/README.rdoc +0 -31
- data/vendor/gems/suitcase/Rakefile +0 -57
- data/vendor/gems/suitcase/VERSION.yml +0 -4
- data/vendor/gems/suitcase/lib/suitcase/unzipper.rb +0 -15
- data/vendor/gems/suitcase/lib/suitcase/zipper.rb +0 -119
- data/vendor/gems/suitcase/lib/suitcase.rb +0 -5
- data/vendor/gems/suitcase/suitcase.gemspec +0 -32
- data/vendor/gems/suitcase/test/suitcase_test.rb +0 -102
- data/vendor/gems/suitcase/test/test_dir/box.rb +0 -1
- data/vendor/gems/suitcase/test/test_dir/test.txt +0 -1
- data/vendor/gems/suitcase/test/test_helper.rb +0 -12
@@ -23,19 +23,25 @@ module PoolParty
|
|
23
23
|
# This class is the base class for all remote types, such as ec2
|
24
24
|
# Everything remoting-wise is derived from this class
|
25
25
|
class RemoterBase
|
26
|
-
include
|
26
|
+
include Dslify
|
27
|
+
include ::PoolParty::Remote
|
27
28
|
|
28
|
-
|
29
|
-
@parent = prnt
|
30
|
-
end
|
29
|
+
attr_reader :cloud
|
31
30
|
|
32
|
-
def
|
33
|
-
if
|
34
|
-
|
35
|
-
|
36
|
-
super
|
37
|
-
end
|
31
|
+
def initialize(prnt, opts={}, &block)
|
32
|
+
dsl_options prnt.options.merge(opts) if prnt && prnt.respond_to?(:options)
|
33
|
+
instance_eval &block if block
|
34
|
+
@cloud = prnt
|
38
35
|
end
|
36
|
+
|
37
|
+
|
38
|
+
# def method_missing(meth, *args, &block)
|
39
|
+
# if @cloud
|
40
|
+
# @cloud.send meth, *args, &block rescue super
|
41
|
+
# else
|
42
|
+
# super
|
43
|
+
# end
|
44
|
+
# end
|
39
45
|
|
40
46
|
# Required methods
|
41
47
|
# The next methods are required on all RemoteInstance types
|
@@ -43,38 +49,105 @@ module PoolParty
|
|
43
49
|
# An exception will be raised and poolparty will explode into tiny little
|
44
50
|
# pieces. Don't forget to overwrite these methods
|
45
51
|
# Launch a new instance
|
46
|
-
def self.launch_new_instance!(o={})
|
47
|
-
|
52
|
+
def self.launch_new_instance!(cld, o={})
|
53
|
+
new(cld, o).launch_new_instance!(o)
|
48
54
|
end
|
49
|
-
def self.expand(o={});launch_new_instance!(o);end
|
50
55
|
def launch_new_instance!(o={})
|
51
|
-
|
56
|
+
raise RemoteException.new(:method_not_defined, "launch_new_instance!")
|
52
57
|
end
|
53
58
|
|
54
59
|
# Terminate an instance by id
|
55
|
-
def self.terminate_instance!(o={})
|
56
|
-
|
60
|
+
def self.terminate_instance!(cld, o={})
|
61
|
+
new(cld, o).terminate_instance!(o)
|
57
62
|
end
|
58
|
-
def
|
59
|
-
|
60
|
-
self.class.terminate_instance!(o ? options.merge(o) : options)
|
63
|
+
def terminate_instance!(o={})
|
64
|
+
raise RemoteException.new(:method_not_defined, "terminate_instance!")
|
61
65
|
end
|
62
66
|
|
63
67
|
# Describe an instance's status
|
64
|
-
def self.describe_instance(o={})
|
65
|
-
|
68
|
+
def self.describe_instance(cld, o={})
|
69
|
+
new(cld, o).describe_instance(o)
|
66
70
|
end
|
67
71
|
def describe_instance(o={})
|
68
|
-
|
72
|
+
raise RemoteException.new(:method_not_defined, "describe_instance")
|
69
73
|
end
|
70
74
|
|
71
75
|
# Get instances
|
72
76
|
# The instances must have a status associated with them on the hash
|
73
|
-
def self.describe_instances(o={})
|
77
|
+
def self.describe_instances(cld, o={})
|
78
|
+
new(cld, o).describe_instances(o)
|
79
|
+
end
|
80
|
+
def describe_instances(o={})
|
74
81
|
raise RemoteException.new(:method_not_defined, "describe_instances")
|
75
82
|
end
|
76
|
-
|
77
|
-
|
83
|
+
|
84
|
+
# TODO: Rename and modularize the @inst.status =~ /pending/ so that it works on all
|
85
|
+
# remoter_bases
|
86
|
+
def launch_instance!(o={}, &block)
|
87
|
+
@inst = launch_new_instance!( o )
|
88
|
+
sleep(2)
|
89
|
+
|
90
|
+
cloud.dputs "#{cloud.name} launched instance checking for ip..."
|
91
|
+
|
92
|
+
# Wait for 10 minutes for the instance to gain an ip if it doesn't already have one
|
93
|
+
500.times do |i|
|
94
|
+
break if @inst[:ip] =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
|
95
|
+
sleep(2)
|
96
|
+
@inst = describe_instance(@inst)
|
97
|
+
cloud.dprint "."
|
98
|
+
end
|
99
|
+
cloud.dputs "Found an ip"
|
100
|
+
cloud.dputs "#{@cloud.name} Launched instance #{@inst[:ip]}"
|
101
|
+
cloud.dputs " waiting for it to respond"
|
102
|
+
|
103
|
+
# Try for 10 minutes to pint port 22
|
104
|
+
500.times do |i|
|
105
|
+
cloud.dprint "."
|
106
|
+
if ping_port(@inst[:ip], 22)
|
107
|
+
cloud.dputs ""
|
108
|
+
cloud.started_instance = @inst
|
109
|
+
|
110
|
+
cloud.call_after_launch_instance_callbacks(@inst)
|
111
|
+
block.call(@inst) if block
|
112
|
+
# after_launch_instance(@inst)
|
113
|
+
cloud.call_after_launch_instance_callbacks(@inst)
|
114
|
+
return @inst
|
115
|
+
end
|
116
|
+
sleep(2)
|
117
|
+
end
|
118
|
+
raise "Instance not responding at #{inst.ip}"
|
119
|
+
end
|
120
|
+
|
121
|
+
def self.launch_instance!(cld, o={}, &block)
|
122
|
+
new(cld, o, &block).launch_instance!
|
123
|
+
end
|
124
|
+
|
125
|
+
# Called after an instance is launched
|
126
|
+
def after_launch_instance(instance=nil)
|
127
|
+
puts "after_launch_instance in remoter_base"
|
128
|
+
end
|
129
|
+
|
130
|
+
#TODO: Remove
|
131
|
+
# def self.when_instance_is_responding(inst, &block)
|
132
|
+
# if ping_port(inst.ip, 22)
|
133
|
+
# block.call if block
|
134
|
+
# else
|
135
|
+
# raise "Instance not responding at #{inst.ip}"
|
136
|
+
# end
|
137
|
+
# end
|
138
|
+
# def when_instance_is_responding(inst, &block);self.class.when_instance_is_responding;end
|
139
|
+
|
140
|
+
# TODO: BAD FORM, already defined in connections.rb. Fix this, ASAP
|
141
|
+
def self.ping_port(host, port=22, retry_times=400)
|
142
|
+
connected = false
|
143
|
+
retry_times.times do |i|
|
144
|
+
begin
|
145
|
+
break if connected = TCPSocket.new(host, port).is_a?(TCPSocket)
|
146
|
+
rescue Exception => e
|
147
|
+
sleep(2)
|
148
|
+
end
|
149
|
+
end
|
150
|
+
connected
|
78
151
|
end
|
79
152
|
|
80
153
|
# After launch callback
|
@@ -1,8 +1,7 @@
|
|
1
1
|
=begin rdoc
|
2
2
|
EC2 Remoter Base
|
3
3
|
|
4
|
-
This serves as the basis for running PoolParty on Amazon's ec2 cloud
|
5
|
-
cluster.
|
4
|
+
This serves as the basis for running PoolParty on Amazon's ec2 cloud.
|
6
5
|
=end
|
7
6
|
require "date"
|
8
7
|
require "#{::File.dirname(__FILE__)}/ec2_response_object"
|
@@ -36,19 +35,27 @@ end
|
|
36
35
|
module PoolParty
|
37
36
|
module Remote
|
38
37
|
class Ec2 < Remote::RemoterBase
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
38
|
+
|
39
|
+
default_options({
|
40
|
+
:image_id => 'ami-bf5eb9d6',
|
41
|
+
# :key_name => ::File.basename(keypair.is_a?(String) ? keypair : keypair.full_filepath),
|
42
|
+
:instance_type => 'm1.small', # or 'm1.large', 'm1.xlarge', 'c1.medium', or 'c1.xlarge'
|
43
|
+
:addressing_type => "public",
|
44
|
+
:availabilty_zone => "us-east-1a",
|
45
|
+
:security_group => ["default"]
|
46
|
+
})
|
47
|
+
|
48
|
+
# Requires a hash of options
|
49
|
+
def self.launch_new_instance!(parent_cloud, o)
|
50
|
+
new(parent_cloud, o).launch_new_instance!
|
51
|
+
end
|
52
|
+
|
53
|
+
# TODO: Fix the key_name issue
|
54
|
+
# Start a new instance with the given options
|
55
|
+
def launch_new_instance!(o={})
|
56
|
+
raise "You must pass a keypair to launch an instance, or else you will not be able to login. options = #{o.inspect}" if !cloud.keypair
|
57
|
+
o.merge!( options ).merge!(:key_name=>keypair.basename)
|
58
|
+
instance = ec2(o).run_instances(o)
|
52
59
|
begin
|
53
60
|
h = EC2ResponseObject.get_hash_from_response(instance.instancesSet.item.first)
|
54
61
|
#h = instance.instancesSet.item.first
|
@@ -59,17 +66,17 @@ module PoolParty
|
|
59
66
|
h
|
60
67
|
end
|
61
68
|
# Terminate an instance by id
|
62
|
-
def
|
69
|
+
def terminate_instance!(o={})
|
63
70
|
ec2(o).terminate_instances(:instance_id => o[:instance_id])
|
64
71
|
end
|
65
72
|
# Describe an instance's status
|
66
|
-
def
|
73
|
+
def describe_instance(o={})
|
67
74
|
return describe_instances.first if o[:instance_id].nil?
|
68
75
|
describe_instances.detect {|a| a[:name] == o[:instance_id] || a[:ip] == o[:instance_id] || a[:instance_id] == o[:instance_id] }
|
69
76
|
end
|
70
|
-
def
|
77
|
+
def describe_instances(o={})
|
71
78
|
id = 0
|
72
|
-
get_instances_description(o).each_with_index do |h,i|
|
79
|
+
get_instances_description(options.merge(o)).each_with_index do |h,i|
|
73
80
|
if h[:status] == "running"
|
74
81
|
inst_name = id == 0 ? "master" : "node#{id}"
|
75
82
|
id += 1
|
@@ -83,24 +90,39 @@ module PoolParty
|
|
83
90
|
:index => i, #TODO MF get the instance id from the aws result instead
|
84
91
|
:launching_time => (h[:launching_time])
|
85
92
|
})
|
86
|
-
end.sort {|a,b| a[:index] <=> b[:index] }
|
93
|
+
end.compact.sort {|a,b| a[:index] <=> b[:index] }
|
87
94
|
end
|
88
95
|
|
89
|
-
|
96
|
+
# ===================================
|
97
|
+
# = Ec2 Specific methods below here =
|
98
|
+
# ===================================
|
99
|
+
|
100
|
+
# return or create a new base EC2 connection object that will actually connect to ec2
|
101
|
+
def ec2(o={})
|
90
102
|
@ec2 ||= EC2::Base.new( :access_key_id => o[:access_key],
|
91
103
|
:secret_access_key => o[:secret_access_key]
|
92
104
|
)
|
93
105
|
end
|
106
|
+
def self.ec2(o)
|
107
|
+
@ec2 ||= self.class.ec2(o)
|
108
|
+
end
|
109
|
+
|
94
110
|
# Get the ec2 description for the response in a hash format
|
95
|
-
def
|
96
|
-
|
111
|
+
def get_instances_description(o={})
|
112
|
+
#TODO: only use keypair.full_filepath
|
113
|
+
key_hash = {:keypair => ::File.basename(keypair.is_a?(String) ? keypair : keypair.full_filepath)}
|
114
|
+
EC2ResponseObject.get_descriptions(ec2(o).describe_instances).select_with_hash(key_hash)
|
97
115
|
end
|
98
116
|
def get_descriptions(o={})
|
99
117
|
self.class.get_descriptions(o)
|
100
118
|
end
|
101
119
|
|
120
|
+
def keypair
|
121
|
+
cloud.keypair
|
122
|
+
end
|
123
|
+
|
102
124
|
# Class method helpers
|
103
|
-
def
|
125
|
+
def aws_keys
|
104
126
|
unless @access_key && @secret_access_key
|
105
127
|
aws_keys = {}
|
106
128
|
aws_keys = YAML::load( File.open('/etc/poolparty/aws_keys.yml') ) rescue 'No aws_keys.yml file. Will try to use enviornment variables'
|
@@ -109,25 +131,11 @@ module PoolParty
|
|
109
131
|
end
|
110
132
|
[@access_key, @secret_access_key]
|
111
133
|
end
|
112
|
-
|
113
|
-
def
|
114
|
-
|
115
|
-
|
116
|
-
begin
|
117
|
-
# when_no_pending_instances do
|
118
|
-
if instance
|
119
|
-
attach_volume(instance)
|
120
|
-
# Let's associate the address LAST so that we can still connect to the instance
|
121
|
-
# for the other tasks here
|
122
|
-
associate_address(instance)
|
123
|
-
reset_remoter_base!
|
124
|
-
end
|
125
|
-
# end
|
126
|
-
rescue Exception => e
|
127
|
-
vputs "Error in after_launch_master: #{e}"
|
134
|
+
|
135
|
+
def after_launch_instance(inst)
|
136
|
+
if inst
|
137
|
+
associate_address(inst)
|
128
138
|
end
|
129
|
-
reset_remoter_base!
|
130
|
-
when_all_assigned_ips {wait "5.seconds"}
|
131
139
|
end
|
132
140
|
|
133
141
|
# Attach a volume to the instance
|
@@ -139,13 +147,41 @@ module PoolParty
|
|
139
147
|
ec2.attach_volume(:volume_id => ebs_volume_id, :instance_id => instance.instance_id, :device => ebs_volume_device) if ebs_volume_id && ebs_volume_mount_point
|
140
148
|
end
|
141
149
|
end
|
150
|
+
|
142
151
|
# Associate an address with the instance using ec2
|
143
|
-
#
|
152
|
+
# Get the next_unused_elastic_ip
|
153
|
+
# and if there is one, associate the instance to the
|
154
|
+
# public ip
|
144
155
|
def associate_address(instance=nil)
|
145
|
-
if
|
146
|
-
|
147
|
-
instance
|
148
|
-
|
156
|
+
if ip = next_unused_elastic_ip
|
157
|
+
vputs "Associating #{instance.instance_id} with #{ip}"
|
158
|
+
ec2.associate_address(:instance_id => instance.instance_id, :public_ip => ip)
|
159
|
+
end
|
160
|
+
end
|
161
|
+
|
162
|
+
# Get the next usable elastic ip
|
163
|
+
# First, get the list of addresses from ec2 that the client
|
164
|
+
# has access to, then select only the ones that are not associated
|
165
|
+
# with an instance.
|
166
|
+
# If the cloud has set elastic_ips to use, then, using the
|
167
|
+
# intersection of the unused ips and those, find the first one available
|
168
|
+
# and return that, otherwise, return the first elastic ip available
|
169
|
+
def next_unused_elastic_ip
|
170
|
+
# [{"instanceId"=>nil, "publicIp"=>"174.129.212.93"}, {"instanceId"=>nil, "publicIp"=>"174.129.212.94"}]
|
171
|
+
if addressesSet = ec2(options).describe_addresses["addressesSet"]
|
172
|
+
begin
|
173
|
+
empty_addresses = addressesSet["item"].select {|i| i["instanceId"].nil? }
|
174
|
+
ips = empty_addresses.map {|addr| addr["publicIp"]}
|
175
|
+
if cloud.elastic_ips?
|
176
|
+
ips_to_use = cloud.elastic_ips & ips
|
177
|
+
ips_to_use.first
|
178
|
+
else
|
179
|
+
ips.first
|
180
|
+
end
|
181
|
+
rescue Exception => e
|
182
|
+
puts "Error: #{e}"
|
183
|
+
nil
|
184
|
+
end
|
149
185
|
end
|
150
186
|
end
|
151
187
|
|
@@ -166,25 +202,6 @@ module PoolParty
|
|
166
202
|
ec2.create_snapshot(:volume_id => ebs_volume_id)
|
167
203
|
end
|
168
204
|
|
169
|
-
# EC2 connections
|
170
|
-
def ec2(o={})
|
171
|
-
@ec2 ||= self.class.ec2(o)
|
172
|
-
end
|
173
|
-
|
174
|
-
# These are tasks that run before the configuration runs
|
175
|
-
def before_configuration_tasks
|
176
|
-
if set_master_ip_to && master.ip && master.ip.to_s != set_master_ip_to.to_s
|
177
|
-
associate_address(master)
|
178
|
-
reset_remoter_base!
|
179
|
-
|
180
|
-
when_no_pending_instances do
|
181
|
-
when_all_assigned_ips do
|
182
|
-
vputs "Associated master with #{set_master_ip_to}"
|
183
|
-
end
|
184
|
-
end
|
185
|
-
end
|
186
|
-
|
187
|
-
end
|
188
205
|
def has_cert_and_key?
|
189
206
|
pub_key && private_key
|
190
207
|
end
|
@@ -0,0 +1,33 @@
|
|
1
|
+
=begin rdoc
|
2
|
+
Vmx file creator
|
3
|
+
|
4
|
+
Usage:
|
5
|
+
Vmx.new({
|
6
|
+
:name => "MyPP",
|
7
|
+
:vmx_disk => {
|
8
|
+
:image_size => "2G"
|
9
|
+
},
|
10
|
+
:base_directory => "/tmp/vmx"
|
11
|
+
}).compile
|
12
|
+
=end
|
13
|
+
class Vmx
|
14
|
+
include Dslify
|
15
|
+
|
16
|
+
default_options(
|
17
|
+
:name => "PoolParty",
|
18
|
+
:base_directory => "~/Documents/Virtual\ Machines.localized"
|
19
|
+
)
|
20
|
+
|
21
|
+
def initialize(o={})
|
22
|
+
dsl_options o
|
23
|
+
@vmx_file = VmxFile.new o
|
24
|
+
@vmx_disk = VmxDisk.new o
|
25
|
+
end
|
26
|
+
|
27
|
+
def compile
|
28
|
+
::FileUtils.mkdir_p "#{base_directory}/#{options[:name]}"
|
29
|
+
vmdk = @vmx_disk.compile
|
30
|
+
@vmx_file.set("ide0:0.fileName", vmdk)
|
31
|
+
@vmx_file.compile
|
32
|
+
end
|
33
|
+
end
|
@@ -0,0 +1,117 @@
|
|
1
|
+
class VmxFile
|
2
|
+
include Dslify
|
3
|
+
|
4
|
+
default_options(
|
5
|
+
".encoding" => "UTF-8",
|
6
|
+
"config.version" => "8",
|
7
|
+
"virtualHW.version" => "6",
|
8
|
+
"guestOS" => "other26xlinux",
|
9
|
+
"displayName" => "PoolParty vmx",
|
10
|
+
"vumvcpus" => "1",
|
11
|
+
"memsize" => "256",
|
12
|
+
"MemAllowAutoScaleDown" => "TRUE",
|
13
|
+
"MemTrimRate" => "-1",
|
14
|
+
"gui.powerOnAtStartup" => "FALSE",
|
15
|
+
"gui.fullScreenAtPowerOn" => "FALSE",
|
16
|
+
"gui.exitAtPowerOff" => "FALSE",
|
17
|
+
"uuid.action" => "create",
|
18
|
+
# Settings for VMware Tools
|
19
|
+
"tools.remindInstall" => "FALSE",
|
20
|
+
"tools.upgrade.policy" => "upgradeAtPowerCycle",
|
21
|
+
# Startup hints interfers with automatic startup of a virtual machine
|
22
|
+
# This setting has no effect in VMware Player
|
23
|
+
"hints.hideAll" => "TRUE",
|
24
|
+
|
25
|
+
# Enable time synchronization between computer
|
26
|
+
# and virtual machine
|
27
|
+
"tools.syncTime" => "TRUE",
|
28
|
+
|
29
|
+
# USB settings
|
30
|
+
# This config activates USB
|
31
|
+
"usb.present" => "TRUE",
|
32
|
+
"usb.generic.autoconnect" => "FALSE",
|
33
|
+
|
34
|
+
# First serial port, physical COM1 is available
|
35
|
+
"serial0.present" => "FALSE",
|
36
|
+
"serial0.fileName" => "Auto Detect",
|
37
|
+
"serial0.autodetect" => "TRUE",
|
38
|
+
"serial0.hardwareFlowControl" => "TRUE",
|
39
|
+
|
40
|
+
# Optional second serial port, physical COM2 is not available
|
41
|
+
"serial1.present" => "FALSE",
|
42
|
+
|
43
|
+
# First parallel port, physical LPT1 is available
|
44
|
+
"parallel0.present" => "FALSE",
|
45
|
+
"parallel0.fileName" => "Auto Detect",
|
46
|
+
"parallel0.autodetect" => "TRUE",
|
47
|
+
"parallel0.bidirectional" => "TRUE",
|
48
|
+
|
49
|
+
# Sound settings
|
50
|
+
"sound.present" => "TRUE",
|
51
|
+
"sound.fileName" => "-1",
|
52
|
+
"sound.autodetect" => "TRUE",
|
53
|
+
|
54
|
+
# Logging
|
55
|
+
# This config activates logging, and keeps last log
|
56
|
+
"logging" => "TRUE",
|
57
|
+
"log.fileName" => "PoolParty.log",
|
58
|
+
"log.append" => "TRUE",
|
59
|
+
"log.keepOld" => "3",
|
60
|
+
|
61
|
+
# These settings decides interaction between your
|
62
|
+
# computer and the virtual machine
|
63
|
+
"isolation.tools.hgfs.disable" => "FALSE",
|
64
|
+
"isolation.tools.dnd.disable" => "FALSE",
|
65
|
+
"isolation.tools.copy.enable" => "TRUE",
|
66
|
+
"isolation.tools.paste.enabled" => "TRUE",
|
67
|
+
|
68
|
+
# Other default settings
|
69
|
+
"svga.autodetect" => "TRUE",
|
70
|
+
"mks.keyboardFilter" => "allow",
|
71
|
+
"snapshot.action" => "autoCommit",
|
72
|
+
|
73
|
+
# First network interface card
|
74
|
+
"ethernet0.present" => "TRUE",
|
75
|
+
"ethernet0.virtualDev" => "vlance",
|
76
|
+
"ethernet0.connectionType" => "nat",
|
77
|
+
"ethernet0.addressType" => "generated",
|
78
|
+
"ethernet0.generatedAddressOffset" => "0",
|
79
|
+
|
80
|
+
# Settings for physical floppy drive
|
81
|
+
"floppy0.present" => "FALSE",
|
82
|
+
|
83
|
+
# First IDE disk, size 4800Mb
|
84
|
+
"ide0:0.present" => "TRUE",
|
85
|
+
"ide0:0.fileName" => "PoolParty.vmdk",
|
86
|
+
"ide0:0.mode" => "persistent",
|
87
|
+
"ide0:0.startConnected" => "TRUE",
|
88
|
+
"ide0:0.writeThrough" => "TRUE",
|
89
|
+
|
90
|
+
"checkpoint.vmState" => "",
|
91
|
+
"ethernet0.generatedAddress" => "00:0c:29:73:79:fb",
|
92
|
+
"virtualHW.productCompatibility" => "hosted",
|
93
|
+
"ide0:0.redo" => "",
|
94
|
+
"vmotion.checkpointFBSize" => "65536000",
|
95
|
+
"parallel0.startConnected" => "FALSE",
|
96
|
+
"serial0.startConnected" => "FALSE"
|
97
|
+
)
|
98
|
+
|
99
|
+
def initialize(o={})
|
100
|
+
dsl_options({:vmx_file => default_dsl_options}.merge(o))
|
101
|
+
end
|
102
|
+
|
103
|
+
def set(k,v)
|
104
|
+
options[:vmx_file]["#{k}"] = v
|
105
|
+
end
|
106
|
+
|
107
|
+
def compile
|
108
|
+
::File.open("#{base_directory}/#{name}/#{name}.vmx", "w") {|f| f << to_vmx }
|
109
|
+
end
|
110
|
+
def to_vmx
|
111
|
+
out = []
|
112
|
+
options[:vmx_file].each do |k,v|
|
113
|
+
out << "#{k}=\"#{v}\""
|
114
|
+
end
|
115
|
+
out.join("\n")
|
116
|
+
end
|
117
|
+
end
|