dev-lxc 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 380d44e7d8a00e55126697a912e6137dfa5fdd07
-  data.tar.gz: 51efc2c299e10e4ebd8df1e8ac2f0407ce122c72
+  metadata.gz: 40dd4b60e8c40f13ccb53dcbdcf36acad7bad55b
+  data.tar.gz: bcd1bb65020fd82929f8616a306077a63f772de7
 SHA512:
-  metadata.gz: cb04423d93d681ea9830d5b11bb5ed3c4cbbc9f1dc5e9c3f85d91683b5110c0fa1d630a7bb8dfb9dbe9e26a0ced508c6675c9369405c122a4cce8e0cb733d28d
-  data.tar.gz: f7ad42408a5123e111f622ba7c138af98c9e3c00d05e6b627aed85a8cde85e0ac35d49c673c3a5f203bc5922c1c02c4cdacccd270a1310088537d18f26648ae5
+  metadata.gz: 4e389110e949fae00632d8bd86a92f529764626697da1cff3704230fb66d66e57fe952624b2f312f64a57ca62fc31f35ffc0d2eb03739de414979ec1df4ff287
+  data.tar.gz: cab1987729070191604736ed69a216f92a837a331b36efd7cbb7bb04489fc0c7614544e20155298ed90810d68928569013816e190b7e71e052580f8e8e32bb5b

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # dev-lxc Change Log
 
+## 2.3.2 (2016-12-02)
+
+* Fix DevLXC::Cluster#configure_automate so the reconfigure comes after all changes to delivery.rb
+* Add ability to save run_command output to a file
+* Use delivery-ctl create-enterprise
+* Replace run_ctl with simpler run_command
+* Use installed_products instead of required_products in DevLXC::Cluster#configure_products
+* Hard stop the server when destroying it
+* Fix destroy so confirmation message works
+
 ## 2.3.1 (2016-11-28)
 
 * Create DevLXC::Cluster.abort_up to help with code clarity

data/lib/dev-lxc/cli.rb

@@ -403,8 +403,19 @@ 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
-      get_cluster(options[:config]).destroy(server_name_regex, options[:force])
+      get_cluster(options[:config]).destroy(server_name_regex)
       print_elapsed_time(Time.now - start_time)
     end
 

data/lib/dev-lxc/cluster.rb

@@ -297,18 +297,8 @@ module DevLXC
       servers.select { |s| s.name =~ /#{server_name_regex}/ }
     end
 
-    def destroy(server_name_regex=nil, force=false)
+    def destroy(server_name_regex=nil)
       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
@@ -620,8 +610,8 @@ module DevLXC
     def configure_products(server)
       puts "Configuring container '#{server.name}'"
       server.start
-      required_products = @server_configs[server.name][:required_products].keys if @server_configs[server.name][:required_products]
-      required_products ||= Array.new
+      installed_products = @server_configs[server.name][:products].keys if @server_configs[server.name][:products]
+      installed_products ||= Array.new
       server_type = @server_configs[server.name][:server_type]
       dot_chef_path = "/root/chef-repo/.chef"
       case server_type
@@ -629,7 +619,7 @@ module DevLXC
         # Allow adhoc servers time to generate SSH Server Host Keys
         sleep 5
       when 'analytics'
-        configure_analytics(server) if required_products.include?('analytics')
+        configure_analytics(server) if installed_products.include?('analytics')
       when 'build-nodes'
         sleep 5     # give time for DNS resolution to be available
         configure_build_node(server)
@@ -637,16 +627,16 @@ module DevLXC
         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')
+        configure_chef_backend(server) if installed_products.include?('chef-backend')
+        if installed_products.include?('chef-server')
           configure_chef_frontend(server)
           if server.name == @config['chef-backend'][:bootstrap_frontend]
             create_users_orgs_knife_configs(server, dot_chef_path)
           end
         end
-        configure_manage(server) if required_products.include?('manage')
+        configure_manage(server) if installed_products.include?('manage')
       when 'chef-server'
-        if required_products.include?('chef-server') || required_products.include?('private-chef')
+        if installed_products.include?('chef-server') || installed_products.include?('private-chef')
           configure_chef_server(server)
           if server.name == @config['chef-server'][:bootstrap_backend]
             create_users_orgs_knife_configs(server, dot_chef_path)
@@ -661,19 +651,19 @@ module DevLXC
             end
           end
         end
-        configure_reporting(server) if required_products.include?('reporting')
-        configure_push_jobs_server(server) if required_products.include?('push-jobs-server')
-        configure_manage(server) if required_products.include?('manage')
+        configure_reporting(server) if installed_products.include?('reporting')
+        configure_push_jobs_server(server) if installed_products.include?('push-jobs-server')
+        configure_manage(server) if installed_products.include?('manage')
       when 'compliance'
-        configure_compliance(server) if required_products.include?('compliance')
+        configure_compliance(server) if installed_products.include?('compliance')
       when 'automate'
-        configure_automate(server) if required_products.include?('delivery')
+        configure_automate(server) if installed_products.include?('delivery')
       when 'nodes'
         # Allow servers time to generate SSH Server Host Keys
         sleep 5
-        configure_chef_client(server, dot_chef_path) if required_products.include?('chef') || required_products.include?('chefdk')
+        configure_chef_client(server, dot_chef_path) if installed_products.include?('chef') || installed_products.include?('chefdk')
       when 'supermarket'
-        configure_supermarket(server) if required_products.include?('supermarket')
+        configure_supermarket(server) if installed_products.include?('supermarket')
       end
     end
 
@@ -698,11 +688,18 @@ module DevLXC
       setup_cmd += " --supermarket-fqdn #{supermarket_fqdn}" if supermarket_fqdn
       setup_cmd += " --enterprise #{enterprise_name}"
       setup_cmd += " --no-build-node"
-      setup_cmd += " --configure"
-      run_ctl(server, "delivery", setup_cmd)
+      setup_cmd += " --no-configure"
+      server.run_command("delivery-ctl #{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")
+      DevLXC::append_line_to_file("#{server.container.config_item('lxc.rootfs')}/etc/delivery/delivery.rb", "compliance_profiles['enable'] = true\n")
+
+      server.run_command("delivery-ctl reconfigure")
+
+      # give time for all services to come up completely
+      sleep 10
+
+      server.run_command("delivery-ctl create-enterprise #{enterprise_name} --ssh-pub-key-file /etc/delivery/builder_key.pub", "#{server.container.config_item('lxc.rootfs')}/etc/delivery/#{enterprise_name}-admin-credentials")
     end
 
     def print_automate_credentials
@@ -730,7 +727,7 @@ module DevLXC
         install_build_node_cmd += " --password dev-lxc"
         install_build_node_cmd += " --installer #{@server_configs[server.name][:required_products]["chefdk"]}"
         install_build_node_cmd += " --overwrite-registration"
-        run_ctl(automate_server, "delivery", install_build_node_cmd)
+        automate_server.run_command("delivery-ctl #{install_build_node_cmd}")
       end
     end
 
@@ -742,7 +739,7 @@ module DevLXC
         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)
+        automate_server.run_command("delivery-ctl #{install_runner_cmd}")
       end
     end
 
@@ -793,13 +790,13 @@ ssl_verify_mode :verify_none
         FileUtils.mkdir_p("#{server.container.config_item('lxc.rootfs')}/etc/chef-backend")
         chef_backend_config = "publish_address '#{@server_configs[server.name][:ipaddress]}'\n"
         IO.write("#{server.container.config_item('lxc.rootfs')}/etc/chef-backend/chef-backend.rb", chef_backend_config)
-        run_ctl(server, "chef-backend", "bootstrap --yes")
+        server.run_command("chef-backend-ctl bootstrap --yes")
       else
         puts "Joining #{server.name} to the chef-backend cluster"
         leader_backend = get_server(@config['chef-backend'][:leader_backend])
         FileUtils.cp("#{leader_backend.container.config_item('lxc.rootfs')}/etc/chef-backend/chef-backend-secrets.json",
                      "#{server.container.config_item('lxc.rootfs')}/root/")
-        run_ctl(server, "chef-backend", "join-cluster #{@server_configs[leader_backend.name][:ipaddress]} -p #{@server_configs[server.name][:ipaddress]} -s /root/chef-backend-secrets.json --yes")
+        server.run_command("chef-backend-ctl join-cluster #{@server_configs[leader_backend.name][:ipaddress]} -p #{@server_configs[server.name][:ipaddress]} -s /root/chef-backend-secrets.json --yes")
       end
     end
 
@@ -807,7 +804,7 @@ ssl_verify_mode :verify_none
       puts "Creating /etc/opscode/chef-server.rb"
       FileUtils.mkdir_p("#{server.container.config_item('lxc.rootfs')}/etc/opscode")
       leader_backend = get_server(@config['chef-backend'][:leader_backend])
-      run_ctl(leader_backend, "chef-backend", "gen-server-config #{server.name} --filename /tmp/#{server.name}.rb")
+      leader_backend.run_command("chef-backend-ctl gen-server-config #{server.name} --filename /tmp/#{server.name}.rb")
       FileUtils.cp("#{leader_backend.container.config_item('lxc.rootfs')}/tmp/#{server.name}.rb",
                    "#{server.container.config_item('lxc.rootfs')}/etc/opscode/chef-server.rb")
       unless server.name == @config['chef-backend'][:bootstrap_frontend]
@@ -819,7 +816,7 @@ ssl_verify_mode :verify_none
         FileUtils.cp("#{bootstrap_frontend.container.config_item('lxc.rootfs')}/etc/opscode/pivotal.pem",
                      "#{server.container.config_item('lxc.rootfs')}/etc/opscode/")
       end
-      run_ctl(server, "chef-server", "reconfigure")
+      server.run_command("chef-server-ctl reconfigure")
     end
 
     def configure_chef_server(server)
@@ -839,7 +836,7 @@ ssl_verify_mode :verify_none
         FileUtils.cp_r("#{get_server(@config['chef-server'][:bootstrap_backend]).container.config_item('lxc.rootfs')}/etc/opscode",
                        "#{server.container.config_item('lxc.rootfs')}/etc", preserve: true)
       end
-      run_ctl(server, @server_configs[server.name][:chef_server_type], "reconfigure")
+      server.run_command("#{@server_configs[server.name][:chef_server_type]}-ctl reconfigure")
     end
 
     def configure_reporting(server)
@@ -850,13 +847,13 @@ ssl_verify_mode :verify_none
         FileUtils.cp_r("#{get_server(@config['chef-server'][:bootstrap_backend]).container.config_item('lxc.rootfs')}/etc/opscode-reporting",
                        "#{server.container.config_item('lxc.rootfs')}/etc", preserve: true)
       end
-      run_ctl(server, @server_configs[server.name][:chef_server_type], "reconfigure")
-      run_ctl(server, "opscode-reporting", "reconfigure")
+      server.run_command("#{@server_configs[server.name][:chef_server_type]}-ctl reconfigure")
+      server.run_command("opscode-reporting-ctl reconfigure")
     end
 
     def configure_push_jobs_server(server)
-      run_ctl(server, "opscode-push-jobs-server", "reconfigure")
-      run_ctl(server, @server_configs[server.name][:chef_server_type], "reconfigure")
+      server.run_command("opscode-push-jobs-server-ctl reconfigure")
+      server.run_command("#{@server_configs[server.name][:chef_server_type]}-ctl reconfigure")
     end
 
     def configure_manage(server)
@@ -866,9 +863,9 @@ ssl_verify_mode :verify_none
         puts "Disabling old opscode-webui in /etc/opscode/private-chef.rb"
         DevLXC.search_file_delete_line("#{server.container.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", /opscode_webui[.enable.]/)
         DevLXC.append_line_to_file("#{server.container.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", "\nopscode_webui['enable'] = false\n")
-        run_ctl(server, @server_configs[server.name][:chef_server_type], "reconfigure")
+        server.run_command("#{@server_configs[server.name][:chef_server_type]}-ctl reconfigure")
       end
-      run_ctl(server, "opscode-manage", "reconfigure")
+      server.run_command("opscode-manage-ctl reconfigure")
     end
 
     def configure_analytics(server)
@@ -885,17 +882,17 @@ ssl_verify_mode :verify_none
         FileUtils.cp_r("#{get_server(@config['analytics'][:bootstrap_backend]).container.config_item('lxc.rootfs')}/etc/opscode-analytics",
                        "#{server.container.config_item('lxc.rootfs')}/etc", preserve: true)
       end
-      run_ctl(server, "opscode-analytics", "reconfigure")
+      server.run_command("opscode-analytics-ctl reconfigure")
     end
 
     def configure_compliance(server)
       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")
+      server.run_command("chef-compliance-ctl 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")
+        server.run_command("chef-compliance-ctl user-create #{admin_user} #{admin_user}")
+        server.run_command("chef-compliance-ctl restart core")
       end
     end
 
@@ -911,11 +908,7 @@ ssl_verify_mode :verify_none
         FileUtils.mkdir_p("#{server.container.config_item('lxc.rootfs')}/etc/supermarket")
         IO.write("#{server.container.config_item('lxc.rootfs')}/etc/supermarket/supermarket.json", JSON.pretty_generate(supermarket_config))
       end
-      run_ctl(server, "supermarket", "reconfigure")
-    end
-
-    def run_ctl(server, component, subcommand)
-      server.run_command("#{component}-ctl #{subcommand}")
+      server.run_command("supermarket-ctl reconfigure")
     end
 
     def create_users_orgs_knife_configs(server, dot_chef_path)
@@ -1004,7 +997,7 @@ ssl_verify_mode :verify_none
       when 'private-chef'
         server.run_command("/opt/opscode/embedded/bin/knife opc user create #{create_user_string} -c #{dot_chef_path}/pivotal.rb")
       when 'chef-server'
-        run_ctl(server, "chef-server", "user-create #{create_user_string}")
+        server.run_command("chef-server-ctl user-create #{create_user_string}")
       end
     end
 
@@ -1014,7 +1007,7 @@ ssl_verify_mode :verify_none
       when 'private-chef'
         server.run_command("/opt/opscode/embedded/bin/knife opc org create #{create_org_string} -c #{dot_chef_path}/pivotal.rb")
       when 'chef-server'
-        run_ctl(server, "chef-server", "org-create #{create_org_string}")
+        server.run_command("chef-server-ctl org-create #{create_org_string}")
       end
     end
 
@@ -1025,7 +1018,7 @@ ssl_verify_mode :verify_none
       when 'private-chef'
         server.run_command("/opt/opscode/embedded/bin/knife opc org user add #{org_add_user_string} -c #{dot_chef_path}/pivotal.rb")
       when 'chef-server'
-        run_ctl(server, "chef-server", "org-user-add #{org_add_user_string}")
+        server.run_command("chef-server-ctl org-user-add #{org_add_user_string}")
       end
     end
 

data/lib/dev-lxc/container.rb

@@ -38,7 +38,7 @@ module DevLXC
     end
 
     def destroy
-      shutdown if running?
+      stop if running?
       puts "Destroying container '#{self.name}'"
       super if self.defined?
     end
@@ -85,14 +85,22 @@ module DevLXC
       IO.write("#{config_item('lxc.rootfs')}#{dot_ssh_path}/authorized_keys", authorized_keys_content)
     end
 
-    def run_command(command)
+    def run_command(command, output_file=nil)
       unless running?
         puts "ERROR: Container '#{self.name}' must be running first"
         exit 1
       end
       attach_opts = { wait: true, env_policy: LXC::LXC_ATTACH_CLEAR_ENV, extra_env_vars: ['HOME=/root'] }
-      attach(attach_opts) do
-        LXC.run_command(command)
+      if output_file
+        file = File.open(output_file, 'w+')
+        attach_opts[:stdout] = file
+      end
+      begin
+        attach(attach_opts) do
+          LXC.run_command(command)
+        end
+      ensure
+        file.close if file
       end
     end
 

data/lib/dev-lxc/server.rb

@@ -21,10 +21,11 @@ module DevLXC
       @container.status
     end
 
-    def run_command(command)
+    def run_command(command, output_file=nil)
       if @container.running?
         puts "Running '#{command}' in '#{@container.name}'"
-        @container.run_command(command)
+        puts "Saving output to #{output_file}" if output_file
+        @container.run_command(command, output_file)
       else
         puts "'#{@container.name}' is not running"
       end

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler