dev-lxc 0.5.0 → 0.6.0

data/lib/dev-lxc/server.rb

@@ -0,0 +1,414 @@
+require "dev-lxc/container"
+require "dev-lxc/cluster"
+
+module DevLXC
+  class Server
+    attr_reader :server, :platform_image_name, :shared_image_name
+
+    def initialize(name, server_type, cluster_config)
+      unless cluster_config[server_type]["servers"].keys.include?(name)
+        raise "Server #{name} is not defined in the cluster config"
+      end
+      @server_type = server_type
+      cluster = DevLXC::Cluster.new(cluster_config)
+      @api_fqdn = cluster.api_fqdn
+      @analytics_fqdn = cluster.analytics_fqdn
+      @chef_server_bootstrap_backend = cluster.chef_server_bootstrap_backend
+      @analytics_bootstrap_backend = cluster.analytics_bootstrap_backend
+      @chef_server_config = cluster.chef_server_config
+      @analytics_config = cluster.analytics_config
+
+      @server = DevLXC::Container.new(name)
+      @config = cluster_config[@server_type]["servers"][@server.name]
+      @ipaddress = @config["ipaddress"]
+      @role = @config["role"] ? @config["role"] : cluster_config[@server_type]['topology']
+      @mounts = cluster_config[@server_type]["mounts"]
+      @platform_image_name = cluster_config[@server_type]["platform_image"]
+      @packages = cluster_config[@server_type]["packages"]
+
+      case @server_type
+      when 'analytics'
+        @shared_image_name = "s#{@platform_image_name[1..-1]}"
+        @shared_image_name += "-analytics-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["analytics"].to_s.match(/[_-]((\d+\.?){3,})/)
+      when 'chef-server'
+        if File.basename(@packages["server"]).match(/^(\w+-\w+.*)[_-]((?:\d+\.?){3,})/)
+          @chef_server_type = Regexp.last_match[1]
+          @chef_server_version = Regexp.last_match[2].gsub(".", "-")
+        end
+
+        @shared_image_name = "s#{@platform_image_name[1..-1]}"
+        case @chef_server_type
+        when 'chef-server-core'
+          @shared_image_name += '-cs'
+          @server_ctl = 'chef-server'
+        when 'private-chef'
+          @shared_image_name += '-ec'
+          @server_ctl = 'private-chef'
+        when 'chef-server'
+          @shared_image_name += '-osc'
+          @server_ctl = 'chef-server'
+        end
+        @shared_image_name += "-#{@chef_server_version}"
+        @shared_image_name += "-reporting-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["reporting"].to_s.match(/[_-]((\d+\.?){3,})/)
+        @shared_image_name += "-pushy-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["push-jobs-server"].to_s.match(/[_-]((\d+\.?){3,})/)
+        @shared_image_name += "-sync-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["sync"].to_s.match(/[_-]((\d+\.?){3,})/)
+      end
+    end
+
+    def status
+      if @server.defined?
+        state = @server.state
+        ip_addresses = @server.ip_addresses.join(" ") if @server.state == :running
+      else
+        state = "not_created"
+      end
+      printf "%25s     %-15s %s\n", @server.name, state, ip_addresses
+    end
+
+    def abspath(rootfs_path)
+      "#{@server.config_item('lxc.rootfs')}#{rootfs_path}" if @server.defined?
+    end
+
+    def run_command(command)
+      if @server.running?
+        puts "Running '#{command}' in #{@server.name}"
+        @server.run_command(command)
+      else
+        puts "#{@server.name} is not running"
+      end
+    end
+
+    def start
+      create
+      hwaddr = @server.config_item("lxc.network.0.hwaddr")
+      DevLXC.assign_ip_address(@ipaddress, @server.name, hwaddr)
+      unless @role == 'backend'
+        case @server_type
+        when 'analytics'
+          DevLXC.create_dns_record(@analytics_fqdn, @server.name, @ipaddress)
+        when 'chef-server'
+          DevLXC.create_dns_record(@api_fqdn, @server.name, @ipaddress)
+        end
+      end
+      @server.sync_mounts(@mounts)
+      @server.start
+    end
+
+    def stop
+      hwaddr = @server.config_item("lxc.network.0.hwaddr") if @server.defined?
+      @server.stop
+      deregister_from_dnsmasq(hwaddr)
+    end
+
+    def snapshot(force=nil)
+      unless @server.defined?
+        puts "WARNING: Skipping snapshot of '#{@server.name}' because it is not created"
+        return
+      end
+      if @server.state != :stopped
+        puts "WARNING: Skipping snapshot of '#{@server.name}' because it is not stopped"
+        return
+      end
+      custom_image = DevLXC::Container.new("c-#{@server.name}")
+      if custom_image.defined?
+        if force
+          custom_image.destroy
+        else
+          puts "WARNING: Skipping snapshot of '#{@server.name}' because a custom image already exists"
+          return
+        end
+      end
+      puts "Creating snapshot of container #{@server.name} in custom image #{custom_image.name}"
+      @server.clone("#{custom_image.name}", {:flags => LXC::LXC_CLONE_SNAPSHOT|LXC::LXC_CLONE_KEEPMACADDR})
+    end
+
+    def destroy
+      hwaddr = @server.config_item("lxc.network.0.hwaddr") if @server.defined?
+      @server.destroy
+      deregister_from_dnsmasq(hwaddr)
+    end
+
+    def deregister_from_dnsmasq(hwaddr)
+      DevLXC.search_file_delete_line("/etc/lxc/addn-hosts.conf", /^#{@ipaddress}\s/)
+      DevLXC.search_file_delete_line("/etc/lxc/dhcp-hosts.conf", /,#{@ipaddress}$/)
+      unless hwaddr.nil?
+        DevLXC.search_file_delete_line("/etc/lxc/dhcp-hosts.conf", /^#{hwaddr}/)
+      end
+      DevLXC.reload_dnsmasq
+    end
+
+    def destroy_image(type)
+      case type
+      when :custom
+        DevLXC::Container.new("c-#{@server.name}").destroy
+      when :unique
+        DevLXC::Container.new("u-#{@server.name}").destroy
+      when :shared
+        DevLXC::Container.new(@shared_image_name).destroy
+      when :platform
+        DevLXC::Container.new(@platform_image_name).destroy
+      end
+    end
+
+    def create
+      if @server.defined?
+        puts "Using existing container #{@server.name}"
+        return
+      end
+      custom_image = DevLXC::Container.new("c-#{@server.name}")
+      unique_image = DevLXC::Container.new("u-#{@server.name}")
+      if custom_image.defined?
+        puts "Cloning custom image #{custom_image.name} into container #{@server.name}"
+        custom_image.clone(@server.name, {:flags => LXC::LXC_CLONE_SNAPSHOT|LXC::LXC_CLONE_KEEPMACADDR})
+        @server = DevLXC::Container.new(@server.name)
+        return
+      elsif unique_image.defined?
+        puts "Cloning unique image #{unique_image.name} into container #{@server.name}"
+        unique_image.clone(@server.name, {:flags => LXC::LXC_CLONE_SNAPSHOT|LXC::LXC_CLONE_KEEPMACADDR})
+        @server = DevLXC::Container.new(@server.name)
+        return
+      else
+        puts "Creating container #{@server.name}"
+        unless @server.name == @chef_server_bootstrap_backend || DevLXC::Container.new(@chef_server_bootstrap_backend).defined?
+          raise "The bootstrap backend server must be created first."
+        end
+        shared_image = create_shared_image
+        puts "Cloning shared image #{shared_image.name} into container #{@server.name}"
+        shared_image.clone(@server.name, {:flags => LXC::LXC_CLONE_SNAPSHOT})
+        @server = DevLXC::Container.new(@server.name)
+        puts "Adding lxc.hook.post-stop hook"
+        @server.set_config_item("lxc.hook.post-stop", "/usr/local/share/lxc/hooks/post-stop-dhcp-release")
+        @server.save_config
+        hwaddr = @server.config_item("lxc.network.0.hwaddr")
+        raise "#{@server.name} needs to have an lxc.network.hwaddr entry" if hwaddr.empty?
+        DevLXC.assign_ip_address(@ipaddress, @server.name, hwaddr)
+        unless @role == 'backend'
+          case @server_type
+          when 'analytics'
+            DevLXC.create_dns_record(@analytics_fqdn, @server.name, @ipaddress)
+          when 'chef-server'
+            DevLXC.create_dns_record(@api_fqdn, @server.name, @ipaddress)
+          end
+        end
+        @server.sync_mounts(@mounts)
+        # if platform image is centos then `/etc/hosts` file needs to be modified so `hostname -f`
+        # provides the FQDN instead of `localhost`
+        if @platform_image_name.start_with?('p-centos-')
+          IO.write("#{@server.config_item('lxc.rootfs')}/etc/hosts", "127.0.0.1 localhost\n127.0.1.1 #{@server.name}\n")
+        end
+        @server.start
+        configure_analytics if @server_type == 'analytics'
+        if @server_type == 'chef-server' && ! @packages["server"].nil?
+          configure_server
+          create_users if @server.name == @chef_server_bootstrap_backend
+          if %w(standalone frontend).include?(@role) && ! @packages["manage"].nil?
+            @server.install_package(@packages["manage"])
+            configure_manage
+          end
+          unless @role == 'open-source'
+            configure_reporting unless @packages["reporting"].nil?
+            configure_push_jobs_server unless @packages["push-jobs-server"].nil?
+            if @analytics_bootstrap_backend && %w(standalone backend).include?(@role)
+              configure_chef_server_for_analytics
+            end
+          end
+        end
+        @server.stop
+        puts "Cloning container #{@server.name} into unique image #{unique_image.name}"
+        @server.clone("#{unique_image.name}", {:flags => LXC::LXC_CLONE_SNAPSHOT|LXC::LXC_CLONE_KEEPMACADDR})
+      end
+    end
+
+    def create_shared_image
+      shared_image = DevLXC::Container.new(@shared_image_name)
+      if shared_image.defined?
+        puts "Using existing shared image #{shared_image.name}"
+        return shared_image
+      end
+      platform_image = DevLXC.create_platform_image(@platform_image_name)
+      puts "Cloning platform image #{platform_image.name} into shared image #{shared_image.name}"
+      platform_image.clone(shared_image.name, {:flags => LXC::LXC_CLONE_SNAPSHOT})
+      shared_image = DevLXC::Container.new(shared_image.name)
+
+      # Disable certain sysctl.d files in Ubuntu 10.04, they cause `start procps` to fail
+      # Enterprise Chef server's postgresql recipe expects to be able to `start procps`
+      if platform_image.name == "p-ubuntu-1004"
+        if File.exist?("#{shared_image.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf")
+          FileUtils.mv("#{shared_image.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf",
+                       "#{shared_image.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf.orig")
+        end
+      end
+      unless shared_image.config_item("lxc.mount.auto").nil?
+        shared_image.set_config_item("lxc.mount.auto", "proc:rw sys:rw")
+        shared_image.save_config
+      end
+      shared_image.sync_mounts(@mounts)
+      shared_image.start
+      case @server_type
+      when 'analytics'
+        shared_image.install_package(@packages["analytics"]) unless @packages["analytics"].nil?
+      when 'chef-server'
+        shared_image.install_package(@packages["server"]) unless @packages["server"].nil?
+        shared_image.install_package(@packages["reporting"]) unless @packages["reporting"].nil?
+        shared_image.install_package(@packages["push-jobs-server"]) unless @packages["push-jobs-server"].nil?
+        shared_image.install_package(@packages["sync"]) unless @packages["sync"].nil?
+      end
+      shared_image.stop
+      return shared_image
+    end
+
+    def configure_server
+      case @role
+      when "open-source"
+        puts "Creating /etc/chef-server/chef-server.rb"
+        FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/etc/chef-server")
+        IO.write("#{@server.config_item('lxc.rootfs')}/etc/chef-server/chef-server.rb", @chef_server_config)
+      when "standalone", "backend"
+        case @chef_server_type
+        when 'private-chef'
+          puts "Creating /etc/opscode/private-chef.rb"
+          FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/etc/opscode")
+          IO.write("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", @chef_server_config)
+        when 'chef-server-core'
+          puts "Creating /etc/opscode/chef-server.rb"
+          FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/etc/opscode")
+          IO.write("#{@server.config_item('lxc.rootfs')}/etc/opscode/chef-server.rb", @chef_server_config)
+        end
+      when "frontend"
+        puts "Copying /etc/opscode from bootstrap backend"
+        FileUtils.cp_r("#{LXC::Container.new(@chef_server_bootstrap_backend).config_item('lxc.rootfs')}/etc/opscode",
+                       "#{@server.config_item('lxc.rootfs')}/etc")
+      end
+      run_ctl(@server_ctl, "reconfigure")
+    end
+
+    def configure_reporting
+      if @role == 'frontend'
+        puts "Copying /etc/opscode-reporting from bootstrap backend"
+        FileUtils.cp_r("#{LXC::Container.new(@chef_server_bootstrap_backend).config_item('lxc.rootfs')}/etc/opscode-reporting",
+                       "#{@server.config_item('lxc.rootfs')}/etc")
+      end
+      run_ctl(@server_ctl, "reconfigure")
+      run_ctl("opscode-reporting", "reconfigure")
+    end
+
+    def configure_push_jobs_server
+      run_ctl("opscode-push-jobs-server", "reconfigure")
+      run_ctl(@server_ctl, "reconfigure")
+    end
+
+    def configure_manage
+      if @chef_server_type == 'private-chef'
+        puts "Disabling old opscode-webui in /etc/opscode/private-chef.rb"
+        DevLXC.search_file_delete_line("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", /opscode_webui[.enable.]/)
+        DevLXC.append_line_to_file("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", "\nopscode_webui['enable'] = false\n")
+        run_ctl(@server_ctl, "reconfigure")
+      end
+      run_ctl("opscode-manage", "reconfigure")
+    end
+
+    def configure_chef_server_for_analytics
+      puts "Configuring for Analytics"
+      case @chef_server_type
+      when 'private-chef'
+        DevLXC.append_line_to_file("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb",
+          "\noc_id['applications'] = {\n  'analytics' => {\n    'redirect_uri' => 'https://#{@analytics_fqdn}/'\n  }\n}\n")
+
+        DevLXC.append_line_to_file("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb",
+          "\nrabbitmq['vip'] = '#{@chef_server_bootstrap_backend}'\nrabbitmq['node_ip_address'] = '0.0.0.0'\n")
+      when 'chef-server-core'
+        DevLXC.append_line_to_file("#{@server.config_item('lxc.rootfs')}/etc/opscode/chef-server.rb",
+          "\noc_id['applications'] = {\n  'analytics' => {\n    'redirect_uri' => 'https://#{@analytics_fqdn}/'\n  }\n}\n")
+
+        DevLXC.append_line_to_file("#{@server.config_item('lxc.rootfs')}/etc/opscode/chef-server.rb",
+          "\nrabbitmq['vip'] = '#{@chef_server_bootstrap_backend}'\nrabbitmq['node_ip_address'] = '0.0.0.0'\n")
+      end
+
+      run_ctl(@server_ctl, "stop")
+      run_ctl(@server_ctl, "reconfigure")
+      run_ctl(@server_ctl, "restart")
+      run_ctl("opscode-manage", "reconfigure") if @role == 'frontend'
+    end
+
+    def configure_analytics
+      case @role
+      when "standalone", "backend"
+        puts "Copying /etc/opscode-analytics from Chef Server bootstrap backend"
+        FileUtils.cp_r("#{LXC::Container.new(@chef_server_bootstrap_backend).config_item('lxc.rootfs')}/etc/opscode-analytics",
+                       "#{@server.config_item('lxc.rootfs')}/etc")
+
+        IO.write("#{@server.config_item('lxc.rootfs')}/etc/opscode-analytics/opscode-analytics.rb", @analytics_config)
+      when "frontend"
+        puts "Copying /etc/opscode-analytics from Analytics bootstrap backend"
+        FileUtils.cp_r("#{LXC::Container.new(@analytics_bootstrap_backend).config_item('lxc.rootfs')}/etc/opscode-analytics",
+                       "#{@server.config_item('lxc.rootfs')}/etc")
+      end
+      run_ctl("opscode-analytics", "reconfigure")
+    end
+
+    def run_ctl(component, subcommand)
+      puts "Running `#{component}-ctl #{subcommand}` in #{@server.name}"
+      @server.run_command("#{component}-ctl #{subcommand}")
+    end
+
+    def create_users
+      puts "Creating org, user, keys and knife.rb in /root/chef-repo/.chef"
+      FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef")
+
+      case @chef_server_type
+      when 'chef-server'
+        chef_server_url = "https://127.0.0.1"
+        username = "admin"
+        validator_name = "chef-validator"
+
+        FileUtils.cp( Dir.glob("#{@server.config_item('lxc.rootfs')}/etc/chef-server/{admin,chef-validator}.pem"), "#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef" )
+      when 'private-chef'
+        chef_server_url = "https://127.0.0.1/organizations/ponyville"
+        username = "rainbowdash"
+        validator_name = "ponyville-validator"
+
+        # give time for all services to come up completely
+        sleep 60
+        pivotal_rb = %Q(
+chef_server_root "https://127.0.0.1/"
+chef_server_url "https://127.0.0.1/"
+
+node_name "pivotal"
+client_key "/etc/opscode/pivotal.pem"
+
+knife[:chef_repo_path] = Dir.pwd
+)
+        IO.write("#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef/pivotal.rb", pivotal_rb)
+        @server.run_command("/opt/opscode/embedded/bin/gem install knife-opc --no-ri --no-rdoc")
+        @server.run_command("/opt/opscode/embedded/bin/knife opc org create ponyville ponyville --filename /root/chef-repo/.chef/ponyville-validator.pem -c /root/chef-repo/.chef/pivotal.rb")
+        @server.run_command("/opt/opscode/embedded/bin/knife opc user create rainbowdash rainbowdash rainbowdash rainbowdash@noreply.com rainbowdash --filename /root/chef-repo/.chef/rainbowdash.pem -c /root/chef-repo/.chef/pivotal.rb")
+        @server.run_command("/opt/opscode/embedded/bin/knife opc org user add ponyville rainbowdash --admin -c /root/chef-repo/.chef/pivotal.rb")
+      when 'chef-server-core'
+        chef_server_url = "https://127.0.0.1/organizations/ponyville"
+        username = "rainbowdash"
+        validator_name = "ponyville-validator"
+
+        # give time for all services to come up completely
+        sleep 10
+        run_ctl(@server_ctl, "org-create ponyville ponyville --filename /root/chef-repo/.chef/ponyville-validator.pem")
+        run_ctl(@server_ctl, "user-create rainbowdash rainbowdash rainbowdash rainbowdash@noreply.com rainbowdash --filename /root/chef-repo/.chef/rainbowdash.pem")
+        run_ctl(@server_ctl, "org-user-add ponyville rainbowdash --admin")
+      end
+      knife_rb = %Q(
+current_dir = File.dirname(__FILE__)
+
+chef_server_url "#{chef_server_url}"
+
+node_name "#{username}"
+client_key "\#{current_dir}/#{username}.pem"
+
+validation_client_name "#{validator_name}"
+validation_key "\#{current_dir}/#{validator_name}.pem"
+
+cookbook_path Dir.pwd + "/cookbooks"
+knife[:chef_repo_path] = Dir.pwd
+)
+      IO.write("#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef/knife.rb", knife_rb)
+    end
+  end
+end

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/dev-lxc.rb

@@ -2,60 +2,60 @@ require "fileutils"
 require "digest/sha1"
 require "lxc"
 require "dev-lxc/container"
-require "dev-lxc/chef-server"
-require "dev-lxc/chef-cluster"
+require "dev-lxc/server"
+require "dev-lxc/cluster"
 
 module DevLXC
-  def self.create_platform_container(platform_container_name)
-    platform_container = DevLXC::Container.new(platform_container_name)
-    if platform_container.defined?
-      puts "Using existing platform container #{platform_container.name}"
-      return platform_container
+  def self.create_platform_image(platform_image_name)
+    platform_image = DevLXC::Container.new(platform_image_name)
+    if platform_image.defined?
+      puts "Using existing platform image #{platform_image.name}"
+      return platform_image
     end
-    puts "Creating platform container #{platform_container.name}"
-    case platform_container.name
+    puts "Creating platform image #{platform_image.name}"
+    case platform_image.name
     when "p-ubuntu-1004"
-      platform_container.create("download", "btrfs", 0, ["-d", "ubuntu", "-r", "lucid", "-a", "amd64"])
+      platform_image.create("download", "btrfs", {}, 0, ["-d", "ubuntu", "-r", "lucid", "-a", "amd64"])
     when "p-ubuntu-1204"
-      platform_container.create("download", "btrfs", 0, ["-d", "ubuntu", "-r", "precise", "-a", "amd64"])
+      platform_image.create("download", "btrfs", {}, 0, ["-d", "ubuntu", "-r", "precise", "-a", "amd64"])
     when "p-ubuntu-1404"
-      platform_container.create("download", "btrfs", 0, ["-d", "ubuntu", "-r", "trusty", "-a", "amd64"])
+      platform_image.create("download", "btrfs", {}, 0, ["-d", "ubuntu", "-r", "trusty", "-a", "amd64"])
     when "p-centos-5"
-      platform_container.create("centos", "btrfs", 0, ["-R", "5"])
+      platform_image.create("centos", "btrfs", {}, 0, ["-R", "5"])
     when "p-centos-6"
-      platform_container.create("download", "btrfs", 0, ["-d", "centos", "-r", "6", "-a", "amd64"])
+      platform_image.create("download", "btrfs", {}, 0, ["-d", "centos", "-r", "6", "-a", "amd64"])
     end
-    unless platform_container.config_item("lxc.mount.auto").empty?
-      platform_container.set_config_item("lxc.mount.auto", "proc:rw sys:rw")
+    unless platform_image.config_item("lxc.mount.auto").nil?
+      platform_image.set_config_item("lxc.mount.auto", "proc:rw sys:rw")
     end
     hwaddr = '00:16:3e:' + Digest::SHA1.hexdigest(Time.now.to_s).slice(0..5).unpack('a2a2a2').join(':')
-    puts "Setting #{platform_container.name} platform container's lxc.network.0.hwaddr to #{hwaddr}"
-    platform_container.set_config_item("lxc.network.0.hwaddr", hwaddr)
-    platform_container.save_config
-    platform_container.start
-    puts "Installing packages in platform container #{platform_container.name}"
-    case platform_container.name
+    puts "Setting #{platform_image.name} platform image's lxc.network.0.hwaddr to #{hwaddr}"
+    platform_image.set_config_item("lxc.network.0.hwaddr", hwaddr)
+    platform_image.save_config
+    platform_image.start
+    puts "Installing packages in platform image #{platform_image.name}"
+    case platform_image.name
     when "p-ubuntu-1004"
       # Disable certain sysctl.d files in Ubuntu 10.04, they cause `start procps` to fail
-      if File.exist?("#{platform_container.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf")
-        FileUtils.mv("#{platform_container.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf",
-                     "#{platform_container.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf.orig")
+      if File.exist?("#{platform_image.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf")
+        FileUtils.mv("#{platform_image.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf",
+                     "#{platform_image.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf.orig")
       end
-      platform_container.run_command("apt-get update")
-      platform_container.run_command("apt-get install -y standard^ server^ vim-nox emacs23-nox curl tree")
+      platform_image.run_command("apt-get update")
+      platform_image.run_command("apt-get install -y standard^ server^ vim-nox emacs23-nox curl tree")
     when "p-ubuntu-1204", "p-ubuntu-1404"
-      platform_container.run_command("apt-get update")
-      platform_container.run_command("apt-get install -y standard^ server^ vim-nox emacs23-nox tree")
+      platform_image.run_command("apt-get update")
+      platform_image.run_command("apt-get install -y standard^ server^ vim-nox emacs23-nox tree")
     when "p-centos-5"
       # downgrade openssl temporarily to overcome an install bug
       # reference: http://www.hack.net.br/blog/2014/02/12/openssl-conflicts-with-file-from-package-openssl/
-      platform_container.run_command("yum downgrade -y openssl")
-      platform_container.run_command("yum install -y @base @core vim-enhanced emacs-nox tree")
+      platform_image.run_command("yum downgrade -y openssl")
+      platform_image.run_command("yum install -y @base @core vim-enhanced emacs-nox tree")
     when "p-centos-6"
-      platform_container.run_command("yum install -y @base @core vim-enhanced emacs-nox tree")
+      platform_image.run_command("yum install -y @base @core vim-enhanced emacs-nox tree")
     end
-    platform_container.stop
-    return platform_container
+    platform_image.stop
+    return platform_image
   end
 
   def self.assign_ip_address(ipaddress, container_name, hwaddr)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.2.0
 description: A tool for creating Chef server clusters using LXC containers
 email:
 - jeremiah@getchef.com
@@ -85,10 +85,10 @@ files:
 - files/configs/standalone.yml
 - files/configs/tier.yml
 - lib/dev-lxc.rb
-- lib/dev-lxc/chef-cluster.rb
-- lib/dev-lxc/chef-server.rb
 - lib/dev-lxc/cli.rb
+- lib/dev-lxc/cluster.rb
 - lib/dev-lxc/container.rb
+- lib/dev-lxc/server.rb
 - lib/dev-lxc/version.rb
 homepage: https://github.com/jeremiahsnapp/dev-lxc
 licenses:

data/lib/dev-lxc/chef-cluster.rb

@@ -1,97 +0,0 @@
-require "dev-lxc/chef-server"
-
-module DevLXC
-  class ChefCluster
-    attr_reader :bootstrap_backend
-
-    def initialize(cluster_config)
-      @cluster_config = cluster_config
-      @api_fqdn = @cluster_config["api_fqdn"]
-      @analytics_fqdn = @cluster_config["analytics_fqdn"]
-      @topology = @cluster_config["topology"]
-      @servers = @cluster_config["servers"]
-      @frontends = Array.new
-      @servers.each do |name, config|
-        case @topology
-        when 'open-source', 'standalone'
-          @bootstrap_backend = name if config["role"].nil?
-        when 'tier'
-          @bootstrap_backend = name if config["role"] == "backend" && config["bootstrap"] == true
-          @frontends << name if config["role"] == "frontend"
-        end
-        @analytics_server = name if config["role"] == "analytics"
-      end
-    end
-
-    def chef_servers
-      chef_servers = Array.new
-      chef_servers << ChefServer.new(@bootstrap_backend, @cluster_config)
-      if @topology == "tier"
-        @frontends.each do |frontend_name|
-          chef_servers << ChefServer.new(frontend_name, @cluster_config)
-        end
-      end
-      chef_servers << ChefServer.new(@analytics_server, @cluster_config) if @analytics_server
-      chef_servers
-    end
-
-    def chef_repo
-      if @topology == "open-source"
-        puts "Unable to create a chef-repo for an Open Source Chef Server"
-        exit 1
-      end
-      chef_server = ChefServer.new(@bootstrap_backend, @cluster_config)
-      if ! chef_server.server.defined?
-        puts "The '#{chef_server.server.name}' Chef Server does not exist. Please create it first."
-        exit 1
-      end
-      puts "Creating chef-repo with pem files and knife.rb in the current directory"
-      FileUtils.mkdir_p("./chef-repo/.chef")
-      knife_rb = %Q(
-current_dir = File.dirname(__FILE__)
-
-chef_server_url "https://#{@api_fqdn}/organizations/ponyville"
-
-node_name "rainbowdash"
-client_key "\#{current_dir}/rainbowdash.pem"
-
-validation_client_name "ponyville-validator"
-validation_key "\#{current_dir}/ponyville-validator.pem"
-
-cookbook_path Dir.pwd + "/cookbooks"
-knife[:chef_repo_path] = Dir.pwd
-)
-      IO.write("./chef-repo/.chef/knife.rb", knife_rb)
-      if Dir.glob("#{chef_server.abspath('/root/chef-repo/.chef')}/*.pem").empty?
-        puts "The pem files can not be copied because they do not exist in '#{chef_server.server.name}' Chef Server's `/root/chef-repo/.chef` directory"
-      else
-        FileUtils.cp( Dir.glob("#{chef_server.abspath('/root/chef-repo/.chef')}/*.pem"), "./chef-repo/.chef" )
-      end
-    end
-
-    def chef_server_config
-      chef_server_config = %Q(api_fqdn "#{@api_fqdn}"\n)
-      if @topology == 'tier'
-        chef_server_config += %Q(
-topology "#{@topology}"
-
-server "#{@bootstrap_backend}",
-  :ipaddress => "#{@servers[@bootstrap_backend]["ipaddress"]}",
-  :role => "backend",
-  :bootstrap => true
-
-backend_vip "#{@bootstrap_backend}",
-  :ipaddress => "#{@servers[@bootstrap_backend]["ipaddress"]}"
-)
-        @frontends.each do |frontend_name|
-          chef_server_config += %Q(
-server "#{frontend_name}",
-  :ipaddress => "#{@servers[frontend_name]["ipaddress"]}",
-  :role => "frontend"
-)
-        end
-      end
-      return chef_server_config
-    end
-  end
-end