diff options
| -rwxr-xr-x | bin/leap | 7 | ||||
| -rw-r--r-- | lib/leap_cli/commands/deploy.rb | 6 | ||||
| -rw-r--r-- | lib/leap_cli/commands/vagrant.rb | 6 | ||||
| -rw-r--r-- | test/test_helper.rb | 4 | ||||
| -rw-r--r-- | test/unit/config_object_list_test.rb | 2 | ||||
| -rw-r--r-- | test/unit/config_object_test.rb | 2 |
6 files changed, 19 insertions, 8 deletions
@@ -62,6 +62,13 @@ module LeapCli::Commands end # + # make provider config available as 'provider' + # + def self.provider + manager.provider + end + + # # info about leap command line suite # program_desc LeapCli::SUMMARY diff --git a/lib/leap_cli/commands/deploy.rb b/lib/leap_cli/commands/deploy.rb index 37901f4..3cc1d58 100644 --- a/lib/leap_cli/commands/deploy.rb +++ b/lib/leap_cli/commands/deploy.rb @@ -24,7 +24,7 @@ module LeapCli ssh.leap.assert_initialized end - ssh.leap.log :syching, "configuration files" do + ssh.leap.log :synching, "configuration files" do sync_hiera_config(ssh) sync_support_files(ssh) end @@ -44,7 +44,7 @@ module LeapCli private def sync_hiera_config(ssh) - dest_dir = manager.provider.hiera_sync_destination + dest_dir = provider.hiera_sync_destination ssh.leap.rsync_update do |server| node = manager.node(server.host) hiera_file = Path.relative_path([:hiera, node.name]) @@ -54,7 +54,7 @@ module LeapCli end def sync_support_files(ssh) - dest_dir = manager.provider.hiera_sync_destination + dest_dir = provider.hiera_sync_destination ssh.leap.rsync_update do |server| node = manager.node(server.host) files_to_sync = node.file_paths.collect {|path| Path.relative_path(path, Path.provider) } diff --git a/lib/leap_cli/commands/vagrant.rb b/lib/leap_cli/commands/vagrant.rb index be65e20..dfa32f2 100644 --- a/lib/leap_cli/commands/vagrant.rb +++ b/lib/leap_cli/commands/vagrant.rb @@ -82,7 +82,7 @@ module LeapCli; module Commands end execute exec.join('; ') else - bail! "No nodes found. This command only works on nodes with ip_address in the network #{manager.provider.vagrant.network}" + bail! "No nodes found. This command only works on nodes with ip_address in the network #{provider.vagrant.network}" end end @@ -104,7 +104,7 @@ module LeapCli; module Commands def create_vagrant_file lines = [] - netmask = IPAddr.new('255.255.255.255').mask(manager.provider.vagrant.network.split('/').last).to_s + netmask = IPAddr.new('255.255.255.255').mask(provider.vagrant.network.split('/').last).to_s lines << %[Vagrant::Config.run do |config|] manager.each_node do |node| if node.vagrant? @@ -127,7 +127,7 @@ module LeapCli; module Commands highest_ip = taken_ips.map{|ip| IPAddr.new(ip)}.max new_ip = highest_ip.succ else - new_ip = IPAddr.new(manager.provider.vagrant.network).succ.succ + new_ip = IPAddr.new(provider.vagrant.network).succ.succ end return new_ip.to_s end diff --git a/test/test_helper.rb b/test/test_helper.rb index 94bb2b4..c75222b 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -21,6 +21,10 @@ class MiniTest::Unit::TestCase end end + def provider + manager.provider + end + def base_path File.expand_path '../..', __FILE__ end diff --git a/test/unit/config_object_list_test.rb b/test/unit/config_object_list_test.rb index a507094..ecb6d4e 100644 --- a/test/unit/config_object_list_test.rb +++ b/test/unit/config_object_list_test.rb @@ -9,7 +9,7 @@ class ConfigObjectListTest < MiniTest::Unit::TestCase end def test_complex_node_search - domain = manager.provider.domain + domain = provider.domain nodes = manager.nodes['dns.public' => true] expected = [{"domain_full"=>"ns1.#{domain}"}, {"domain_full"=>"ns2.#{domain}"}, {"domain_full"=>"vpn1.#{domain}"}, {"domain_full"=>"web1.#{domain}"}] assert_equal expected.size, nodes.size diff --git a/test/unit/config_object_test.rb b/test/unit/config_object_test.rb index b981f3b..79cf596 100644 --- a/test/unit/config_object_test.rb +++ b/test/unit/config_object_test.rb @@ -3,7 +3,7 @@ require File.expand_path('test_helper', File.dirname(__FILE__)) class ConfigObjectTest < MiniTest::Unit::TestCase def test_bracket_lookup - domain = manager.provider.domain + domain = provider.domain vpn1 = manager.nodes['vpn1'] assert_equal "vpn1.#{domain}", vpn1['domain.full'] end |