dev-lxc 0.5.0 → 0.6.0

data/files/configs/standalone.yml

@@ -1,18 +1,40 @@
-platform_container: p-ubuntu-1404
-topology: standalone
-api_fqdn: chef.lxc
-#analytics_fqdn: analytics.lxc
-mounts:
-  - /dev-shared dev-shared
-packages:
-  server: /dev-shared/chef-packages/cs/chef-server-core_12.0.5-1_amd64.deb
-#  manage: /dev-shared/chef-packages/manage/opscode-manage_1.11.2-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
-#  analytics: /dev-shared/chef-packages/analytics/opscode-analytics_1.1.1-1_amd64.deb
-servers:
-  standalone-chef.lxc:
-    ipaddress: 10.0.3.201
-#  standalone-analytics.lxc:
-#    role: analytics
-#    ipaddress: 10.0.3.202
+## Mount source directories must exist in the LXC host
+
+## Make sure package paths are correct
+
+## All FQDNs and server names must end with the `.lxc` domain
+
+## DHCP reserved (static) IPs must be selected from the IP range 10.0.3.150 - 254
+
+chef-server:
+  platform_image: p-ubuntu-1404
+  mounts:
+    - /dev-shared dev-shared
+  packages:
+    server: /dev-shared/chef-packages/cs/chef-server-core_12.0.7-1_amd64.deb
+    manage: /dev-shared/chef-packages/manage/opscode-manage_1.11.2-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
+
+##   The chef-sync package would only be installed.
+##   It would NOT be configured since we don't know whether it should be a master or replica.
+#    sync: /dev-shared/chef-packages/sync/chef-sync_1.0.0~rc.6-1_amd64.deb
+
+  api_fqdn: chef.lxc
+  topology: standalone
+  servers:
+    chef.lxc:
+      ipaddress: 10.0.3.201
+
+analytics:
+  platform_image: p-ubuntu-1404
+  mounts:
+    - /dev-shared dev-shared
+  packages:
+    analytics: /dev-shared/chef-packages/analytics/opscode-analytics_1.1.2-1_amd64.deb
+
+  analytics_fqdn: analytics.lxc
+  topology: standalone
+  servers:
+    analytics.lxc:
+      ipaddress: 10.0.3.202

data/files/configs/tier.yml

@@ -1,26 +1,56 @@
-platform_container: p-ubuntu-1404
-topology: tier
-api_fqdn: chef.lxc
-#analytics_fqdn: analytics.lxc
-mounts:
-  - /dev-shared dev-shared
-packages:
-  server: /dev-shared/chef-packages/cs/chef-server-core_12.0.5-1_amd64.deb
-#  manage: /dev-shared/chef-packages/manage/opscode-manage_1.11.2-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
-#  analytics: /dev-shared/chef-packages/analytics/opscode-analytics_1.1.1-1_amd64.deb
-servers:
-  tier-be.lxc:
-    role: backend
-    ipaddress: 10.0.3.203
-    bootstrap: true
-  tier-fe1.lxc:
-    role: frontend
-    ipaddress: 10.0.3.204
-#  tier-fe2.lxc:
-#    role: frontend
-#    ipaddress: 10.0.3.205
-#  tier-analytics.lxc:
-#    role: analytics
-#    ipaddress: 10.0.3.206
+## Mount source directories must exist in the LXC host
+
+## Make sure package paths are correct
+
+## All FQDNs and server names must end with the `.lxc` domain
+
+## DHCP reserved (static) IPs must be selected from the IP range 10.0.3.150 - 254
+
+chef-server:
+  platform_image: p-ubuntu-1404
+  mounts:
+    - /dev-shared dev-shared
+  packages:
+    server: /dev-shared/chef-packages/cs/chef-server-core_12.0.7-1_amd64.deb
+    manage: /dev-shared/chef-packages/manage/opscode-manage_1.11.2-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
+
+##   The chef-sync package would only be installed.
+##   It would NOT be configured since we don't know whether it should be a master or replica.
+#    sync: /dev-shared/chef-packages/sync/chef-sync_1.0.0~rc.6-1_amd64.deb
+
+  api_fqdn: chef.lxc
+  topology: tier
+  servers:
+    chef-be.lxc:
+      role: backend
+      ipaddress: 10.0.3.203
+      bootstrap: true
+    chef-fe1.lxc:
+      role: frontend
+      ipaddress: 10.0.3.204
+#    chef-fe2.lxc:
+#      role: frontend
+#      ipaddress: 10.0.3.205
+
+analytics:
+  platform_image: p-ubuntu-1404
+  mounts:
+    - /dev-shared dev-shared
+  packages:
+    analytics: /dev-shared/chef-packages/analytics/opscode-analytics_1.1.2-1_amd64.deb
+
+  analytics_fqdn: analytics.lxc
+  topology: tier
+  servers:
+    analytics-be.lxc:
+      role: backend
+      ipaddress: 10.0.3.206
+      bootstrap: true
+    analytics-fe1.lxc:
+      role: frontend
+      ipaddress: 10.0.3.207
+#    analytics-fe2.lxc:
+#      role: frontend
+#      ipaddress: 10.0.3.208

data/lib/dev-lxc/cli.rb

@@ -7,32 +7,35 @@ module DevLXC::CLI
 
     no_commands{
       def get_cluster(config_option)
-        config = "dev-lxc.yaml" if File.exists?("dev-lxc.yaml")
-        config = "dev-lxc.yml" if File.exists?("dev-lxc.yml")
-        config = config_option unless config_option.nil?
-        raise "A cluster config file must be provided" if config.nil?
-        ::DevLXC::ChefCluster.new(YAML.load(IO.read(config)))
+        config = options[:config]
+        config ||= "dev-lxc.yml"
+        if ! File.exists?(config)
+          puts "ERROR: Cluster config file `config` does not exist."
+          puts "       Create a `./dev-lxc.yml` file or specify the path using `-c`."
+          exit 1
+        end
+        ::DevLXC::Cluster.new(YAML.load(IO.read(config)))
       end
 
-      def match_pattern(pattern)
-        get_cluster(options[:config]).chef_servers.select { |cs| cs.server.name =~ /#{pattern}/ }
+      def match_server_name_regex(server_name_regex)
+        get_cluster(options[:config]).servers.select { |s| s.server.name =~ /#{server_name_regex}/ }
       end
     }
 
-    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]
+    desc "create [PLATFORM_IMAGE_NAME]", "Create a platform image"
+    def create(platform_image_name=nil)
+      platform_image_names = %w(p-ubuntu-1204 p-ubuntu-1404 p-centos-5 p-centos-6)
+      if platform_image_name.nil? || ! platform_image_names.include?(platform_image_name)
+        platform_image_names_with_index = platform_image_names.map.with_index{ |a, i| [i+1, *a]}
+        print_table platform_image_names_with_index
+        selection = ask("Which platform image do you want to create?", :limited_to => platform_image_names_with_index.map{|c| c[0].to_s})
+        platform_image_name = platform_image_names[selection.to_i - 1]
       end
-      ::DevLXC.create_platform_container(platform_container_name)
+      ::DevLXC.create_platform_image(platform_image_name)
     end
 
-    desc "init [TOPOLOGY]", "Provide a cluster config file"
-    def init(topology=nil)
+    desc "init [TOPOLOGY] [UNIQUE_STRING]", "Provide a cluster config file with optional uniqueness in server names and FQDNs"
+    def init(topology=nil, unique_string=nil)
       topologies = %w(open-source standalone tier)
       if topology.nil? || ! topologies.include?(topology)
         topologies_with_index = topologies.map.with_index{ |a, i| [i+1, *a]}
@@ -40,73 +43,133 @@ module DevLXC::CLI
         selection = ask("Which cluster topology do you want to use?", :limited_to => topologies_with_index.map{|c| c[0].to_s})
         topology = topologies[selection.to_i - 1]
       end
-      puts IO.read("#{File.dirname(__FILE__)}/../../files/configs/#{topology}.yml")
+      config = IO.read("#{File.dirname(__FILE__)}/../../files/configs/#{topology}.yml")
+      unless unique_string.nil?
+        config_hash = YAML.load(config.gsub(/^#/, ''))
+        config.gsub!(/api_fqdn:\s+#{config_hash['api_fqdn']}/, "api_fqdn: #{unique_string}#{config_hash['api_fqdn']}")
+        config.gsub!(/analytics_fqdn:\s+#{config_hash['analytics_fqdn']}/, "analytics_fqdn: #{unique_string}#{config_hash['analytics_fqdn']}")
+        config_hash['chef-server']['servers'].keys.each do |server_name|
+          config.gsub!(/ #{server_name}:/, " #{unique_string}#{server_name}:")
+        end
+        config_hash['analytics']['servers'].keys.each do |server_name|
+          config.gsub!(/ #{server_name}:/, " #{unique_string}#{server_name}:")
+        end
+      end
+      puts config
     end
 
-    desc "status", "Show status of servers"
-    option :config, :aliases => "-c", :desc => "Specify a cluster's YAML config file. ./dev-lxc.yml will be used by default"
-    def status(pattern=nil)
-      config = "dev-lxc.yaml" if File.exists?("dev-lxc.yaml")
-      config = "dev-lxc.yml" if File.exists?("dev-lxc.yml")
-      config = options[:config] unless options[:config].nil?
-      raise "A cluster config file must be provided" if config.nil?
-      cluster_config = YAML.load(IO.read(config))
-
-      puts "Cluster is available at https://#{cluster_config['api_fqdn']}"
-      puts "Analytics is available at https://#{cluster_config['analytics_fqdn']}" if cluster_config['analytics_fqdn']
-      match_pattern(pattern).each { |cs| cs.status }
+    desc "status [SERVER_NAME_REGEX]", "Show status of servers"
+    option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
+    def status(server_name_regex=nil)
+      cluster = get_cluster(options[:config])
+      puts "Chef Server: https://#{cluster.api_fqdn}\n\n"
+      puts "Analytics:   https://#{cluster.analytics_fqdn}\n\n" if cluster.analytics_fqdn
+      match_server_name_regex(server_name_regex).each { |s| s.status }
     end
 
-    desc "abspath [ROOTFS_PATH]", "Returns the absolute path to a file in each server"
-    option :config, :aliases => "-c", :desc => "Specify a cluster's YAML config file. ./dev-lxc.yml will be used by default"
-    def abspath(pattern=nil, rootfs_path)
+    desc "abspath [SERVER_NAME_REGEX] [ROOTFS_PATH]", "Returns the absolute path to a file in each server"
+    option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
+    def abspath(server_name_regex=nil, rootfs_path)
       abspath = Array.new
-      match_pattern(pattern).map { |cs| abspath << cs.abspath(rootfs_path) }
+      match_server_name_regex(server_name_regex).map { |s| abspath << s.abspath(rootfs_path) }
       puts abspath.compact.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.yml will be used by default"
+    desc "chef-repo", "Creates a `bootstrap-node` script and chef-repo in the current directory using files from the cluster's backend /root/chef-repo"
+    option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
     def chef_repo
       get_cluster(options[:config]).chef_repo
     end
 
-    desc "run_command [COMMAND]", "Runs a command in each server"
-    option :config, :aliases => "-c", :desc => "Specify a cluster's YAML config file. ./dev-lxc.yml will be used by default"
-    def run_command(pattern=nil, command)
-      match_pattern(pattern).each { |cs| cs.run_command(command) }
+    desc "list_images [SERVER_NAME_REGEX]", "List of each servers' images created during the build process"
+    option :config, :aliases => "-c", :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
+    def list_images(server_name_regex=nil)
+      images = Hash.new { |h,k| h[k] = Hash.new { |h,k| h[k] = Array.new } }
+      match_server_name_regex(server_name_regex).each do |s|
+        images[s.platform_image_name][s.shared_image_name] << s.server.name
+      end
+      images.each_with_index do |(platform_name, shared), images_index|
+        shared.each_with_index do |(shared_name, final), shared_index|
+          printf "Platform: %21s  %s\n", (LXC::Container.new(platform_name).defined? ? "Created" : "Not Created"), platform_name
+          puts "|"
+          printf "\\_ Shared: %20s  %s\n", (LXC::Container.new(shared_name).defined? ? "Created" : "Not Created"), shared_name
+          final.each_with_index do |final_name, final_index|
+            puts "   |"
+            unique_name = "u-#{final_name}"
+            printf "   \\_ Unique: %17s  %s\n", (LXC::Container.new(unique_name).defined? ? "Created" : "Not Created"), unique_name
+
+            shared_connector = (final_index + 1 < final.length ? "|" : " ")
+
+            custom_name = "c-#{final_name}"
+            if LXC::Container.new(custom_name).defined?
+              printf "   #{shared_connector}  \\_ Custom: %14s  %s\n", "Created", custom_name
+              custom_spacing = "   "
+              final_width = 12
+            else
+              final_width = 15
+            end
+            printf "   #{shared_connector}  #{custom_spacing}\\_ Final: %#{final_width}s    %s\n", (LXC::Container.new(final_name).defined? ? "Created" : "Not Created"), final_name
+          end
+          puts if (shared_index + 1 < shared.length) || (images_index + 1 < images.length)
+        end
+      end
+    end
+
+    desc "run_command [SERVER_NAME_REGEX] [COMMAND]", "Runs a command in each server"
+    option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
+    def run_command(server_name_regex=nil, command)
+      match_server_name_regex(server_name_regex).each { |s| s.run_command(command) }
     end
 
-    desc "start", "Start servers"
-    option :config, :aliases => "-c", :desc => "Specify a cluster's YAML config file. ./dev-lxc.yml will be used by default"
-    def start(pattern=nil)
-      match_pattern(pattern).each { |cs| cs.start }
+    desc "up [SERVER_NAME_REGEX]", "Start servers - This is the default if no subcommand is given"
+    option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
+    def up(server_name_regex=nil)
+      match_server_name_regex(server_name_regex).each { |s| s.start }
     end
 
-    # make `start` the default subcommand and pass any arguments to it
-    default_task :start
-    def method_missing(method, *args)
-      args = ["start", method.to_s] + args
-      DevLXC.start(args)
+    desc "halt [SERVER_NAME_REGEX]", "Stop servers"
+    option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
+    def halt(server_name_regex=nil)
+      match_server_name_regex(server_name_regex).reverse_each { |s| s.stop }
     end
 
-    desc "stop", "Stop servers"
-    option :config, :aliases => "-c", :desc => "Specify a cluster's YAML config file. ./dev-lxc.yml will be used by default"
-    def stop(pattern=nil)
-      match_pattern(pattern).reverse_each { |cs| cs.stop }
+    desc "snapshot [SERVER_NAME_REGEX]", "Create a snapshot of servers"
+    option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
+    option :force, :aliases => "-f", :type => :boolean, :desc => "Overwrite existing custom images"
+    def snapshot(server_name_regex=nil)
+      non_stopped_servers = Array.new
+      existing_custom_images = Array.new
+      match_server_name_regex(server_name_regex).each do |s|
+        non_stopped_servers << s.server.name if s.server.state != :stopped
+        existing_custom_images << s.server.name if LXC::Container.new("c-#{s.server.name}").defined?
+      end
+      unless non_stopped_servers.empty?
+        puts "WARNING: Aborting snapshot because the following servers are not stopped"
+        puts non_stopped_servers
+        exit 1
+      end
+      unless existing_custom_images.empty? || options[:force]
+        puts "WARNING: The following servers already have a custom image"
+        puts "         Use the `--force` or `-f` option to overwrite existing custom images"
+        puts existing_custom_images
+        exit 1
+      end
+      match_server_name_regex(server_name_regex).each { |s| s.snapshot(options[:force]) }
     end
 
-    desc "destroy", "Destroy servers"
-    option :config, :aliases => "-c", :desc => "Specify a cluster's YAML config file. ./dev-lxc.yml will be used by default"
-    option :unique, :aliases => "-u", :type => :boolean, :desc => "Also destroy the unique containers"
-    option :shared, :aliases => "-s", :type => :boolean, :desc => "Also destroy the shared container"
-    option :platform, :aliases => "-p", :type => :boolean, :desc => "Also destroy the platform container"
-    def destroy(pattern=nil)
-      match_pattern(pattern).reverse_each do |cs|
-        cs.destroy
-        cs.destroy_container(:unique) if options[:unique]
-        cs.destroy_container(:shared) if options[:shared]
-        cs.destroy_container(:platform) if options[:platform]
+    desc "destroy [SERVER_NAME_REGEX]", "Destroy servers"
+    option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
+    option :custom, :aliases => "-c", :type => :boolean, :desc => "Also destroy the custom images"
+    option :unique, :aliases => "-u", :type => :boolean, :desc => "Also destroy the unique images"
+    option :shared, :aliases => "-s", :type => :boolean, :desc => "Also destroy the shared images"
+    option :platform, :aliases => "-p", :type => :boolean, :desc => "Also destroy the platform images"
+    def destroy(server_name_regex=nil)
+      match_server_name_regex(server_name_regex).reverse_each do |s|
+        s.destroy
+        s.destroy_image(:custom) if options[:custom]
+        s.destroy_image(:unique) if options[:unique]
+        s.destroy_image(:shared) if options[:shared]
+        s.destroy_image(:platform) if options[:platform]
       end
     end
 

data/lib/dev-lxc/cluster.rb

@@ -0,0 +1,174 @@
+require "dev-lxc/server"
+
+module DevLXC
+  class Cluster
+    attr_reader :api_fqdn, :analytics_fqdn, :chef_server_bootstrap_backend, :analytics_bootstrap_backend
+
+    def initialize(cluster_config)
+      @cluster_config = cluster_config
+
+      @chef_server_topology = @cluster_config["chef-server"]["topology"]
+      @api_fqdn = @cluster_config["chef-server"]["api_fqdn"]
+      @chef_server_servers = @cluster_config["chef-server"]["servers"]
+      @chef_server_frontends = Array.new
+      @chef_server_servers.each do |name, config|
+        case @chef_server_topology
+        when 'open-source', 'standalone'
+          @chef_server_bootstrap_backend = name if config["role"].nil?
+        when 'tier'
+          @chef_server_bootstrap_backend = name if config["role"] == "backend" && config["bootstrap"] == true
+          @chef_server_frontends << name if config["role"] == "frontend"
+        end
+      end
+
+      @analytics_topology = @cluster_config["analytics"]["topology"]
+      @analytics_fqdn = @cluster_config["analytics"]["analytics_fqdn"]
+      @analytics_servers = @cluster_config["analytics"]["servers"]
+      @analytics_frontends = Array.new
+      @analytics_servers.each do |name, config|
+        case @analytics_topology
+        when 'standalone'
+          @analytics_bootstrap_backend = name if config["role"].nil?
+        when 'tier'
+          @analytics_bootstrap_backend = name if config["role"] == "backend" && config["bootstrap"] == true
+          @analytics_frontends << name if config["role"] == "frontend"
+        end
+      end
+    end
+
+    def servers
+      chef_servers = Array.new
+      chef_servers << Server.new(@chef_server_bootstrap_backend, 'chef-server', @cluster_config)
+      if @chef_server_topology == "tier"
+        @chef_server_frontends.each do |frontend_name|
+          chef_servers << Server.new(frontend_name, 'chef-server', @cluster_config)
+        end
+      end
+      analytics_servers = Array.new
+      analytics_servers << Server.new(@analytics_bootstrap_backend, 'analytics', @cluster_config)
+      if @analytics_topology == "tier"
+        @analytics_frontends.each do |frontend_name|
+          analytics_servers << Server.new(frontend_name, 'analytics', @cluster_config)
+        end
+      end
+      servers = chef_servers + analytics_servers
+    end
+
+    def chef_repo
+      chef_server = Server.new(@chef_server_bootstrap_backend, 'chef-server', @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")
+
+      pem_files = Dir.glob("#{chef_server.abspath('/root/chef-repo/.chef')}/*.pem")
+      if pem_files.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( pem_files, "./chef-repo/.chef" )
+      end
+
+      if @chef_server_topology == "open-source"
+        chef_server_url = "https://#{@api_fqdn}"
+        username = "admin"
+        validator_name = "chef-validator"
+      else
+        chef_server_url = "https://#{@api_fqdn}/organizations/ponyville"
+        username = "rainbowdash"
+        validator_name = "ponyville-validator"
+      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("./chef-repo/.chef/knife.rb", knife_rb)
+
+      bootstrap_node = %Q(#!/bin/bash
+
+if [[ -z $1 ]]; then
+  echo "Please provide the name of the node to be bootstrapped"
+  return 1
+fi
+
+xc-start $1
+
+xc-chef-config -s #{chef_server_url} \\
+               -u #{validator_name} \\
+               -k ./chef-repo/.chef/#{validator_name}.pem
+
+if [[ -n $2 ]]; then
+  xc-attach chef-client -r $2
+else
+  xc-attach chef-client
+fi
+)
+      IO.write("./bootstrap-node", bootstrap_node)
+      FileUtils.chmod("u+x", "./bootstrap-node")
+    end
+
+    def chef_server_config
+      chef_server_config = %Q(api_fqdn "#{@api_fqdn}"\n)
+      if @chef_server_topology == 'tier'
+        chef_server_config += %Q(
+topology "#{@chef_server_topology}"
+
+server "#{@chef_server_bootstrap_backend}",
+  :ipaddress => "#{@chef_server_servers[@chef_server_bootstrap_backend]["ipaddress"]}",
+  :role => "backend",
+  :bootstrap => true
+
+backend_vip "#{@chef_server_bootstrap_backend}",
+  :ipaddress => "#{@chef_server_servers[@chef_server_bootstrap_backend]["ipaddress"]}"
+)
+        @chef_server_frontends.each do |frontend_name|
+          chef_server_config += %Q(
+server "#{frontend_name}",
+  :ipaddress => "#{@chef_server_servers[frontend_name]["ipaddress"]}",
+  :role => "frontend"
+)
+        end
+      end
+      return chef_server_config
+    end
+
+    def analytics_config
+      analytics_config = %Q(analytics_fqdn "#{@analytics_fqdn}"
+topology "#{@analytics_topology}"
+)
+      if @analytics_topology == 'tier'
+        analytics_config += %Q(
+server "#{@analytics_bootstrap_backend}",
+  :ipaddress => "#{@analytics_servers[@analytics_bootstrap_backend]["ipaddress"]}",
+  :role => "backend",
+  :bootstrap => true
+
+backend_vip "#{@analytics_bootstrap_backend}",
+  :ipaddress => "#{@analytics_servers[@analytics_bootstrap_backend]["ipaddress"]}"
+)
+        @analytics_frontends.each do |frontend_name|
+          analytics_config += %Q(
+server "#{frontend_name}",
+  :ipaddress => "#{@analytics_servers[frontend_name]["ipaddress"]}",
+  :role => "frontend"
+)
+        end
+      end
+      return analytics_config
+    end
+
+  end
+end

data/lib/dev-lxc/container.rb

@@ -30,14 +30,14 @@ module DevLXC
 
     def sync_mounts(mounts)
       existing_mounts = self.config_item("lxc.mount.entry")
-      if existing_mounts.is_a?(Array)
+      unless existing_mounts.nil?
         preserved_mounts = existing_mounts.delete_if { |m| m.end_with?("## dev-lxc ##") }
         self.clear_config_item('lxc.mount.entries')
         self.set_config_item("lxc.mount.entry", preserved_mounts)
       end
       mounts.each do |mount|
         raise "Mount source #{mount.split.first} does not exist." unless File.exists?(mount.split.first)
-        if preserved_mounts.any? { |m| m.start_with?("#{mount} ") }
+        if ! preserved_mounts.nil? && preserved_mounts.any? { |m| m.start_with?("#{mount} ") }
           puts "Skipping mount entry #{mount}, it already exists"
           next
         else