dev-lxc 2.2.7 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c366d04f4b11604fc0a7cada4f816fb0370c0c08
-  data.tar.gz: 10268c9dbca5599d53e994b2eefab384af73c926
+  metadata.gz: 80dd5ce814277d70504316af75ab5a801489356a
+  data.tar.gz: 62c7bb81010529e775615c8e31da47b1360686c4
 SHA512:
-  metadata.gz: 264909fca8a04477df027ae188b3b24d47ee25a1dd4f7a2992644d7cf6756f629c1b6140c7d33bdca391a14535b10d129f3b2fe60d863591b1a4c5e35b80369c
-  data.tar.gz: 3e42f0ff9e45c8d4c21a4409660605e917cfe1b6b73016a4caf2cc79c65e2e1f788c23312d0f02a7292119409b52458b299031197aa45be2551bf03a56867333
+  metadata.gz: b4ce050e1637a22d0dc990560ebf43b39527600bdacf6a048b01a37e8aa45505c327255f59c45f4829576d07c45ea8cf74dd15497e243a638cc90d71eec91c69
+  data.tar.gz: 62b58c1d3956bed13dd7c08a819ac73abaced1cf76e8c7dbe82f055bd3af2e485523b62dfeac5e8f6816b1b79d9d810f2d55cf9131c1cffb87da9acc546ca36f

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # dev-lxc Change Log
 
+## 2.3.0 (2016-11-22)
+
+* Create DNS records for all servers before starting a server
+* Delete DNS records for all servers if all are stopped
+* Add ability to build Automate Job Dispatch Runners
+* Enable Compliance profiles asset store in Automate
+* Enable Automate Compliance profiles proxy in Chef Server
+* Add ability to setup Compliance and create admin user
+* Fix dev-lxc.yml parsing bug
+* Allow for snapshot comments to be empty
+* Fix 'up' command's output so there is a blank line between each server
+
 ## 2.2.7 (2016-09-26)
 
 * Improve file existence test during dev-lxc.yml validation

data/README.md

@@ -119,10 +119,10 @@ mkdir -p /root/work/clusters/automate
 
 Then use the `init` subcommand to generate a sample configuration using the available options. Run `dl help init` to see what options are available.
 
-The following command configures a standalone Chef Server, a Chef Automate server and a build node.
+The following command configures a standalone Chef Server, a Chef Automate server and a job dispatch runner.
 
 ```
-dl init --chef --automate --build-nodes -f /root/work/clusters/automate/dev-lxc.yml
+dl init --chef --automate --runners -f /root/work/clusters/automate/dev-lxc.yml
 ```
 
 We can easily append additional configurations to this file. For example, the following command appends an infrastructure node.
@@ -161,7 +161,7 @@ cluster-view /root/work/clusters/automate
 
 Many dev-lxc subcommands can act on a subset of the cluster's servers by specifying a regular expression that matches the desired server names.
 
-For example, the following command will show the status of the build node and the infrastructure node.
+For example, the following command will show the status of the infrastructure node.
 
 ```
 dl status node

data/docs/configuration.md

@@ -5,10 +5,10 @@ dev-lxc uses a YAML configuration file named `dev-lxc.yml` to define a cluster.
 The `init` command generates sample config files for various server types.
 
 Let's generate a config for a cluster with a standalone Chef Server, Chef Automate server,
-private Supermarket server, build node and an infrastructure node.
+private Supermarket server, job dispatch runner and an infrastructure node.
 
 ```
-dev-lxc init --chef --automate --supermarket --build-nodes --nodes > dev-lxc.yml
+dev-lxc init --chef --automate --supermarket --runners --nodes > dev-lxc.yml
 ```
 
 The contents of `dev-lxc.yml` should look like this.
@@ -63,9 +63,9 @@ automate:
       chef_org: delivery
       enterprise_name: demo-ent
 
-build-nodes:
+runners:
   servers:
-    build-node-1.lxc:
+    runner-1.lxc:
       products:
         chefdk:     # downloaded only
 

data/lib/dev-lxc/cli.rb

@@ -55,6 +55,7 @@ module DevLXC::CLI
     option :supermarket, :type => :boolean, :desc => "Supermarket Server"
     option :automate, :type => :boolean, :desc => "Automate Server"
     option :build_nodes, :type => :boolean, :desc => "Build Nodes"
+    option :runners, :type => :boolean, :desc => "Runners"
     option :adhoc, :type => :boolean, :desc => "Adhoc Servers"
     option :append, :aliases => "-a", :type => :boolean, :desc => "Do not generate the global config header"
     option :filename, :aliases => "-f", :desc => "Write generated content to FILE rather than standard output."
@@ -140,6 +141,13 @@ build-nodes:
     build-node-1.lxc:
       products:
         chefdk:     # downloaded only
+)
+      runners_config = %Q(
+runners:
+  servers:
+    runner-1.lxc:
+      products:
+        chefdk:     # downloaded only
 )
       analytics_config = %Q(
 analytics:
@@ -151,6 +159,7 @@ analytics:
 )
       compliance_config = %Q(
 compliance:
+  admin_user: admin         # the password will be the same as the username
   servers:
     compliance.lxc:
       ipaddress: 10.0.3.205
@@ -228,6 +237,7 @@ nodes:
       config += supermarket_config if options[:supermarket]
       config += automate_config if options[:automate]
       config += build_nodes_config if options[:build_nodes]
+      config += runners_config if options[:runners]
       config += adhoc_config if options[:adhoc]
       config += chef_backend_config if options[:chef_backend]
       config += nodes_config if options[:nodes]
@@ -330,7 +340,6 @@ nodes:
     def up(server_name_regex=nil)
       start_time = Time.now
       get_cluster(options[:config]).up(server_name_regex)
-      puts
       print_elapsed_time(Time.now - start_time)
     end
 
@@ -338,7 +347,7 @@ nodes:
     option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
     def halt(server_name_regex=nil)
       start_time = Time.now
-      get_cluster(options[:config]).get_sorted_servers(server_name_regex).reverse_each { |s| s.stop; puts }
+      get_cluster(options[:config]).halt(server_name_regex)
       print_elapsed_time(Time.now - start_time)
     end
 
@@ -394,19 +403,8 @@ nodes:
     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 => "Destroy servers without confirmation"
     def destroy(server_name_regex=nil)
-      servers = get_cluster(options[:config]).get_sorted_servers(server_name_regex)
-      if servers.empty?
-        puts "No matching server names were found"
-        exit
-      end
-      unless options[:force]
-        confirmation_string = String.new
-        servers.reverse_each { |s| confirmation_string += "#{s.name}\n" }
-        confirmation_string += "Are you sure you want to destroy these servers? (y/N)\n"
-        return unless yes?(confirmation_string)
-      end
       start_time = Time.now
-      servers.reverse_each { |s| s.destroy; puts }
+      get_cluster(options[:config]).destroy(server_name_regex, options[:force])
       print_elapsed_time(Time.now - start_time)
     end
 

data/lib/dev-lxc/cluster.rb

@@ -12,27 +12,31 @@ module DevLXC
       @config = Hash.new { |hash, key| hash[key] = {} }
       @server_configs = Hash.new
 
-      %w(adhoc analytics automate build-nodes chef-backend chef-server compliance nodes supermarket).each do |server_type|
+      %w(adhoc analytics automate build-nodes chef-backend chef-server compliance nodes runners supermarket).each do |server_type|
         if cluster_config[server_type]
-          mounts = ["/var/dev-lxc var/dev-lxc"]
-          if cluster_config[server_type]["mounts"]
-            mounts.concat(cluster_config[server_type]["mounts"])
-          elsif cluster_config["mounts"]
-            mounts.concat(cluster_config["mounts"])
-          end
-          ssh_keys = cluster_config[server_type]["ssh-keys"]
-          ssh_keys ||= cluster_config["ssh-keys"]
-          base_container_name = cluster_config[server_type]["base_container"]
-          base_container_name ||= cluster_config["base_container"]
-
           if cluster_config[server_type]["servers"]
             cluster_config[server_type]["servers"].each do |server_name, server_config|
               server_config ||= Hash.new
+
               products = server_config['products']
               products ||= Hash.new
+
+              mounts = ["/var/dev-lxc var/dev-lxc"]
+              if cluster_config[server_type]["mounts"]
+                mounts.concat(cluster_config[server_type]["mounts"])
+              elsif cluster_config["mounts"]
+                mounts.concat(cluster_config["mounts"])
+              end
               mounts = ["/var/dev-lxc var/dev-lxc"] + server_config["mounts"] if server_config["mounts"]
+
+              ssh_keys = cluster_config[server_type]["ssh-keys"]
+              ssh_keys ||= cluster_config["ssh-keys"]
               ssh_keys = server_config["ssh-keys"] if server_config["ssh-keys"]
+
+              base_container_name = cluster_config[server_type]["base_container"]
+              base_container_name ||= cluster_config["base_container"]
               base_container_name = server_config["base_container"] if server_config["base_container"]
+
               @server_configs[server_name] = {
                 server_type: server_type,
                 products: products,
@@ -143,6 +147,11 @@ module DevLXC
               (server_name, server_config) = cluster_config[server_type]["servers"].first
               @config[server_type][:fqdn] = server_name
             end
+          when "compliance"
+            unless cluster_config[server_type]["servers"].first.nil?
+              (server_name, server_config) = cluster_config[server_type]["servers"].first
+              @server_configs[server_name][:admin_user] = cluster_config[server_type]["admin_user"]
+            end
           when "automate"
             unless cluster_config[server_type]["servers"].first.nil?
               (server_name, server_config) = cluster_config[server_type]["servers"].first
@@ -260,7 +269,7 @@ module DevLXC
 
       # the order of this list of server_types matters
       # it determines the order in which actions are applied to each server_type
-      %w(chef-backend chef-server analytics compliance supermarket automate build-nodes nodes adhoc).each do |server_type|
+      %w(chef-backend chef-server analytics compliance supermarket automate build-nodes runners nodes adhoc).each do |server_type|
         unless @config[server_type].empty?
           case server_type
           when "chef-backend"
@@ -280,7 +289,7 @@ module DevLXC
             end
           end
         end
-        if %w(adhoc automate build-nodes compliance nodes supermarket).include?(server_type)
+        if %w(adhoc automate build-nodes compliance nodes runners supermarket).include?(server_type)
           server_configs = @server_configs.select { |server_name, server_config| server_config[:server_type] == server_type }
           server_configs.each_key { |server_name| servers << get_server(server_name) }
         end
@@ -288,6 +297,33 @@ module DevLXC
       servers.select { |s| s.name =~ /#{server_name_regex}/ }
     end
 
+    def destroy(server_name_regex=nil, force=false)
+      servers = get_sorted_servers(server_name_regex)
+      if servers.empty?
+        puts "No matching server names were found"
+        exit
+      end
+      unless force
+        confirmation_string = String.new
+        servers.reverse_each { |s| confirmation_string += "#{s.name}\n" }
+        confirmation_string += "Are you sure you want to destroy these servers? (y/N)\n"
+        return unless yes?(confirmation_string)
+      end
+      servers.reverse_each { |s| s.destroy; puts }
+      delete_dns_records unless get_sorted_servers.any? { |s| s.container.state != :stopped }
+    end
+
+    def halt(server_name_regex=nil)
+      servers = get_sorted_servers(server_name_regex)
+      servers.reverse_each { |s| s.stop; puts }
+      delete_dns_records unless get_sorted_servers.any? { |s| s.container.state != :stopped }
+    end
+
+    def delete_dns_records
+      @server_configs.keys.each { |server_name| DevLXC::search_file_delete_line("/etc/lxc/addn-hosts.conf", /\s#{server_name}/) }
+      DevLXC::reload_dnsmasq
+    end
+
     def up(server_name_regex=nil)
       abort_up = false
       configured_servers = Array.new
@@ -359,7 +395,7 @@ module DevLXC
             abort_up = true
           end
         end
-        if @server_configs[server.name][:server_type] == 'build-nodes'
+        if %w(build-nodes runners).include?(@server_configs[server.name][:server_type])
           if @config['chef-server'][:bootstrap_backend].nil?
             puts "ERROR: '#{server.name}' requires a Chef Server bootstrap backend to be configured first."
             abort_up = true
@@ -394,25 +430,26 @@ module DevLXC
         clone_from_base_container(server) unless server.container.defined?
       end
       servers = get_sorted_servers(server_name_regex)
+      create_dns_records unless servers.empty?
       servers.each do |server|
-        if @server_configs[server.name][:server_type] == "build-nodes"
+        if %w(build-nodes runners).include?(@server_configs[server.name][:server_type])
           next if @server_configs[server.name][:required_products]["chefdk"] && @server_configs[server.name][:required_products].length == 1
         end
         install_products(server) unless @server_configs[server.name][:required_products].empty?
       end
       servers.each do |server|
-        if server.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: completed") }.empty?
+        if server.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: completed") }.empty?
           if server.name == @config["chef-backend"][:bootstrap_frontend]
             running_backends = Array.new
             @config["chef-backend"][:backends].reverse_each do |server_name|
               backend = get_server(server_name)
-              if backend.container.defined? && backend.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: backend cluster configured but frontend not bootstrapped") }.empty?
+              if backend.container.defined? && backend.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: backend cluster configured but frontend not bootstrapped") }.empty?
                 if backend.container.running?
                   running_backends << backend.name
                   backend.stop
                 end
                 backend.snapshot("dev-lxc build: backend cluster configured but frontend not bootstrapped")
-                snapshot = backend.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: completed") }.first
+                snapshot = backend.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: completed") }.first
                 backend.snapshot_destroy(snapshot.first) if snapshot
               end
             end
@@ -439,6 +476,20 @@ module DevLXC
       end
     end
 
+    def create_dns_records
+      get_sorted_servers.each do |server|
+        ipaddress = server.container.ip_addresses.first
+        ipaddress ||= @server_configs[server.name][:ipaddress]
+        next unless ipaddress
+        additional_fqdn = @server_configs[server.name][:additional_fqdn]
+        dns_record = "#{ipaddress} #{server.name}"
+        dns_record += " #{additional_fqdn}\n" if additional_fqdn
+        DevLXC::search_file_delete_line("/etc/lxc/addn-hosts.conf", /\s#{server.name}/)
+        DevLXC::append_line_to_file("/etc/lxc/addn-hosts.conf", dns_record)
+      end
+      DevLXC::reload_dnsmasq
+    end
+
     def clone_from_base_container(server)
       server_type = @server_configs[server.name][:server_type]
       base_container = DevLXC::Container.new(@server_configs[server.name][:base_container_name])
@@ -491,10 +542,10 @@ module DevLXC
       servers.each do |server|
         products = @server_configs[server.name][:products]
         @server_configs[server.name][:required_products] = Hash.new
-        if !force && !server.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: products installed") }.empty?
+        if !force && !server.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: products installed") }.empty?
           # Skipping product cache preparation for container because it has a 'products installed' snapshot
           next
-        elsif !force && !server.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: completed") }.empty?
+        elsif !force && !server.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: completed") }.empty?
           # Skipping product cache preparation for container because it has a 'build: completed' snapshot
           next
         end
@@ -537,10 +588,10 @@ module DevLXC
     end
 
     def install_products(server)
-      if !server.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: products installed") }.empty?
+      if !server.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: products installed") }.empty?
         puts "Skipping product installation for container '#{server.name}' because it already has a 'products installed' snapshot"
         return
-      elsif !server.snapshot_list.select { |sn| sn[2].start_with?("dev-lxc build: completed") }.empty?
+      elsif !server.snapshot_list.select { |sn| sn[2].to_s.start_with?("dev-lxc build: completed") }.empty?
         puts "Skipping product installation for container '#{server.name}' because it already has a 'build: completed' snapshot"
         return
       end
@@ -551,7 +602,7 @@ module DevLXC
         server.start
       end
       @server_configs[server.name][:required_products].each do |product_name, package_source|
-        next if @server_configs[server.name][:server_type] == "build-nodes" && product_name == "chefdk"
+        next if %w(build-nodes runners).include?(@server_configs[server.name][:server_type]) && product_name == "chefdk"
         server.install_package(package_source)
       end
       server.stop
@@ -575,6 +626,9 @@ module DevLXC
       when 'build-nodes'
         sleep 5     # give time for DNS resolution to be available
         configure_build_node(server)
+      when 'runners'
+        sleep 5     # give time for DNS resolution to be available
+        configure_runner(server)
       when 'chef-backend'
         configure_chef_backend(server) if required_products.include?('chef-backend')
         if required_products.include?('chef-server')
@@ -639,6 +693,9 @@ module DevLXC
       setup_cmd += " --no-build-node"
       setup_cmd += " --configure"
       run_ctl(server, "delivery", setup_cmd)
+
+      # enable Compliance profiles asset store
+      DevLXC::append_line_to_file("#{server.container.config_item('lxc.rootfs')}/etc/delivery/delivery.rb", "compliance_profiles['enable'] = true")
     end
 
     def print_automate_credentials
@@ -670,6 +727,18 @@ module DevLXC
       end
     end
 
+    def configure_runner(server)
+      automate_server_name = @server_configs.select {|name, config| config[:server_type] == 'automate'}.keys.first
+      if automate_server_name
+        automate_server = get_server(automate_server_name)
+        install_runner_cmd = "install-runner #{server.name} dev-lxc"
+        install_runner_cmd += " --password dev-lxc"
+        install_runner_cmd += " --installer #{@server_configs[server.name][:required_products]["chefdk"]}"
+        install_runner_cmd += " --yes"
+        run_ctl(automate_server, "delivery", install_runner_cmd)
+      end
+    end
+
     def configure_chef_client(server, dot_chef_path)
       puts "Configuring Chef Client in container '#{server.name}'"
 
@@ -816,6 +885,11 @@ data_collector.token "93a49a4f2482c64126f7b6015e6b0f30284287ee4054ff8807fb63d9cb
       FileUtils.mkdir_p("#{server.container.config_item('lxc.rootfs')}/var/opt/chef-compliance")
       FileUtils.touch("#{server.container.config_item('lxc.rootfs')}/var/opt/chef-compliance/.license.accepted")
       run_ctl(server, "chef-compliance", "reconfigure")
+      admin_user = @server_configs[server.name][:admin_user]
+      if admin_user
+        run_ctl(server, "chef-compliance", "user-create #{admin_user} #{admin_user}")
+        run_ctl(server, "chef-compliance", "restart core")
+      end
     end
 
     def configure_supermarket(server)
@@ -1034,6 +1108,7 @@ oc_id['applications']['supermarket'] = {
         chef_server_config += %Q(
 data_collector['root_url'] = "https://#{automate_server_name}/data-collector/v0/"
 data_collector['token'] = "93a49a4f2482c64126f7b6015e6b0f30284287ee4054ff8807fb63d9cbd1c506"
+profiles['root_url'] = "https://#{automate_server_name}"
 )
       end
       return chef_server_config

data/lib/dev-lxc/server.rb

@@ -36,19 +36,17 @@ module DevLXC
 
     def start
       hwaddr = @container.config_item("lxc.network.0.hwaddr")
-      if @ipaddress
-        DevLXC.assign_ip_address(@ipaddress, @container.name, hwaddr)
-        DevLXC.create_dns_record(@additional_fqdn, @container.name, @ipaddress) unless @additional_fqdn.nil?
-      end
+      DevLXC.assign_ip_address(@ipaddress, @container.name, hwaddr) if @ipaddress
       @container.sync_mounts(@mounts)
       @container.start
       @container.sync_ssh_keys(@ssh_keys)
+      puts
     end
 
     def stop
       hwaddr = @container.config_item("lxc.network.0.hwaddr") if @container.defined?
       @container.stop
-      deregister_from_dnsmasq(hwaddr)
+      deregister_from_dhcp(hwaddr)
     end
 
     def snapshot(comment=nil)
@@ -147,12 +145,11 @@ module DevLXC
         @container.snapshot_list.each { |snapshot| @container.snapshot_destroy(snapshot.first) }
       end
       @container.destroy
-      deregister_from_dnsmasq(hwaddr)
+      deregister_from_dhcp(hwaddr)
     end
 
-    def deregister_from_dnsmasq(hwaddr)
+    def deregister_from_dhcp(hwaddr)
       if @ipaddress
-        DevLXC.search_file_delete_line("/etc/lxc/addn-hosts.conf", /^#{@ipaddress}\s/)
         DevLXC.search_file_delete_line("/etc/lxc/dhcp-hosts.conf", /,#{@ipaddress}$/)
       end
       unless hwaddr.nil?

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "2.2.7"
+  VERSION = "2.3.0"
 end

data/lib/dev-lxc.rb

@@ -104,14 +104,6 @@ module DevLXC
     reload_dnsmasq
   end
 
-  def self.create_dns_record(fqdn, container_name, ipaddress)
-    dns_record = "#{ipaddress} #{container_name} #{fqdn}\n"
-    puts "Creating DNS record: #{dns_record}"
-    search_file_delete_line("/etc/lxc/addn-hosts.conf", /^#{ipaddress}\s/)
-    append_line_to_file("/etc/lxc/addn-hosts.conf", dns_record)
-    reload_dnsmasq
-  end
-
   def self.reload_dnsmasq
     system("pkill -HUP dnsmasq")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.3.0
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A tool for building Chef server clusters using LXC containers