dev-lxc 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d4ae58ed1605db4dffdfb5c8d56b150b1371141
-  data.tar.gz: e57063974d71caaa0690b38076aa4524ed9c9804
+  metadata.gz: ad3bac1e078481c496d8bba29bf48a5ec94ae4e2
+  data.tar.gz: 08f93c461e0025e70c7e52cddfc021288008169a
 SHA512:
-  metadata.gz: 7b6bb19d1245a3004402e82a8adf6462f76fc52058790b1a2e7c556fcf6df887b96a1f9a49402057b8a0402631b3965c7e6a5a0a934b01cdb716df9f67b07486
-  data.tar.gz: 8ad996d4fd7adda6663f44cda48f04d62a96cf125828159426887be5cd5f1e298e3d23b7a2444564d7fb20d77d3adf449e21c90e4fe816fbe939f9833e6ddedc
+  metadata.gz: fe9e4793eaa9b92a18471fd58863153204661ca18f9204042971b1e9aa44222d1ea13abc7d8fbacd8015291735e7aef17d986e7280c30b587c4f5570857f6de7
+  data.tar.gz: d7baa7c93dff7630920778298c4607d0d539f1730e68897b75babb2c71f3e50e406243c9b127d78143717d86a5a844b26b1c0602bfa357b3947da6afb35fcf41

data/README.md

@@ -13,7 +13,7 @@ cluster builds for demo purposes, as well as general experimentation and explora
 1. LXC 1.0 Containers - Resource efficient servers with fast start/stop times and standard init
 2. Btrfs - Efficient storage backend provides fast, lightweight container cloning
 3. Dnsmasq - DHCP networking and DNS resolution
-4. Base platforms - Containers that are built to resemble a traditional server
+4. Base containers - Containers that are built to resemble a traditional server
 5. ruby-lxc - Ruby bindings for liblxc
 6. YAML - Simple, customizable definition of clusters; No more setting ENV variables
 7. Build process closely models online installation documentation
@@ -77,32 +77,34 @@ Run `gem update dev-lxc` inside the Vagrant VM to ensure you have the latest ver
 
 One of the key things this tool uses is the concept of "base" containers.
 
-`dev-lxc` creates containers with "b-" prepended to the name to distinguish it as
-a base container.
+`dev-lxc` creates base containers with a "p-", "s-" or "u-" prefix on the name to distinguish it as
+a "platform", "shared" or "unique" base container.
 
 Base containers are then snapshot cloned using the btrfs filesystem to very quickly
-provide lightweight duplicates of the base container that are either used to build
+provide a lightweight duplicate of the base container. This clone is either used to build
 another base container or a container that will actually be run.
 
 During a cluster build process the base containers that get created fall into three categories.
 
 1. Platform
 
-    The platform base container is the first to get created.
+    The platform base container is the first to get created and is identified by the
+	"p-" prefix on the container name.
 
     `DevLXC#create_base_platform` controls the creation of a platform base container.
 
-    This container provides the chosen OS platform and version (e.g. b-ubuntu-1404).
+    This container provides the chosen OS platform and version (e.g. p-ubuntu-1404).
 	A typical LXC container has minimal packages installed so `dev-lxc` makes sure that the
 	same packages used in Chef's [bento boxes](https://github.com/opscode/bento) are
 	installed to provide a more typical server environment.
 	A few additional packages are also installed.
 
-    Once this platform base container is created there is rarely a need to delete it.
+    *Once this platform base container is created there is rarely a need to delete it.*
 
 2. Shared
 
-    The shared base container is the second to get created.
+    The shared base container is the second to get created and is identified by the
+	"s-" prefix on the container name.
 
     `DevLXC::ChefServer#create_base_server` controls the creation of a shared base container.
 
@@ -113,14 +115,15 @@ During a cluster build process the base containers that get created fall into th
 	servers (i.e. it does not get installed on backend servers).
 
     The name of this base container is built from the names and versions of the Chef packages that
-	get installed which makes this base container easy to be reused by  another cluster that is
+	get installed which makes this base container easy to be reused by another cluster that is
 	configured to use the same Chef packages.
 
-    Since no configuration actually happens yet there is rarely a need to delete this container.
+    *Since no configuration actually happens yet there is rarely a need to delete this container.*
 
 3. Unique
 
-    The unique base container is the last to get created.
+    The unique base container is the last to get created and is identified by the
+	"u-" prefix on the container name.
 
     `DevLXC::ChefServer#create` controls the creation of a unique base container.
 
@@ -165,7 +168,7 @@ You can see a menu of platform base containers this tool can create by using the
 The initial creation of platform base containers can take awhile so let's go ahead and start creating
 an Ubuntu 12.04 base container now.
 
-    dev-lxc create b-ubuntu-1404
+    dev-lxc create p-ubuntu-1404
 
 ### Cluster Config Files
 
@@ -177,16 +180,16 @@ The following command generates sample config files for various cluster topologi
 
 `dev-lxc cluster init tier` generates the following file:
 
-    base_platform: b-ubuntu-1404
+    platform_container: p-ubuntu-1404
     topology: tier
     api_fqdn: chef-tier.lxc
     mounts:
       - /dev-shared dev-shared
     packages:
-      server: /dev-shared/chef-packages/cs/chef-server-core_12.0.1-1_amd64.deb
-#      reporting: /dev-shared/chef-packages/cs/reporting/opscode-reporting_1.2.3-1_amd64.deb
-#      push-jobs-server: /dev-shared/chef-packages/cs/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
-#      manage: /dev-shared/chef-packages/cs/manage/opscode-manage_1.6.2-1_amd64.deb
+      server: /dev-shared/chef-packages/cs/chef-server-core_12.0.3-1_amd64.deb
+    #  reporting: /dev-shared/chef-packages/reporting/opscode-reporting_1.2.3-1_amd64.deb
+    #  push-jobs-server: /dev-shared/chef-packages/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
+    #  manage: /dev-shared/chef-packages/manage/opscode-manage_1.9.0-1_amd64.deb
     servers:
       be-tier.lxc:
         role: backend
@@ -307,6 +310,14 @@ Show the status of the cluster.
 
     dev-cluster status
 
+Create a local chef-repo with appropriate knife.rb and pem files.
+This makes it easy to use knife.
+
+    dev-lxc cluster chef-repo
+	cd chef-repo
+	knife ssl fetch
+	knife client list
+
 Stop the cluster's servers.
 
 	dev-lxc cluster stop

data/dev-lxc.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 0"
   spec.add_runtime_dependency "thor", "~> 0"
-  spec.add_runtime_dependency "ruby-lxc", "~> 1.0.1"
+  spec.add_runtime_dependency "ruby-lxc", "~> 1.0.2"
 end

data/files/configs/open-source.yaml

@@ -1,4 +1,4 @@
-base_platform: b-ubuntu-1204
+platform_container: p-ubuntu-1204
 topology: open-source
 api_fqdn: chef-osc.lxc
 mounts:

data/files/configs/standalone.yaml

@@ -1,13 +1,13 @@
-base_platform: b-ubuntu-1404
+platform_container: p-ubuntu-1404
 topology: standalone
 api_fqdn: chef-standalone.lxc
 mounts:
   - /dev-shared dev-shared
 packages:
-  server: /dev-shared/chef-packages/cs/chef-server-core_12.0.1-1_amd64.deb
-#  reporting: /dev-shared/chef-packages/cs/reporting/opscode-reporting_1.2.3-1_amd64.deb
-#  push-jobs-server: /dev-shared/chef-packages/cs/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
-#  manage: /dev-shared/chef-packages/cs/manage/opscode-manage_1.6.2-1_amd64.deb
+  server: /dev-shared/chef-packages/cs/chef-server-core_12.0.3-1_amd64.deb
+#  reporting: /dev-shared/chef-packages/reporting/opscode-reporting_1.2.3-1_amd64.deb
+#  push-jobs-server: /dev-shared/chef-packages/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
+#  manage: /dev-shared/chef-packages/manage/opscode-manage_1.9.0-1_amd64.deb
 servers:
   chef-standalone.lxc:
     ipaddress: 10.0.3.201

data/files/configs/tier.yaml

@@ -1,13 +1,13 @@
-base_platform: b-ubuntu-1404
+platform_container: p-ubuntu-1404
 topology: tier
 api_fqdn: chef-tier.lxc
 mounts:
   - /dev-shared dev-shared
 packages:
-  server: /dev-shared/chef-packages/cs/chef-server-core_12.0.1-1_amd64.deb
-#  reporting: /dev-shared/chef-packages/cs/reporting/opscode-reporting_1.2.3-1_amd64.deb
-#  push-jobs-server: /dev-shared/chef-packages/cs/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
-#  manage: /dev-shared/chef-packages/cs/manage/opscode-manage_1.6.2-1_amd64.deb
+  server: /dev-shared/chef-packages/cs/chef-server-core_12.0.3-1_amd64.deb
+#  reporting: /dev-shared/chef-packages/reporting/opscode-reporting_1.2.3-1_amd64.deb
+#  push-jobs-server: /dev-shared/chef-packages/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
+#  manage: /dev-shared/chef-packages/manage/opscode-manage_1.9.0-1_amd64.deb
 servers:
   be-tier.lxc:
     role: backend

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

@@ -2,20 +2,17 @@ require "dev-lxc/chef-server"
 
 module DevLXC
   class ChefCluster
-    attr_reader :api_fqdn, :topology, :bootstrap_backend, :secondary_backend, :frontends
+    attr_reader :api_fqdn, :topology, :bootstrap_backend, :frontends
 
     def initialize(cluster_config)
       @cluster_config = cluster_config
       @api_fqdn = @cluster_config["api_fqdn"]
       @topology = @cluster_config["topology"]
       @servers = @cluster_config["servers"]
-      if %w(tier ha).include?(@topology)
+      if @topology == 'tier'
         @bootstrap_backend = @servers.select {|k,v| v["role"] == "backend" && v["bootstrap"] == true}.first.first
         @frontends = @servers.select {|k,v| v["role"] == "frontend"}.keys
       end
-      if @topology == "ha"
-        @secondary_backend = @servers.select {|k,v| v["role"] == "backend" && v["bootstrap"] == nil}.first.first
-      end
     end
 
     def chef_servers
@@ -28,12 +25,6 @@ module DevLXC
         @frontends.each do |frontend_name|
           chef_servers << ChefServer.new(frontend_name, @cluster_config)
         end
-      when "ha"
-        chef_servers << ChefServer.new(@bootstrap_backend, @cluster_config)
-        chef_servers << ChefServer.new(@secondary_backend, @cluster_config)
-        @frontends.each do |frontend_name|
-          chef_servers << ChefServer.new(frontend_name, @cluster_config)
-        end
       end
       chef_servers
     end
@@ -49,6 +40,44 @@ module DevLXC
       abspath.compact
     end
 
+    def chef_repo
+      case @topology
+      when "open-source"
+        puts "Unable to create a chef-repo for an Open Source Chef Server"
+        exit 1
+      when "standalone"
+        chef_server = ChefServer.new(@servers.keys.first, @cluster_config)
+      when "tier"
+        chef_server = ChefServer.new(@bootstrap_backend, @cluster_config)
+      end
+      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 run_command(command)
       chef_servers.each { |cs| cs.run_command(command) }
     end
@@ -67,54 +96,34 @@ module DevLXC
       puts "Destroying cluster"
       chef_servers.reverse_each { |cs| cs.destroy }
     end
-    
-    def destroy_base_container(type)
+
+    def destroy_container(type)
       case type
       when :unique
         @servers.keys.each do |server_name|
-          DevLXC::ChefServer.new(server_name, @cluster_config).destroy_base_container(:unique)
+          DevLXC::ChefServer.new(server_name, @cluster_config).destroy_container(:unique)
         end
       when :shared
-        DevLXC::ChefServer.new(@servers.keys.first, @cluster_config).destroy_base_container(:shared)
+        DevLXC::ChefServer.new(@servers.keys.first, @cluster_config).destroy_container(:shared)
       when :platform
-        DevLXC::ChefServer.new(@servers.keys.first, @cluster_config).destroy_base_container(:platform)
+        DevLXC::ChefServer.new(@servers.keys.first, @cluster_config).destroy_container(:platform)
       end
     end
 
     def chef_server_config
       chef_server_config = %Q(api_fqdn "#{@api_fqdn}"\n)
-      if %w(tier ha).include?(@topology)
+      if @topology == 'tier'
         chef_server_config += %Q(
 topology "#{@topology}"
 
 server "#{@bootstrap_backend}",
   :ipaddress => "#{@servers[@bootstrap_backend]["ipaddress"]}",
   :role => "backend",
-  :bootstrap => true)
-
-        case @topology
-        when "tier"
-          chef_server_config += %Q(
+  :bootstrap => true
 
 backend_vip "#{@bootstrap_backend}",
   :ipaddress => "#{@servers[@bootstrap_backend]["ipaddress"]}"
 )
-        when "ha"
-          backend_vip_name = config["backend_vip"].keys.first
-          chef_server_config += %Q(,
-  :cluster_ipaddress => "#{@servers[@bootstrap_backend]["cluster_ipaddress"]}"
-
-server "#{@secondary_backend}",
-  :ipaddress => "#{@servers[@secondary_backend]["ipaddress"]}",
-  :role => "backend",
-  :cluster_ipaddress => "#{@servers[@secondary_backend]["cluster_ipaddress"]}
-
-backend_vip "#{backend_vip_name}",
-  :ipaddress => "#{config["backend_vip"][backend_vip_name]["ipaddress"]}",
-  :device => "#{config["backend_vip"][backend_vip_name]["device"]}",
-  :heartbeat_device => "#{config["backend_vip"][backend_vip_name]["heartbeat_device"]}"
-)
-        end
         @frontends.each do |frontend_name|
           chef_server_config += %Q(
 server "#{frontend_name}",

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

@@ -3,7 +3,7 @@ require "dev-lxc/chef-cluster"
 
 module DevLXC
   class ChefServer
-    attr_reader :base_platform, :base_server_name
+    attr_reader :platform_container_name, :server, :shared_container_name
 
     def initialize(name, cluster_config)
       unless cluster_config["servers"].keys.include?(name)
@@ -16,16 +16,15 @@ module DevLXC
       case cluster.topology
       when "open-source", "standalone"
         @role = cluster.topology
-      when "tier", "ha"
+      when "tier"
         @role = "bootstrap_backend" if @server.name == cluster.bootstrap_backend
-        @role = "secondary_backend" if @server.name == cluster.secondary_backend
         @role = "frontend" if cluster.frontends.include?(@server.name)
       end
       @mounts = cluster_config["mounts"]
       @bootstrap_backend = cluster.bootstrap_backend
       @chef_server_config = cluster.chef_server_config
       @api_fqdn = cluster.api_fqdn
-      @base_platform = cluster_config["base_platform"]
+      @platform_container_name = cluster_config["platform_container"]
       @packages = cluster_config["packages"]
 
       if File.basename(@packages["server"]).match(/^(\w+-\w+.*)[_-]((?:\d+\.?){3,})-/)
@@ -33,21 +32,21 @@ module DevLXC
         @chef_server_version = Regexp.last_match[2].gsub(".", "-")
       end
 
-      @base_server_name = @base_platform
+      @shared_container_name = "s#{@platform_container_name[1..-1]}"
       case @chef_server_type
       when 'chef-server-core'
-        @base_server_name += '-cs'
+        @shared_container_name += '-cs'
         @server_ctl = 'chef-server'
       when 'private-chef'
-        @base_server_name += '-ec'
+        @shared_container_name += '-ec'
         @server_ctl = 'private-chef'
       when 'chef-server'
-        @base_server_name += '-osc'
+        @shared_container_name += '-osc'
         @server_ctl = 'chef-server'
       end
-      @base_server_name += "-#{@chef_server_version}"
-      @base_server_name += "-reporting-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["reporting"].to_s.match(/[_-]((\d+\.?){3,})-/)
-      @base_server_name += "-pushy-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["push-jobs-server"].to_s.match(/[_-]((\d+\.?){3,})-/)
+      @shared_container_name += "-#{@chef_server_version}"
+      @shared_container_name += "-reporting-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["reporting"].to_s.match(/[_-]((\d+\.?){3,})-/)
+      @shared_container_name += "-pushy-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["push-jobs-server"].to_s.match(/[_-]((\d+\.?){3,})-/)
     end
 
     def status
@@ -103,14 +102,14 @@ module DevLXC
       DevLXC.reload_dnsmasq
     end
 
-    def destroy_base_container(type)
+    def destroy_container(type)
       case type
       when :unique
-        DevLXC::Container.new("b-#{@server.name}").destroy
+        DevLXC::Container.new("u-#{@server.name}").destroy
       when :shared
-        DevLXC::Container.new(@base_server_name).destroy
+        DevLXC::Container.new(@shared_container_name).destroy
       when :platform
-        DevLXC::Container.new(@base_platform).destroy
+        DevLXC::Container.new(@platform_container_name).destroy
       end
     end
 
@@ -119,10 +118,10 @@ module DevLXC
         puts "Using existing container #{@server.name}"
         return
       end
-      server_clone = DevLXC::Container.new("b-#{@server.name}")
-      if server_clone.defined?
-        puts "Cloning container #{server_clone.name} into container #{@server.name}"
-        server_clone.clone(@server.name, {:flags => LXC::LXC_CLONE_SNAPSHOT|LXC::LXC_CLONE_KEEPMACADDR})
+      unique_container = DevLXC::Container.new("u-#{@server.name}")
+      if unique_container.defined?
+        puts "Cloning shared container #{unique_container.name} into container #{@server.name}"
+        unique_container.clone(@server.name, {:flags => LXC::LXC_CLONE_SNAPSHOT|LXC::LXC_CLONE_KEEPMACADDR})
         @server = DevLXC::Container.new(@server.name)
         return
       else
@@ -130,9 +129,9 @@ module DevLXC
         unless %w(open-source standalone).include?(@role) || @server.name == @bootstrap_backend || DevLXC::Container.new(@bootstrap_backend).defined?
           raise "The bootstrap backend server must be created first."
         end
-        base_server = create_base_server
-        puts "Cloning container #{base_server.name} into container #{@server.name}"
-        base_server.clone(@server.name, {:flags => LXC::LXC_CLONE_SNAPSHOT})
+        shared_container = create_shared_container
+        puts "Cloning shared container #{shared_container.name} into container #{@server.name}"
+        shared_container.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")
@@ -145,7 +144,7 @@ module DevLXC
         @server.start
         configure_server unless @packages["server"].nil?
         create_users if %w(standalone bootstrap_backend).include?(@role)
-        if %w(standalone bootstrap_backend secondary_backend frontend).include?(@role)
+        if %w(standalone bootstrap_backend frontend).include?(@role)
           configure_reporting unless @packages["reporting"].nil?
           configure_push_jobs_server unless @packages["push-jobs-server"].nil?
         end
@@ -154,42 +153,41 @@ module DevLXC
           configure_manage
         end
         @server.stop
-        puts "Cloning container #{@server.name} into b-#{@server.name}"
-        @server.clone("b-#{@server.name}", {:flags => LXC::LXC_CLONE_SNAPSHOT|LXC::LXC_CLONE_KEEPMACADDR})
+        puts "Cloning container #{@server.name} into unique container #{unique_container.name}"
+        @server.clone("#{unique_container.name}", {:flags => LXC::LXC_CLONE_SNAPSHOT|LXC::LXC_CLONE_KEEPMACADDR})
       end
     end
 
-    def create_base_server
-      base_server = DevLXC::Container.new(@base_server_name)
-      if base_server.defined?
-        puts "Using existing container #{base_server.name}"
-        return base_server
+    def create_shared_container
+      shared_container = DevLXC::Container.new(@shared_container_name)
+      if shared_container.defined?
+        puts "Using existing shared container #{shared_container.name}"
+        return shared_container
       end
-      base_platform = DevLXC.create_base_platform(@base_platform)
-      puts "Cloning container #{base_platform.name} into container #{base_server.name}"
-      base_platform.clone(base_server.name, {:flags => LXC::LXC_CLONE_SNAPSHOT})
-      base_server = DevLXC::Container.new(base_server.name)
+      platform_container = DevLXC.create_platform_container(@platform_container_name)
+      puts "Cloning platform container #{platform_container.name} into shared container #{shared_container.name}"
+      platform_container.clone(shared_container.name, {:flags => LXC::LXC_CLONE_SNAPSHOT})
+      shared_container = DevLXC::Container.new(shared_container.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 base_platform.name == "b-ubuntu-1004"
-        if File.exist?("#{base_server.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf")
-          FileUtils.mv("#{base_server.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf",
-                       "#{base_server.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf.orig")
+      if platform_container.name == "p-ubuntu-1004"
+        if File.exist?("#{shared_container.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf")
+          FileUtils.mv("#{shared_container.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf",
+                       "#{shared_container.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf.orig")
         end
       end
-      # TODO when LXC 1.0.2 is released the following test can be done using #config_item("lxc.mount.auto")
-      unless IO.readlines(base_server.config_file_name).select { |line| line.start_with?("lxc.mount.auto") }.empty?
-        base_server.set_config_item("lxc.mount.auto", "proc:rw sys:rw")
-        base_server.save_config
+      unless shared_container.config_item("lxc.mount.auto").empty?
+        shared_container.set_config_item("lxc.mount.auto", "proc:rw sys:rw")
+        shared_container.save_config
       end
-      base_server.sync_mounts(@mounts)
-      base_server.start
-      base_server.install_package(@packages["server"]) unless @packages["server"].nil?
-      base_server.install_package(@packages["reporting"]) unless @packages["reporting"].nil?
-      base_server.install_package(@packages["push-jobs-server"]) unless @packages["push-jobs-server"].nil?
-      base_server.stop
-      return base_server
+      shared_container.sync_mounts(@mounts)
+      shared_container.start
+      shared_container.install_package(@packages["server"]) unless @packages["server"].nil?
+      shared_container.install_package(@packages["reporting"]) unless @packages["reporting"].nil?
+      shared_container.install_package(@packages["push-jobs-server"]) unless @packages["push-jobs-server"].nil?
+      shared_container.stop
+      return shared_container
     end
 
     def configure_server
@@ -211,7 +209,7 @@ module DevLXC
           IO.write("#{@server.config_item('lxc.rootfs')}/etc/opscode/chef-server.rb", @chef_server_config)
         end
         run_ctl(@server_ctl, "reconfigure")
-      when "secondary_backend", "frontend"
+      when "frontend"
         puts "Copying /etc/opscode from bootstrap backend"
         FileUtils.cp_r("#{LXC::Container.new(@bootstrap_backend).config_item('lxc.rootfs')}/etc/opscode",
                        "#{@server.config_item('lxc.rootfs')}/etc")
@@ -220,7 +218,7 @@ module DevLXC
     end
 
     def configure_reporting
-      if %w(secondary_backend frontend).include?(@role)
+      if @role == 'frontend'
         puts "Copying /etc/opscode-reporting from bootstrap backend"
         FileUtils.cp_r("#{LXC::Container.new(@bootstrap_backend).config_item('lxc.rootfs')}/etc/opscode-reporting",
                        "#{@server.config_item('lxc.rootfs')}/etc")
@@ -231,10 +229,7 @@ module DevLXC
 
     def configure_push_jobs_server
       run_ctl("opscode-push-jobs-server", "reconfigure")
-      if %w(bootstrap_backend secondary_backend).include?(@role)
-        run_ctl(@server_ctl, "reconfigure")
-      end
-      run_ctl(@server_ctl, "restart opscode-pushy-server")
+      run_ctl(@server_ctl, "reconfigure")
     end
 
     def configure_manage
@@ -255,20 +250,34 @@ module DevLXC
     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")
-      knife_rb = "chef_server_url 'https://127.0.0.1/organizations/ponyville'\n"
-      knife_rb += "node_name 'rainbowdash'\n"
-      knife_rb += "client_key 'rainbowdash.pem'\n"
-      knife_rb += "knife[:chef_repo_path] = Dir.pwd\n"
+      knife_rb = %Q(
+current_dir = File.dirname(__FILE__)
+
+chef_server_url "https://127.0.0.1/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("#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef/knife.rb", knife_rb)
       case @chef_server_type
       when 'private-chef'
         # give time for all services to come up completely
         sleep 60
-        pivotal_rb = "chef_server_root 'https://127.0.0.1/'\n"
-        pivotal_rb += "chef_server_url 'https://127.0.0.1/'\n"
-        pivotal_rb += "node_name 'pivotal'\n"
-        pivotal_rb += "client_key '/etc/opscode/pivotal.pem'\n"
-        pivotal_rb += "knife[:chef_repo_path] = Dir.pwd\n"
+        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")

data/lib/dev-lxc/cli.rb

@@ -37,6 +37,12 @@ module DevLXC::CLI
       puts get_cluster(options[:config]).abspath(rootfs_path).join(" ")
     end
 
+    desc "chef-repo", "Creates a chef-repo in the current directory using files from the cluster's backend /root/chef-repo"
+    option :config, :aliases => "-c", :desc => "Specify a cluster's YAML config file. ./dev-lxc.yaml will be used by default"
+    def chef_repo
+      get_cluster(options[:config]).chef_repo
+    end
+
     desc "run_command [COMMAND]", "Runs a command in each Chef server in a cluster"
     option :config, :aliases => "-c", :desc => "Specify a cluster's YAML config file. ./dev-lxc.yaml will be used by default"
     def run_command(command)
@@ -57,15 +63,15 @@ module DevLXC::CLI
 
     desc "destroy", "Destroy a cluster's Chef servers"
     option :config, :aliases => "-c", :desc => "Specify a cluster's YAML config file. ./dev-lxc.yaml will be used by default"
-    option :unique, :aliases => "-u", :type => :boolean, :desc => "Also destroy the cluster's unique base containers"
-    option :shared, :aliases => "-s", :type => :boolean, :desc => "Also destroy the cluster's shared base container"
-    option :platform, :aliases => "-p", :type => :boolean, :desc => "Also destroy the cluster's platform base container"
+    option :unique, :aliases => "-u", :type => :boolean, :desc => "Also destroy the cluster's unique containers"
+    option :shared, :aliases => "-s", :type => :boolean, :desc => "Also destroy the cluster's shared container"
+    option :platform, :aliases => "-p", :type => :boolean, :desc => "Also destroy the cluster's platform container"
     def destroy
       cluster = get_cluster(options[:config])
       cluster.destroy
-      cluster.destroy_base_container(:unique) if options[:unique]
-      cluster.destroy_base_container(:shared) if options[:shared]
-      cluster.destroy_base_container(:platform) if options[:platform]
+      cluster.destroy_container(:unique) if options[:unique]
+      cluster.destroy_container(:shared) if options[:shared]
+      cluster.destroy_container(:platform) if options[:platform]
     end
   end
 
@@ -111,35 +117,35 @@ module DevLXC::CLI
 
     desc "destroy [NAME]", "Destroy a cluster's Chef server"
     option :config, :aliases => "-c", :desc => "Specify a cluster's YAML config file. ./dev-lxc.yaml will be used by default"
-    option :unique, :aliases => "-u", :type => :boolean, :desc => "Also destroy the server's unique base container"
-    option :shared, :aliases => "-s", :type => :boolean, :desc => "Also destroy the server's shared base container"
-    option :platform, :aliases => "-p", :type => :boolean, :desc => "Also destroy the server's platform base container"
+    option :unique, :aliases => "-u", :type => :boolean, :desc => "Also destroy the server's unique container"
+    option :shared, :aliases => "-s", :type => :boolean, :desc => "Also destroy the server's shared container"
+    option :platform, :aliases => "-p", :type => :boolean, :desc => "Also destroy the server's platform container"
     def destroy(name)
       server = get_server(name, options[:config])
       server.destroy
-      server.destroy_base_container(:unique) if options[:unique]
-      server.destroy_base_container(:shared) if options[:shared]
-      server.destroy_base_container(:platform) if options[:platform]
+      server.destroy_container(:unique) if options[:unique]
+      server.destroy_container(:shared) if options[:shared]
+      server.destroy_container(:platform) if options[:platform]
     end
   end
 
   class DevLXC < Thor
-    desc "create [BASE_PLATFORM]", "Create a base platform"
-    def create(base_platform=nil)
-      base_platforms = %w(b-ubuntu-1004 b-ubuntu-1204 b-ubuntu-1404 b-centos-5 b-centos-6)
-      if base_platform.nil? || ! base_platforms.include?(base_platform)
-        base_platforms_with_index = base_platforms.map.with_index{ |a, i| [i+1, *a]}
-        print_table base_platforms_with_index
-        selection = ask("Which base platform do you want to create?", :limited_to => base_platforms_with_index.map{|c| c[0].to_s})
-        base_platform = base_platforms[selection.to_i - 1]
+    desc "create [PLATFORM_CONTAINER_NAME]", "Create a platform container"
+    def create(platform_container_name=nil)
+      platform_container_names = %w(p-ubuntu-1204 p-ubuntu-1404 p-centos-5 p-centos-6)
+      if platform_container_name.nil? || ! platform_container_names.include?(platform_container_name)
+        platform_container_names_with_index = platform_container_names.map.with_index{ |a, i| [i+1, *a]}
+        print_table platform_container_names_with_index
+        selection = ask("Which platform container do you want to create?", :limited_to => platform_container_names_with_index.map{|c| c[0].to_s})
+        platform_container_name = platform_container_names[selection.to_i - 1]
       end
-      ::DevLXC.create_base_platform(base_platform)
+      ::DevLXC.create_platform_container(platform_container_name)
     end
 
-    desc "cluster SUBCOMMAND ...ARGS", "manage Chef cluster"
+    desc "cluster SUBCOMMAND ...ARGS", "Manage Chef cluster"
     subcommand "cluster", Cluster
 
-    desc "server SUBCOMMAND ...ARGS", "manage Chef server"
+    desc "server SUBCOMMAND ...ARGS", "Manage Chef server"
     subcommand "server", Server
   end
 end

data/lib/dev-lxc/container.rb

@@ -37,8 +37,13 @@ module DevLXC
       end
       mounts.each do |mount|
         raise "Mount source #{mount.split.first} does not exist." unless File.exists?(mount.split.first)
-        puts "Adding mount entry #{mount}"
-        self.set_config_item("lxc.mount.entry", "#{mount} none bind,optional,create=dir 0 0     ## dev-lxc ##")
+        if 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
       self.save_config
     end

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

data/lib/dev-lxc.rb

@@ -6,60 +6,56 @@ require "dev-lxc/chef-server"
 require "dev-lxc/chef-cluster"
 
 module DevLXC
-  def self.create_base_platform(base_platform_name)
-    base_platform = DevLXC::Container.new(base_platform_name)
-    if base_platform.defined?
-      puts "Using existing container #{base_platform.name}"
-      return base_platform
+  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
     end
-    puts "Creating container #{base_platform.name}"
-    case base_platform.name
-    when "b-ubuntu-1004"
-      base_platform.create("download", "btrfs", 0, ["-d", "ubuntu", "-r", "lucid", "-a", "amd64"])
-    when "b-ubuntu-1204"
-      base_platform.create("download", "btrfs", 0, ["-d", "ubuntu", "-r", "precise", "-a", "amd64"])
-    when "b-ubuntu-1404"
-      base_platform.create("download", "btrfs", 0, ["-d", "ubuntu", "-r", "trusty", "-a", "amd64"])
-    when "b-centos-5"
-      base_platform.create("centos", "btrfs", 0, ["-R", "5"])
-    when "b-centos-6"
-      base_platform.create("download", "btrfs", 0, ["-d", "centos", "-r", "6", "-a", "amd64"])
+    puts "Creating platform container #{platform_container.name}"
+    case platform_container.name
+    when "p-ubuntu-1004"
+      platform_container.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"])
+    when "p-ubuntu-1404"
+      platform_container.create("download", "btrfs", 0, ["-d", "ubuntu", "-r", "trusty", "-a", "amd64"])
+    when "p-centos-5"
+      platform_container.create("centos", "btrfs", 0, ["-R", "5"])
+    when "p-centos-6"
+      platform_container.create("download", "btrfs", 0, ["-d", "centos", "-r", "6", "-a", "amd64"])
     end
-    # TODO when LXC 1.0.2 is released and the following test is replaced with #config_item("lxc.mount.auto")
-    # then this #save_config can be removed
-    base_platform.save_config
-    # TODO when LXC 1.0.2 is released the following test can be done using #config_item("lxc.mount.auto")
-    unless IO.readlines(base_platform.config_file_name).select { |line| line.start_with?("lxc.mount.auto") }.empty?
-      base_platform.set_config_item("lxc.mount.auto", "proc:rw sys:rw")
+    unless platform_container.config_item("lxc.mount.auto").empty?
+      platform_container.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 #{base_platform.name} container's lxc.network.0.hwaddr to #{hwaddr}"
-    base_platform.set_config_item("lxc.network.0.hwaddr", hwaddr)
-    base_platform.save_config
-    base_platform.start
-    puts "Installing packages in container #{base_platform.name}"
-    case base_platform.name
-    when "b-ubuntu-1004"
+    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
+    when "p-ubuntu-1004"
       # Disable certain sysctl.d files in Ubuntu 10.04, they cause `start procps` to fail
-      if File.exist?("#{base_platform.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf")
-        FileUtils.mv("#{base_platform.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf",
-                     "#{base_platform.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf.orig")
+      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")
       end
-      base_platform.run_command("apt-get update")
-      base_platform.run_command("apt-get install -y standard^ server^ vim-nox emacs23-nox curl tree")
-    when "b-ubuntu-1204", "b-ubuntu-1404"
-      base_platform.run_command("apt-get update")
-      base_platform.run_command("apt-get install -y standard^ server^ vim-nox emacs23-nox tree")
-    when "b-centos-5"
+      platform_container.run_command("apt-get update")
+      platform_container.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")
+    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/
-      base_platform.run_command("yum downgrade -y openssl")
-      base_platform.run_command("yum install -y @base @core vim-enhanced emacs-nox tree")
-    when "b-centos-6"
-      base_platform.run_command("yum install -y @base @core vim-enhanced emacs-nox tree")
+      platform_container.run_command("yum downgrade -y openssl")
+      platform_container.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")
     end
-    base_platform.stop
-    return base_platform
+    platform_container.stop
+    return platform_container
   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.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-02-07 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.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 description: A tool for creating Chef server clusters using LXC containers
 email:
 - jeremiah@getchef.com
@@ -81,7 +81,6 @@ files:
 - Rakefile
 - bin/dev-lxc
 - dev-lxc.gemspec
-- files/configs/ha.yaml
 - files/configs/open-source.yaml
 - files/configs/standalone.yaml
 - files/configs/tier.yaml
@@ -111,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A tool for creating Chef server clusters using LXC containers

data/files/configs/ha.yaml

@@ -1,31 +0,0 @@
-base_platform: b-ubuntu-1404
-topology: ha
-api_fqdn: chef-ha.lxc
-mounts:
-  - /dev-shared dev-shared
-packages:
-  server: /dev-shared/chef-packages/cs/chef-server-core_12.0.1-1_amd64.deb
-#  reporting: /dev-shared/chef-packages/cs/reporting/opscode-reporting_1.2.3-1_amd64.deb
-#  push-jobs-server: /dev-shared/chef-packages/cs/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
-#  manage: /dev-shared/chef-packages/cs/manage/opscode-manage_1.6.2-1_amd64.deb
-servers:
-  be1-ha.lxc:
-    role: backend
-    ipaddress: 10.0.3.206
-    bootstrap: true
-    cluster_ipaddress: 192.168.0.5
-  be2-ha.lxc:
-    role: backend
-    ipaddress: 10.0.3.207
-    cluster_ipaddress: 192.168.0.6
-  fe1-ha.lxc:
-    role: frontend
-    ipaddress: 10.0.3.208
-#  fe2-ha.lxc:
-#    role: frontend
-#    ipaddress: 10.0.3.209
-backend_vip:
-  be-ha.lxc:
-    ipaddress: 10.0.3.210
-    device: eth0
-    heartbeat_device: eth1