cloudflock 0.5.1 → 0.6.0

data/lib/cloudflock/interface/cli/app/servers/migrate.rb

@@ -1,4 +1,6 @@
 require 'fog'
+require 'socket'
+require 'tempfile'
 require 'cloudflock/target/servers'
 require 'cloudflock/interface/cli/app/common/servers'
 
@@ -303,12 +305,19 @@ class CloudFlock::Interface::CLI::App::Servers::Migrate
       end
     end
 
+    CLI.spinner "Logging out of source host" do
+      source_host_ssh.logout!
+    end
+
     CLI.spinner "Cleaning up destination host" do
       Migrate.clean_destination(destination_host_ssh, source_profile[:cpe])
     end
 
-    [destination_host_ssh, source_host_ssh].each do |host|
-      host.logout!
+    ip_list = determine_ips(source_profile[:ip][:public])
+    ip_list.each { |ip| remediate_ip_config(destination_host_ssh, ip, destination_host_def[:host]) }
+
+    CLI.spinner "Logging out of destination host" do
+      source_host_ssh.logout!
     end
 
     puts
@@ -330,8 +339,6 @@ class CloudFlock::Interface::CLI::App::Servers::Migrate
                           default_answer: "N")
 
     if alter
-      require 'tempfile'
-
       tmp_file = Tempfile.new("exclude")
       tmp_file.write(exclusion_string)
       tmp_file.close
@@ -352,4 +359,133 @@ class CloudFlock::Interface::CLI::App::Servers::Migrate
 
     exclusion_string
   end
+
+  # Internal: Show the list of IPs detected and ascertain whether to perform
+  # remediation of configuration files.
+  #
+  # ip_list - Array containing Strings containing IP addresses detected from
+  #           the source host.
+  #
+  # Returns an Array of Strings containing IPs to consider for remediation.
+  # Raises an ArgumentError if ip_list is not an Array.
+  def determine_ips(ip_list)
+    unless ip_list.kind_of?(Array)
+      raise ArgumentError, "Expected an Array, got a #{ip_list.class.name}"
+    end
+    return([]) if ip_list.empty?
+
+    puts "IP Addresses detected for remediation:"
+    puts ip_list
+
+    if CLI.prompt_yn("Edit IP list? (Y/N)", default_answer: "N")
+      tmp_file = Tempfile.new("ips")
+      tmp_file.write(ip_list.join("\n"))
+      tmp_file.close
+
+      launch_editor(tmp_file.path)
+      tmp_file.open
+
+      ip_list = tmp_file.lines.select do |ip|
+        begin
+          Socket.getaddrinfo(ip, nil, nil, Socket::SOCK_STREAM)[0][3]
+        rescue SocketError
+          false
+        end
+      end
+
+      tmp_file.close
+      tmp_file.unlink
+    end
+
+    ip_list
+  end
+
+  # Internal: Find instances of a given IP in configuration files and
+  # selectively replace them with an IP available on the target system.
+  #
+  # destination_shell - CloudFlock::Remote::SSH object connected to the
+  #                     destination host.
+  # source_ip         - String containing an IP.
+  # destination_ip    - String containing primary IP detected for the host.
+  #
+  # Returns nothing.
+  # Raises ArgumentError if source_ip is not a String.
+  def remediate_ip_config(destination_shell, source_ip, destination_ip)
+    unless destination_shell.kind_of?(CloudFlock::Remote::SSH)
+      raise ArgumentError, "Expected an SSH session, got a " +
+                           "#{destination_shell.class.name}"
+    end
+    unless source_ip.kind_of?(String)
+      raise ArgumentError, "Expected a String, got a #{source_ip.class.name}"
+    end
+    source_ip = Socket.getaddrinfo(source_ip, nil, nil,
+                                   Socket::SOCK_STREAM)[0][3]
+
+    grep_command = "grep -rl #{source_ip} /mnt/migration_target/etc " +
+                   "2>/dev/null | grep -v log"
+    files = destination_shell.query("IP_CHECK", grep_command)
+    unless files.strip.empty?
+      tmp_file = Tempfile.new("filelist")
+      tmp_file.write("Configuration files found for #{source_ip}:\n\n#{files}")
+      tmp_file.close
+      system("less -C #{tmp_file.path}")
+      tmp_file.unlink
+
+      proceed = CLI.prompt_yn("Replace #{source_ip} in these files? (Y/N)",
+                              default_answer: "Y")
+      if proceed
+        edit = false
+      else
+        edit = CLI.prompt_yn("Edit the list? (Y/N)", default: "Y")
+      end
+
+      if edit
+        tmp_file = Tempfile.new("filelist")
+        tmp_file.write("#{files}")
+        tmp_file.close
+        launch_editor(tmp_file.path)
+        tmp_file.open
+        files = tmp_file.read
+        tmp_file.unlink
+        proceed = true
+      end
+
+      if proceed
+        replacement_ip = CLI.prompt("IP to replace #{source_ip}",
+                                    default_answer: destination_ip)
+        CLI.spinner("Remediating configuration files for #{source_ip}") do
+          files.each_line do |file|
+            file.strip!
+            next if file.empty?
+            file.gsub!(/'/, "\\'")
+
+            sed_command = "sed -i 's/#{source_ip}/#{replacement_ip}/' '#{file}'" 
+            destination_shell.puts(sed_command)
+            destination_shell.prompt
+          end
+        end
+      end
+    end
+  end
+
+  # Internal: Launch the user's editor to edit a file.
+  #
+  # path - String containing the path to the file to edit
+  #
+  # Returns nothing.
+  # Raises Errno::ENOENT if the path does not point to an existing file.
+  def launch_editor(path)
+    unless File.exists?(path)
+      raise Errno::ENOENT, "Unable to open #{path}"
+    end
+
+    # Allow for "other" editors
+    if File.exists?("/usr/bin/editor")
+      editor = "/usr/bin/editor"
+    else
+      editor = "vim"
+    end
+
+    system("#{editor} #{path}")
+  end
 end

data/lib/cloudflock/target/servers/migrate.rb

@@ -211,55 +211,6 @@ module CloudFlock::Target::Servers::Migrate extend self
     end
   end
 
-  # Internal: Execute rsync and return true if everything appears to have completed successfully
-  #
-  # source_host      - SSH object logged in to the source host.
-  # args             - Hash containing additional parameters for operation.
-  #                    Expected parameters are:
-  #                    :target_addr - String containing the address to use when
-  #                                   communicating with the destination host.
-  #                    :rsync       - String containing path to rsync binary on
-  #                                   the source machine.  If this is nil, copy
-  #                                   rsync from the destination machine to
-  #                                   /root/.rackspace/ for the purposes of
-  #                                   carrying out the migration.
-  #                                   (default: nil)
-  #                    :timeout     - Fixnum containing the number of seconds
-  #                                   to wait before reporting failure/hung
-  #                                   rsync process.  If this is set to -1, a
-  #                                   failure will never be reported--use
-  #                                   Watchdogs in this case to prevent
-  #                                   indefinite migrations.  (default: 14400)
-  #
-  # Returns true if rsync finishes.
-  # Returns false if rsync does not complete within timeout.
-  def migration_watcher(source_host, args)
-    rsync_command = "#{args[:rsync]} -azP -e 'ssh " +
-                    "#{CloudFlock::Remote::SSH::SSH_ARGUMENTS} -i " +
-                    "/tmp/RACKSPACE_MIGRATION/migration_id_rsa' " +
-                    "--exclude-from='/root/.rackspace/" +
-                    "migration_exceptions.txt' / " +
-                    "root@#{args[:target_addr]}:/mnt/migration_target"
-    source_host.puts(rsync_command)
-
-    source_host.set_timeout(60)
-    if(args[:timeout] >= 0)
-      i = args[:timeout]/60 + 1
-    else
-      i = -1
-    end
-
-    begin
-      source_host.prompt
-    rescue Timeout::Error
-      i -= 1
-      retry unless i == 0
-      return false
-    end
-
-    true
-  end
-
   # Public: Build exclusions list from generic and targeted exclusions
   # definitions per CPE.
   #
@@ -319,35 +270,6 @@ module CloudFlock::Target::Servers::Migrate extend self
     true
   end
 
-  # Internal: Create user and restore entries from backup passwd and shadow
-  # files.
-  #
-  # destination_host - SSH object logged in to the host on which to restore a
-  #                    user.
-  # username         - String containing the user to restore.
-  #
-  # Returns true if success, false otherwise.
-  def restore_user(destination_host, username)
-    username.strip!
-    sanity_check = "(grep '^#{username}:' /etc/migration.passwd && grep " +
-                   "'^#{username}:' /etc/migration.shadow) >/dev/null " +
-                   "2>/dev/null && printf 'PRESENT'"
-
-    sane = destination_host.query("USER_CHECK", sanity_check)
-    return false if sane.empty?
-
-    steps = ["useradd #{username}",
-             "chown -R #{username}.#{username} /home/#{username}",
-             "sed -i '/^#{username}:.*$/d' /etc/shadow",
-             "grep '^#{username}:' /etc/migration.shadow >> /etc/shadow"]
-    steps.each do |step|
-      destination_host.puts(step)
-      destination_host.prompt
-    end
-
-    true
-  end
-
   # Public: Perform post-migration clean up of a destination host.  Base
   # clean up off of cleanup scripts located at data/cleanup/.
   #
@@ -417,6 +339,84 @@ module CloudFlock::Target::Servers::Migrate extend self
     long_run(destination_host, "/bin/bash /root/migration_clean_post.sh")
   end
 
+  # Internal: Execute rsync and return true if everything appears to have completed successfully
+  #
+  # source_host      - SSH object logged in to the source host.
+  # args             - Hash containing additional parameters for operation.
+  #                    Expected parameters are:
+  #                    :target_addr - String containing the address to use when
+  #                                   communicating with the destination host.
+  #                    :rsync       - String containing path to rsync binary on
+  #                                   the source machine.  If this is nil, copy
+  #                                   rsync from the destination machine to
+  #                                   /root/.rackspace/ for the purposes of
+  #                                   carrying out the migration.
+  #                                   (default: nil)
+  #                    :timeout     - Fixnum containing the number of seconds
+  #                                   to wait before reporting failure/hung
+  #                                   rsync process.  If this is set to -1, a
+  #                                   failure will never be reported--use
+  #                                   Watchdogs in this case to prevent
+  #                                   indefinite migrations.  (default: 14400)
+  #
+  # Returns true if rsync finishes.
+  # Returns false if rsync does not complete within timeout.
+  def migration_watcher(source_host, args)
+    rsync_command = "#{args[:rsync]} -azP -e 'ssh " +
+                    "#{CloudFlock::Remote::SSH::SSH_ARGUMENTS} -i " +
+                    "/tmp/RACKSPACE_MIGRATION/migration_id_rsa' " +
+                    "--exclude-from='/root/.rackspace/" +
+                    "migration_exceptions.txt' / " +
+                    "root@#{args[:target_addr]}:/mnt/migration_target"
+    source_host.puts(rsync_command)
+
+    source_host.set_timeout(60)
+    if(args[:timeout] >= 0)
+      i = args[:timeout]/60 + 1
+    else
+      i = -1
+    end
+
+    begin
+      source_host.prompt
+    rescue Timeout::Error
+      i -= 1
+      retry unless i == 0
+      return false
+    end
+
+    true
+  end
+
+  # Internal: Create user and restore entries from backup passwd and shadow
+  # files.
+  #
+  # destination_host - SSH object logged in to the host on which to restore a
+  #                    user.
+  # username         - String containing the user to restore.
+  #
+  # Returns true if success, false otherwise.
+  def restore_user(destination_host, username)
+    username.strip!
+    sanity_check = "(grep '^#{username}:' /etc/migration.passwd && grep " +
+                   "'^#{username}:' /etc/migration.shadow) >/dev/null " +
+                   "2>/dev/null && printf 'PRESENT'"
+
+    sane = destination_host.query("USER_CHECK", sanity_check)
+    return false if sane.empty?
+
+    steps = ["useradd #{username}",
+             "chown -R #{username}.#{username} /home/#{username}",
+             "sed -i '/^#{username}:.*$/d' /etc/shadow",
+             "grep '^#{username}:' /etc/migration.shadow >> /etc/shadow"]
+    steps.each do |step|
+      destination_host.puts(step)
+      destination_host.prompt
+    end
+
+    true
+  end
+
   # Internal: Insure that new output is being produced by a running process
   # which is expected to run over an indeterminate amount of time to catch
   # hanging processes, but not punish properly running ones.

data/lib/cloudflock/version.rb

@@ -1,3 +1,3 @@
 module CloudFlock
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudflock
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.11.1
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: expectr
   requirement: !ruby/object:Gem::Requirement