dev-lxc 2.6.1 → 2.6.2

data/lib/dev-lxc/container.rb

@@ -1,123 +1,123 @@
-module DevLXC
-  class Container < LXC::Container
-    def status
-      if self.defined?
-        state = self.state
-        ip_addresses = self.ip_addresses.join(" ") if self.state == :running
-      else
-        state = "not_created"
-      end
-      { 'name' => self.name, 'state' => state, 'ip_addresses' => ip_addresses }
-    end
-
-    def start
-      unless self.defined?
-        puts "ERROR: Container '#{self.name}' does not exist."
-        exit 1
-      end
-      puts "Starting container '#{self.name}'"
-      super
-      wait(:running, 3)
-      puts "Waiting for '#{self.name}' container's network"
-      ips = nil
-      30.times do
-        ips = self.ip_addresses
-        break unless ips.empty?
-        sleep 1
-      end
-      if ips.empty?
-        puts "ERROR: Container '#{self.name}' network is not available."
-        exit 1
-      end
-    end
-
-    def shutdown
-      puts "Shutting down container '#{self.name}'"
-      super
-      wait(:stopped, 3)
-    end
-
-    def destroy
-      stop if running?
-      puts "Destroying container '#{self.name}'"
-      super if self.defined?
-    end
-
-    def sync_mounts(mounts)
-      existing_mounts = self.config_item("lxc.mount.entry")
-      unless existing_mounts.nil?
-        preserved_mounts = existing_mounts.delete_if { |m| m.end_with?("## dev-lxc ##") }
-        self.clear_config_item('lxc.mount.entry')
-        self.set_config_item("lxc.mount.entry", preserved_mounts)
-      end
-      unless mounts.nil?
-        mounts.each do |mount|
-          if ! preserved_mounts.nil? && preserved_mounts.any? { |m| m.start_with?("#{mount} ") }
-            puts "Skipping mount entry #{mount}, it already exists"
-            next
-          else
-            puts "Adding mount entry #{mount}"
-            self.set_config_item("lxc.mount.entry", "#{mount} none bind,optional,create=dir 0 0     ## dev-lxc ##")
-          end
-        end
-      end
-      self.save_config
-    end
-
-    def sync_ssh_keys(ssh_keys)
-      dot_ssh_path = "/home/dev-lxc/.ssh"
-      unless File.exist?("#{config_item('lxc.rootfs')}#{dot_ssh_path}/authorized_keys")
-        run_command("sudo -u dev-lxc mkdir -p #{dot_ssh_path}")
-        run_command("sudo -u dev-lxc chmod 700 #{dot_ssh_path}")
-        run_command("sudo -u dev-lxc touch #{dot_ssh_path}/authorized_keys")
-        run_command("sudo -u dev-lxc chmod 600 #{dot_ssh_path}/authorized_keys")
-      end
-      authorized_keys = IO.read("#{config_item('lxc.rootfs')}#{dot_ssh_path}/authorized_keys").split("\n")
-      authorized_keys.delete_if { |m| m.end_with?("## dev-lxc ##") }
-      unless ssh_keys.nil?
-        ssh_keys.each do |ssh_key|
-          puts "Adding SSH key #{ssh_key} to #{dot_ssh_path}/authorized_keys"
-          authorized_keys << IO.read(ssh_key).chomp + "     ## dev-lxc ##"
-        end
-      end
-      authorized_keys_content = String.new
-      authorized_keys_content = authorized_keys.join("\n") + "\n" unless authorized_keys.empty?
-      IO.write("#{config_item('lxc.rootfs')}#{dot_ssh_path}/authorized_keys", authorized_keys_content)
-    end
-
-    def run_command(command, output_file=nil)
-      unless running?
-        puts "ERROR: Container '#{self.name}' must be running first"
-        exit 1
-      end
-      attach_opts = { wait: true, env_policy: LXC::LXC_ATTACH_CLEAR_ENV, extra_env_vars: ['HOME=/root'] }
-      if output_file
-        file = File.open(output_file, 'w+')
-        attach_opts[:stdout] = file
-      end
-      begin
-        attach(attach_opts) do
-          LXC.run_command(command)
-        end
-      ensure
-        file.close if file
-      end
-    end
-
-    def install_package(package_path)
-      unless run_command("test -e #{package_path}") == 0
-        puts "ERROR: File #{package_path} does not exist in container '#{self.name}'"
-        exit 1
-      end
-      puts "Installing #{package_path} in container '#{self.name}'"
-      case File.extname(package_path)
-      when ".deb"
-        install_command = "dpkg -i --skip-same-version #{package_path}"
-      when ".rpm"
-        install_command = "rpm -Uvh #{package_path}"
-      end
-      run_command(install_command)
-    end
-
-  end
-end
+module DevLXC
+  class Container < LXC::Container
+    def status
+      if self.defined?
+        state = self.state
+        ip_addresses = self.ip_addresses.join(" ") if self.state == :running
+      else
+        state = "not_created"
+      end
+      { 'name' => self.name, 'state' => state, 'ip_addresses' => ip_addresses }
+    end
+
+    def start
+      unless self.defined?
+        puts "ERROR: Container '#{self.name}' does not exist."
+        exit 1
+      end
+      puts "Starting container '#{self.name}'"
+      super
+      wait(:running, 3)
+      puts "Waiting for '#{self.name}' container's network"
+      ips = nil
+      30.times do
+        ips = self.ip_addresses
+        break unless ips.empty?
+        sleep 1
+      end
+      if ips.empty?
+        puts "ERROR: Container '#{self.name}' network is not available."
+        exit 1
+      end
+    end
+
+    def shutdown
+      puts "Shutting down container '#{self.name}'"
+      super
+      wait(:stopped, 3)
+    end
+
+    def destroy
+      stop if running?
+      puts "Destroying container '#{self.name}'"
+      super if self.defined?
+    end
+
+    def sync_mounts(mounts)
+      existing_mounts = self.config_item("lxc.mount.entry")
+      unless existing_mounts.nil?
+        preserved_mounts = existing_mounts.delete_if { |m| m.end_with?("## dev-lxc ##") }
+        self.clear_config_item('lxc.mount.entry')
+        self.set_config_item("lxc.mount.entry", preserved_mounts)
+      end
+      unless mounts.nil?
+        mounts.each do |mount|
+          if ! preserved_mounts.nil? && preserved_mounts.any? { |m| m.start_with?("#{mount} ") }
+            puts "Skipping mount entry #{mount}, it already exists"
+            next
+          else
+            puts "Adding mount entry #{mount}"
+            self.set_config_item("lxc.mount.entry", "#{mount} none bind,optional,create=dir 0 0     ## dev-lxc ##")
+          end
+        end
+      end
+      self.save_config
+    end
+
+    def sync_ssh_keys(ssh_keys)
+      dot_ssh_path = "/home/dev-lxc/.ssh"
+      unless File.exist?("#{config_item('lxc.rootfs')}#{dot_ssh_path}/authorized_keys")
+        run_command("sudo -u dev-lxc mkdir -p #{dot_ssh_path}")
+        run_command("sudo -u dev-lxc chmod 700 #{dot_ssh_path}")
+        run_command("sudo -u dev-lxc touch #{dot_ssh_path}/authorized_keys")
+        run_command("sudo -u dev-lxc chmod 600 #{dot_ssh_path}/authorized_keys")
+      end
+      authorized_keys = IO.read("#{config_item('lxc.rootfs')}#{dot_ssh_path}/authorized_keys").split("\n")
+      authorized_keys.delete_if { |m| m.end_with?("## dev-lxc ##") }
+      unless ssh_keys.nil?
+        ssh_keys.each do |ssh_key|
+          puts "Adding SSH key #{ssh_key} to #{dot_ssh_path}/authorized_keys"
+          authorized_keys << IO.read(ssh_key).chomp + "     ## dev-lxc ##"
+        end
+      end
+      authorized_keys_content = String.new
+      authorized_keys_content = authorized_keys.join("\n") + "\n" unless authorized_keys.empty?
+      IO.write("#{config_item('lxc.rootfs')}#{dot_ssh_path}/authorized_keys", authorized_keys_content)
+    end
+
+    def run_command(command, output_file=nil)
+      unless running?
+        puts "ERROR: Container '#{self.name}' must be running first"
+        exit 1
+      end
+      attach_opts = { wait: true, env_policy: LXC::LXC_ATTACH_CLEAR_ENV, extra_env_vars: ['HOME=/root'] }
+      if output_file
+        file = File.open(output_file, 'w+')
+        attach_opts[:stdout] = file
+      end
+      begin
+        attach(attach_opts) do
+          LXC.run_command(command)
+        end
+      ensure
+        file.close if file
+      end
+    end
+
+    def install_package(package_path)
+      unless run_command("test -e #{package_path}") == 0
+        puts "ERROR: File #{package_path} does not exist in container '#{self.name}'"
+        exit 1
+      end
+      puts "Installing #{package_path} in container '#{self.name}'"
+      case File.extname(package_path)
+      when ".deb"
+        install_command = "dpkg -i --skip-same-version #{package_path}"
+      when ".rpm"
+        install_command = "rpm -Uvh #{package_path}"
+      end
+      run_command(install_command)
+    end
+
+  end
+end

data/lib/dev-lxc/server.rb

@@ -1,197 +1,197 @@
-require "json"
-require "dev-lxc/container"
-
-module DevLXC
-  class Server
-    attr_reader :container
-
-    def initialize(name, ipaddress, additional_fqdn, memory_per_server, mounts, ssh_keys)
-      @container = DevLXC::Container.new(name)
-      @ipaddress = ipaddress
-      @additional_fqdn = additional_fqdn
-      @memory_per_server = memory_per_server
-      @mounts = mounts
-      @ssh_keys = ssh_keys
-    end
-
-    def name
-      @container.name
-    end
-
-    def status
-      @container.status
-    end
-
-    def run_command(command, output_file=nil)
-      if @container.running?
-        puts "Running '#{command}' in '#{@container.name}'"
-        puts "Saving output to #{output_file}" if output_file
-        @container.run_command(command, output_file)
-      else
-        puts "'#{@container.name}' is not running"
-      end
-    end
-
-    def install_package(package_path)
-      @container.install_package(package_path)
-    end
-
-    def start
-      return if @container.running?
-      hwaddr = @container.config_item("lxc.network.0.hwaddr")
-      release_lingering_dhcp_ip_addresses(hwaddr)
-      assign_static_ip_address(hwaddr) if @ipaddress
-      @container.sync_mounts(@mounts)
-      @container.start
-      @container.sync_ssh_keys(@ssh_keys)
-      @container.set_cgroup_item('memory.limit_in_bytes', @memory_per_server) if @memory_per_server
-      puts
-    end
-
-    def shutdown
-      @container.shutdown if @container.running?
-      remove_static_ip_address(@container.config_item("lxc.network.0.hwaddr")) if @container.defined?
-    end
-
-    def snapshot(comment=nil)
-      unless @container.defined?
-        puts "WARNING: Skipping snapshot of '#{@container.name}' because it does not exist"
-        return
-      end
-      if @container.running?
-        puts "WARNING: Skipping snapshot of '#{@container.name}' because it is running"
-        return
-      end
-      puts "Creating snapshot of container '#{@container.name}'"
-      snapname = @container.snapshot
-      unless comment.nil?
-        snapshot = @container.snapshot_list.select { |sn| sn.first == snapname }
-        snapshot_comment_file = snapshot.flatten[1]
-        IO.write(snapshot_comment_file, comment) unless snapshot_comment_file.nil?
-      end
-    end
-
-    def snapshot_destroy(snapname=nil)
-      unless @container.defined?
-        puts "Skipping container '#{@container.name}' because it does not exist"
-        return
-      end
-      if snapname == "ALL"
-        if @container.snapshot_list.empty?
-          puts "Container '#{@container.name}' does not have any snapshots"
-        else
-          @container.snapshot_list.each do |snapshot|
-            puts "Destroying snapshot '#{snapshot.first}' of container '#{@container.name}'"
-            @container.snapshot_destroy(snapshot.first)
-          end
-        end
-      elsif snapname == "LAST"
-        if @container.snapshot_list.empty?
-          puts "Container '#{@container.name}' does not have any snapshots"
-        else
-          snapname = @container.snapshot_list.last.first
-          puts "Destroying snapshot '#{snapname}' of container '#{@container.name}'"
-          @container.snapshot_destroy(snapname)
-        end
-      else
-        snapshot = @container.snapshot_list.select { |sn| sn.first == snapname }
-        if snapshot.flatten.empty?
-          puts "Container '#{@container.name}' does not have a '#{snapname}' snapshot"
-        else
-          puts "Destroying snapshot '#{snapname}' of container '#{@container.name}'"
-          @container.snapshot_destroy(snapname)
-        end
-      end
-    end
-
-    def snapshot_list
-      snapshots = Array.new
-      return snapshots unless @container.defined?
-      @container.snapshot_list.each do |snapshot|
-        (snapname, snap_comment_file, snaptime) = snapshot
-        snap_comment = IO.read(snap_comment_file).chomp if File.exist?(snap_comment_file)
-        snapshots << [snapname, snaptime, snap_comment]
-      end
-      snapshots
-    end
-
-    def snapshot_restore(snapname=nil)
-      unless @container.defined?
-        puts "WARNING: Skipping container '#{@container.name}' because it does not exist"
-        return
-      end
-      if @container.running?
-        puts "WARNING: Skipping container '#{@container.name}' because it is running"
-        return
-      end
-      if snapname == "LAST"
-        if @container.snapshot_list.empty?
-          puts "WARNING: Skipping container '#{@container.name}' because it does not have any snapshots"
-        else
-          snapname = @container.snapshot_list.last.first
-          puts "Restoring snapshot '#{snapname}' of container '#{@container.name}'"
-          @container.snapshot_restore(snapname)
-        end
-      else
-        snapshot = @container.snapshot_list.select { |sn| sn.first == snapname }
-        if snapshot.flatten.empty?
-          puts "WARNING: Skipping container '#{@container.name}' because it does not have a '#{snapname}' snapshot"
-        else
-          puts "Restoring snapshot '#{snapname}' of container '#{@container.name}'"
-          @container.snapshot_restore(snapname)
-        end
-      end
-    end
-
-    def destroy
-      return unless @container.defined?
-      @container.snapshot_list.each { |snapshot| @container.snapshot_destroy(snapshot.first) }
-      hwaddr = @container.config_item("lxc.network.0.hwaddr")
-      @container.destroy
-      remove_static_ip_address(hwaddr)
-    end
-
-    def release_lingering_dhcp_ip_addresses(hwaddr)
-      dhcp_leases = IO.readlines('/var/lib/misc/dnsmasq.lxcbr0.leases')
-      leases_to_release = dhcp_leases.map do |dhcp_lease|
-        if m = dhcp_lease.match(/ #{hwaddr} (\d+\.\d+\.\d+\.\d+) /)
-          mac_addr = hwaddr
-          ip_addr = m[1]
-        elsif m = dhcp_lease.match(/ (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w) #{@ipaddress} /)
-          mac_addr = m[1]
-          ip_addr = @ipaddress
-        elsif m = dhcp_lease.match(/ (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w) (\d+\.\d+\.\d+\.\d+) #{@container.name.sub(/\.lxc$/, '')} /)
-          mac_addr = m[1]
-          ip_addr = m[2]
-        end
-        if mac_addr && ip_addr
-          { dhcp_lease: dhcp_lease, mac_addr: mac_addr, ip_addr: ip_addr }
-        end
-      end
-      leases_to_release.compact!
-      unless leases_to_release.empty?
-        system("systemctl stop lxc-net.service")
-        leases_to_release.each do |l|
-          puts "Releasing lingering DHCP lease: #{l[:dhcp_lease]}"
-          DevLXC.search_file_delete_line("/var/lib/misc/dnsmasq.lxcbr0.leases", /( #{l[:mac_addr]} #{l[:ip_addr]} )/)
-        end
-        system("systemctl start lxc-net.service")
-      end
-    end
-
-    def assign_static_ip_address(hwaddr)
-      puts "Assigning IP address #{@ipaddress} to '#{@container.name}' container's lxc.network.hwaddr #{hwaddr}"
-      DevLXC.search_file_delete_line("/etc/lxc/dhcp-hosts.conf", /(^#{hwaddr}|,#{@ipaddress}$)/)
-      DevLXC.append_line_to_file("/etc/lxc/dhcp-hosts.conf", "#{hwaddr},#{@ipaddress}\n")
-      DevLXC.reload_dnsmasq
-    end
-
-    def remove_static_ip_address(hwaddr=nil)
-      if hwaddr
-        DevLXC.search_file_delete_line("/etc/lxc/dhcp-hosts.conf", /^#{hwaddr}/)
-        DevLXC.reload_dnsmasq
-      end
-    end
-
-  end
-end
+require "json"
+require "dev-lxc/container"
+
+module DevLXC
+  class Server
+    attr_reader :container
+
+    def initialize(name, ipaddress, additional_fqdn, memory_per_server, mounts, ssh_keys)
+      @container = DevLXC::Container.new(name)
+      @ipaddress = ipaddress
+      @additional_fqdn = additional_fqdn
+      @memory_per_server = memory_per_server
+      @mounts = mounts
+      @ssh_keys = ssh_keys
+    end
+
+    def name
+      @container.name
+    end
+
+    def status
+      @container.status
+    end
+
+    def run_command(command, output_file=nil)
+      if @container.running?
+        puts "Running '#{command}' in '#{@container.name}'"
+        puts "Saving output to #{output_file}" if output_file
+        @container.run_command(command, output_file)
+      else
+        puts "'#{@container.name}' is not running"
+      end
+    end
+
+    def install_package(package_path)
+      @container.install_package(package_path)
+    end
+
+    def start
+      return if @container.running?
+      hwaddr = @container.config_item("lxc.network.0.hwaddr")
+      release_lingering_dhcp_ip_addresses(hwaddr)
+      assign_static_ip_address(hwaddr) if @ipaddress
+      @container.sync_mounts(@mounts)
+      @container.start
+      @container.sync_ssh_keys(@ssh_keys)
+      @container.set_cgroup_item('memory.limit_in_bytes', @memory_per_server) if @memory_per_server
+      puts
+    end
+
+    def shutdown
+      @container.shutdown if @container.running?
+      remove_static_ip_address(@container.config_item("lxc.network.0.hwaddr")) if @container.defined?
+    end
+
+    def snapshot(comment=nil)
+      unless @container.defined?
+        puts "WARNING: Skipping snapshot of '#{@container.name}' because it does not exist"
+        return
+      end
+      if @container.running?
+        puts "WARNING: Skipping snapshot of '#{@container.name}' because it is running"
+        return
+      end
+      puts "Creating snapshot of container '#{@container.name}'"
+      snapname = @container.snapshot
+      unless comment.nil?
+        snapshot = @container.snapshot_list.select { |sn| sn.first == snapname }
+        snapshot_comment_file = snapshot.flatten[1]
+        IO.write(snapshot_comment_file, comment) unless snapshot_comment_file.nil?
+      end
+    end
+
+    def snapshot_destroy(snapname=nil)
+      unless @container.defined?
+        puts "Skipping container '#{@container.name}' because it does not exist"
+        return
+      end
+      if snapname == "ALL"
+        if @container.snapshot_list.empty?
+          puts "Container '#{@container.name}' does not have any snapshots"
+        else
+          @container.snapshot_list.each do |snapshot|
+            puts "Destroying snapshot '#{snapshot.first}' of container '#{@container.name}'"
+            @container.snapshot_destroy(snapshot.first)
+          end
+        end
+      elsif snapname == "LAST"
+        if @container.snapshot_list.empty?
+          puts "Container '#{@container.name}' does not have any snapshots"
+        else
+          snapname = @container.snapshot_list.last.first
+          puts "Destroying snapshot '#{snapname}' of container '#{@container.name}'"
+          @container.snapshot_destroy(snapname)
+        end
+      else
+        snapshot = @container.snapshot_list.select { |sn| sn.first == snapname }
+        if snapshot.flatten.empty?
+          puts "Container '#{@container.name}' does not have a '#{snapname}' snapshot"
+        else
+          puts "Destroying snapshot '#{snapname}' of container '#{@container.name}'"
+          @container.snapshot_destroy(snapname)
+        end
+      end
+    end
+
+    def snapshot_list
+      snapshots = Array.new
+      return snapshots unless @container.defined?
+      @container.snapshot_list.each do |snapshot|
+        (snapname, snap_comment_file, snaptime) = snapshot
+        snap_comment = IO.read(snap_comment_file).chomp if File.exist?(snap_comment_file)
+        snapshots << [snapname, snaptime, snap_comment]
+      end
+      snapshots
+    end
+
+    def snapshot_restore(snapname=nil)
+      unless @container.defined?
+        puts "WARNING: Skipping container '#{@container.name}' because it does not exist"
+        return
+      end
+      if @container.running?
+        puts "WARNING: Skipping container '#{@container.name}' because it is running"
+        return
+      end
+      if snapname == "LAST"
+        if @container.snapshot_list.empty?
+          puts "WARNING: Skipping container '#{@container.name}' because it does not have any snapshots"
+        else
+          snapname = @container.snapshot_list.last.first
+          puts "Restoring snapshot '#{snapname}' of container '#{@container.name}'"
+          @container.snapshot_restore(snapname)
+        end
+      else
+        snapshot = @container.snapshot_list.select { |sn| sn.first == snapname }
+        if snapshot.flatten.empty?
+          puts "WARNING: Skipping container '#{@container.name}' because it does not have a '#{snapname}' snapshot"
+        else
+          puts "Restoring snapshot '#{snapname}' of container '#{@container.name}'"
+          @container.snapshot_restore(snapname)
+        end
+      end
+    end
+
+    def destroy
+      return unless @container.defined?
+      @container.snapshot_list.each { |snapshot| @container.snapshot_destroy(snapshot.first) }
+      hwaddr = @container.config_item("lxc.network.0.hwaddr")
+      @container.destroy
+      remove_static_ip_address(hwaddr)
+    end
+
+    def release_lingering_dhcp_ip_addresses(hwaddr)
+      dhcp_leases = IO.readlines('/var/lib/misc/dnsmasq.lxcbr0.leases')
+      leases_to_release = dhcp_leases.map do |dhcp_lease|
+        if m = dhcp_lease.match(/ #{hwaddr} (\d+\.\d+\.\d+\.\d+) /)
+          mac_addr = hwaddr
+          ip_addr = m[1]
+        elsif m = dhcp_lease.match(/ (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w) #{@ipaddress} /)
+          mac_addr = m[1]
+          ip_addr = @ipaddress
+        elsif m = dhcp_lease.match(/ (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w) (\d+\.\d+\.\d+\.\d+) #{@container.name.sub(/\.lxc$/, '')} /)
+          mac_addr = m[1]
+          ip_addr = m[2]
+        end
+        if mac_addr && ip_addr
+          { dhcp_lease: dhcp_lease, mac_addr: mac_addr, ip_addr: ip_addr }
+        end
+      end
+      leases_to_release.compact!
+      unless leases_to_release.empty?
+        system("systemctl stop lxc-net.service")
+        leases_to_release.each do |l|
+          puts "Releasing lingering DHCP lease: #{l[:dhcp_lease]}"
+          DevLXC.search_file_delete_line("/var/lib/misc/dnsmasq.lxcbr0.leases", /( #{l[:mac_addr]} #{l[:ip_addr]} )/)
+        end
+        system("systemctl start lxc-net.service")
+      end
+    end
+
+    def assign_static_ip_address(hwaddr)
+      puts "Assigning IP address #{@ipaddress} to '#{@container.name}' container's lxc.network.hwaddr #{hwaddr}"
+      DevLXC.search_file_delete_line("/etc/lxc/dhcp-hosts.conf", /(^#{hwaddr}|,#{@ipaddress}$)/)
+      DevLXC.append_line_to_file("/etc/lxc/dhcp-hosts.conf", "#{hwaddr},#{@ipaddress}\n")
+      DevLXC.reload_dnsmasq
+    end
+
+    def remove_static_ip_address(hwaddr=nil)
+      if hwaddr
+        DevLXC.search_file_delete_line("/etc/lxc/dhcp-hosts.conf", /^#{hwaddr}/)
+        DevLXC.reload_dnsmasq
+      end
+    end
+
+  end
+end

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
-module DevLXC
-  VERSION = "2.6.1"
-end
+module DevLXC
+  VERSION = "2.6.2"
+end