dev-lxc 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9e5177f5ac62ee89e12b6aca2d40fb15c779f93
-  data.tar.gz: 2c619b507d326c2483336eb9841d77628e3cd2a2
+  metadata.gz: 5b9f5cdc49598e44f878dd956dd8e47a63fad02d
+  data.tar.gz: 6e46708544b3111bed585fd83049138ef89190f4
 SHA512:
-  metadata.gz: 60ea7fc5a4be4b4a2b85fba5d4dfb18705be8e14a70eaf68433645ea0bb2c20455d24ad7739a504439d70677c49db224823bd580229f0d036c5b6f54b3bce5be
-  data.tar.gz: 461d9cba020d4db1e19af49c26a13956d9406de21480cc0571b52d2ca393a46702e02449e041d1f478a3523185be589b02f6bacf2d8267a3cc7e1091d5402d6a
+  metadata.gz: d69e6c13466415e1471fffa0194830ba608beee4cc2ca8f47e09f2c2100d142388e0ce5499b6df53b7af7045f03dc8ab4fcdda86a338208f95896c40ae0d1c13
+  data.tar.gz: 5a083aac09d0e3b34996e44394bcca46a4d49cd931b6a0e57cfb2a57b3d88c7f22c871fdc896f3354acdb2768ea3d75b59f12838c14fb02c209cb7ac47c1d8b0

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # dev-lxc Change Log
 
+## 1.3.0 (2015-05-21)
+
+* New "adhoc" cluster functionality
+* Platform images have openssh-server installed
+* Platform images have "dev-lxc" user with "dev-lxc" password and passwordless sudo
+* Update Analytics package in templates
+
 ## 1.2.2 (2015-05-14)
 
 * Update version of Chef Manage in templates

data/README.md

@@ -345,6 +345,31 @@ you can run the following command.
 dev-lxc up chef
 ```
 
+### Adhoc Clusters
+
+dev-lxc can also manage an adhoc cluster of servers.
+
+An adhoc cluster is just a set of managed servers cloned from the specified platform
+image. The servers have SSH server running, a "dev-lxc" user with "dev-lxc" password and
+passwordless sudo access.
+
+This is particularly useful when you want to use something else, such as chef-provisioning,
+to configure the servers.
+
+The number of servers, their names and their IP addresses can be changed to fit your
+particular requirements.
+
+The "adhoc" template provides an example cluster configuration suitable for creating a
+Chef Delivery cluster.
+
+```
+mkdir -p /root/dev/clusters/delivery
+cd /root/dev/clusters/delivery
+dev-lxc init adhoc > dev-lxc.yml
+cluster-view
+dl up
+```
+
 ### Managing Node Containers
 
 #### Manually Create a Platform Image
@@ -352,6 +377,10 @@ dev-lxc up chef
 Platform images can be used for purposes other than building clusters. For example, they can
 be used as Chef nodes for testing purposes.
 
+Platform images have openssh-server installed and running with unique SSH Host Keys.
+
+Platform images have a "dev-lxc" user with "dev-lxc" password and passwordless sudo.
+
 You can see a menu of platform images this tool can create by using the following command.
 
 ```
@@ -635,6 +664,10 @@ There are four image categories.
 	installed to provide a more typical server environment.
 	A few additional packages are also installed.
 
+    Platform images have openssh-server installed and running with unique SSH Host Keys.
+
+    Platform images have a "dev-lxc" user with "dev-lxc" password and passwordless sudo.
+
     *Once this platform image is created there is rarely a need to delete it.*
 
 2. Shared Image

data/files/configs/adhoc.yml

@@ -0,0 +1,26 @@
+## platform_image can be one of the following:
+## p-centos-5, p-centos-6, p-ubuntu-1204 or p-ubuntu-1404
+
+## Make sure a mount's source directory exists in the LXC host
+
+## Make sure a package's path is 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
+
+## topology can be one of the following:
+## standalone, tier or open-source (for the old open source 11 chef server)
+
+adhoc:
+  platform_image: p-ubuntu-1404
+  mounts:
+    - /root/dev root/dev
+
+  servers:
+    chef.lxc:
+      ipaddress: 10.0.3.210
+    delivery.lxc:
+      ipaddress: 10.0.3.211
+    build-1.lxc:
+      ipaddress: 10.0.3.212

data/files/configs/standalone.yml

@@ -37,7 +37,7 @@ analytics:
   mounts:
     - /root/dev root/dev
   packages:
-    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.1.2-1_amd64.deb
+    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.1.3-1_amd64.deb
 
   analytics_fqdn: analytics.lxc
   topology: standalone

data/files/configs/tier.yml

@@ -45,7 +45,7 @@ analytics:
   mounts:
     - /root/dev root/dev
   packages:
-    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.1.2-1_amd64.deb
+    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.1.3-1_amd64.deb
 
   analytics_fqdn: analytics.lxc
   topology: tier

data/lib/dev-lxc/cli.rb

@@ -114,7 +114,7 @@ module DevLXC::CLI
 
     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)
+      topologies = %w(adhoc open-source standalone tier)
       if topology.nil? || ! topologies.include?(topology)
         topologies_with_index = topologies.map.with_index{ |a, i| [i+1, *a]}
         print_table topologies_with_index
@@ -148,7 +148,7 @@ module DevLXC::CLI
     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 "Chef Server: https://#{cluster.api_fqdn}\n\n" if cluster.api_fqdn
       puts "Analytics:   https://#{cluster.analytics_fqdn}\n\n" if cluster.analytics_fqdn
       servers = Array.new
       match_server_name_regex(server_name_regex).map { |s| servers << s.server.status }
@@ -211,8 +211,10 @@ module DevLXC::CLI
       images.each_with_index do |(platform_name, shared), images_index|
         shared.each_with_index do |(shared_name, final), shared_index|
           printf "Platform: %27s  %s\n", (LXC::Container.new(platform_name, lxc_config_path).defined? ? "Created" : "Not Created"), platform_name
-          puts "|"
-          printf "\\_ Shared: %26s  %s\n", (LXC::Container.new(shared_name, lxc_config_path).defined? ? "Created" : "Not Created"), shared_name
+          unless shared_name.empty?
+            puts "|"
+            printf "\\_ Shared: %26s  %s\n", (LXC::Container.new(shared_name, lxc_config_path).defined? ? "Created" : "Not Created"), shared_name
+          end
           final.each_with_index do |final_name, final_index|
             puts "   |"
             unique_name = "u-#{final_name}"

data/lib/dev-lxc/cluster.rb

@@ -10,6 +10,10 @@ module DevLXC
       @lxc_config_path = @cluster_config["lxc_config_path"]
       @lxc_config_path ||= "/var/lib/dev-lxc"
 
+      if @cluster_config["adhoc"]
+        @adhoc_servers = @cluster_config["adhoc"]["servers"].keys
+      end
+
       if @cluster_config["chef-server"]
         @chef_server_topology = @cluster_config["chef-server"]["topology"]
         @api_fqdn = @cluster_config["chef-server"]["api_fqdn"]
@@ -44,6 +48,12 @@ module DevLXC
     end
 
     def servers
+      adhoc_servers = Array.new
+      if @adhoc_servers
+        @adhoc_servers.each do |name|
+          adhoc_servers << Server.new(name, 'adhoc', @cluster_config)
+        end
+      end
       chef_servers = Array.new
       chef_servers << Server.new(@chef_server_bootstrap_backend, 'chef-server', @cluster_config) if @chef_server_bootstrap_backend
       if @chef_server_topology == "tier"
@@ -58,7 +68,7 @@ module DevLXC
           analytics_servers << Server.new(frontend_name, 'analytics', @cluster_config)
         end
       end
-      servers = chef_servers + analytics_servers
+      servers = adhoc_servers + chef_servers + analytics_servers
     end
 
     def chef_repo(force=false, pivotal=false)

data/lib/dev-lxc/container.rb

@@ -185,6 +185,8 @@ ssl_verify_mode :verify_none
           end
           base_container.clone(self.name, {:flags => LXC::LXC_CLONE_SNAPSHOT})
           self.load_config
+          puts "Deleting SSH Server Host Keys"
+          FileUtils.rm_f(Dir.glob("#{self.config_item('lxc.rootfs')}/etc/ssh/ssh_host*_key*"))
         end
       end
       self.start unless self.running?

data/lib/dev-lxc/server.rb

@@ -29,6 +29,8 @@ module DevLXC
       @packages = cluster_config[@server_type]["packages"]
 
       case @server_type
+      when 'adhoc'
+        @shared_image_name = ''
       when 'analytics'
         @shared_image_name = "s#{@platform_image_name[1..-1]}"
         @shared_image_name += "-analytics-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["analytics"].to_s.match(/[_-]((\d+\.?){3,})/)
@@ -161,14 +163,22 @@ module DevLXC
         return
       else
         puts "Creating container '#{@server.name}'"
-        unless @server.name == @chef_server_bootstrap_backend || DevLXC::Container.new(@chef_server_bootstrap_backend, @lxc_config_path).defined?
-          puts "ERROR: The bootstrap backend server '#{@chef_server_bootstrap_backend}' must be created first."
-          exit 1
+        if @server_type == 'adhoc'
+          platform_image = DevLXC.create_platform_image(@platform_image_name, @lxc_config_path)
+          puts "Cloning platform image '#{platform_image.name}' into container '#{@server.name}'"
+          platform_image.clone(@server.name, {:flags => LXC::LXC_CLONE_SNAPSHOT})
+        else
+          unless @server.name == @chef_server_bootstrap_backend || DevLXC::Container.new(@chef_server_bootstrap_backend, @lxc_config_path).defined?
+            puts "ERROR: The bootstrap backend server '#{@chef_server_bootstrap_backend}' must be created first."
+            exit 1
+          end
+          shared_image = create_shared_image
+          puts "Cloning shared image '#{shared_image.name}' into container '#{@server.name}'"
+          shared_image.clone(@server.name, {:flags => LXC::LXC_CLONE_SNAPSHOT})
         end
-        shared_image = create_shared_image
-        puts "Cloning shared image '#{shared_image.name}' into container '#{@server.name}'"
-        shared_image.clone(@server.name, {:flags => LXC::LXC_CLONE_SNAPSHOT})
         @server = DevLXC::Container.new(@server.name, @lxc_config_path)
+        puts "Deleting SSH Server Host Keys"
+        FileUtils.rm_f(Dir.glob("#{@server.config_item('lxc.rootfs')}/etc/ssh/ssh_host*_key*"))
         puts "Adding lxc.hook.post-stop hook"
         @server.set_config_item("lxc.hook.post-stop", "/usr/local/share/lxc/hooks/post-stop-dhcp-release")
         @server.save_config
@@ -225,6 +235,8 @@ module DevLXC
       puts "Cloning platform image '#{platform_image.name}' into shared image '#{shared_image.name}'"
       platform_image.clone(shared_image.name, {:flags => LXC::LXC_CLONE_SNAPSHOT})
       shared_image = DevLXC::Container.new(shared_image.name, @lxc_config_path)
+      puts "Deleting SSH Server Host Keys"
+      FileUtils.rm_f(Dir.glob("#{shared_image.config_item('lxc.rootfs')}/etc/ssh/ssh_host*_key*"))
 
       # 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`

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

data/lib/dev-lxc.rb

@@ -42,18 +42,35 @@ module DevLXC
                      "#{platform_image.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf.orig")
       end
       platform_image.run_command("apt-get update")
-      platform_image.run_command("apt-get install -y standard^ server^ vim-nox emacs23-nox curl tree")
+      platform_image.run_command("apt-get install -y standard^ server^ vim-nox emacs23-nox curl tree openssh-server")
+      IO.write("#{platform_image.config_item('lxc.rootfs')}/etc/rc.local", "/usr/sbin/dpkg-reconfigure openssh-server\n")
+      FileUtils.chmod(0755, "#{platform_image.config_item('lxc.rootfs')}/etc/rc.local")
     when "p-ubuntu-1204", "p-ubuntu-1404"
       platform_image.run_command("apt-get update")
-      platform_image.run_command("apt-get install -y standard^ server^ vim-nox emacs23-nox tree")
+      platform_image.run_command("apt-get install -y standard^ server^ vim-nox emacs23-nox tree openssh-server")
+      IO.write("#{platform_image.config_item('lxc.rootfs')}/etc/rc.local", "/usr/sbin/dpkg-reconfigure openssh-server\n")
+      FileUtils.chmod(0755, "#{platform_image.config_item('lxc.rootfs')}/etc/rc.local")
     when "p-centos-5"
       # downgrade openssl temporarily to overcome an install bug
       # reference: http://www.hack.net.br/blog/2014/02/12/openssl-conflicts-with-file-from-package-openssl/
       platform_image.run_command("yum downgrade -y openssl")
-      platform_image.run_command("yum install -y @base @core vim-enhanced emacs-nox tree")
+      platform_image.run_command("yum install -y @base @core vim-enhanced emacs-nox tree openssh-server")
+      FileUtils.mkdir_p("#{platform_image.config_item('lxc.rootfs')}/etc/sudoers.d")
+      FileUtils.chmod(0750, "#{platform_image.config_item('lxc.rootfs')}/etc/sudoers.d")
+      append_line_to_file("#{platform_image.config_item('lxc.rootfs')}/etc/sudoers", "\n#includedir /etc/sudoers.d\n")
     when "p-centos-6"
-      platform_image.run_command("yum install -y @base @core vim-enhanced emacs-nox tree")
+      platform_image.run_command("yum install -y @base @core vim-enhanced emacs-nox tree openssh-server")
     end
+    platform_image.run_command("useradd --create-home --shell /bin/bash --password $6$q3FDMpMZ$zfahCxEWHbzuEV98QPzhGZ7fLtGcLNZrbKK7OAYGXmJXZc07WbcxVnDwrMyX/cL6vSp4/IjlrVUZFBp7Orhyu1 dev-lxc")
+
+    FileUtils.mkdir_p("#{platform_image.config_item('lxc.rootfs')}/home/dev-lxc/.ssh")
+    FileUtils.chmod(0700, "#{platform_image.config_item('lxc.rootfs')}/home/dev-lxc/.ssh")
+    FileUtils.touch("#{platform_image.config_item('lxc.rootfs')}/home/dev-lxc/.ssh/authorized_keys")
+    FileUtils.chmod(0600, "#{platform_image.config_item('lxc.rootfs')}/home/dev-lxc/.ssh/authorized_keys")
+    platform_image.run_command("chown -R dev-lxc:dev-lxc /home/dev-lxc/.ssh")
+
+    IO.write("#{platform_image.config_item('lxc.rootfs')}/etc/sudoers.d/dev-lxc", "dev-lxc   ALL=NOPASSWD:ALL\n")
+    FileUtils.chmod(0440, "#{platform_image.config_item('lxc.rootfs')}/etc/sudoers.d/dev-lxc")
     platform_image.stop
     return platform_image
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,6 +82,7 @@ files:
 - Rakefile
 - bin/dev-lxc
 - dev-lxc.gemspec
+- files/configs/adhoc.yml
 - files/configs/open-source.yml
 - files/configs/standalone.yml
 - files/configs/tier.yml