From cc7aee74ed731c26d596ce8a8200e46e2fc9110a Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 21 Jan 2013 22:50:17 -0800
Subject: replaced 'manager.provider' with 'provider'

---
 lib/leap_cli/commands/deploy.rb  | 6 +++---
 lib/leap_cli/commands/vagrant.rb | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/leap_cli/commands')

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
-- 
cgit v1.2.3