dev-lxc 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b24d7c5c69cbd5a1f6f5f82dc2245f4cc2ec3e74
-  data.tar.gz: 90b48e20b8e7e3771ae72415d1f827693af731fd
+  metadata.gz: dd60a719f985a22500e7b9985b82330c905b34b0
+  data.tar.gz: 9419f498e4565fe466115f9a9b424167625205cf
 SHA512:
-  metadata.gz: 1f62b4e0bdad4825dd04720ae27d6e9dee44f15b801becacb91fda99a3e12053016a1e8f377a14b07820f9f1c4b9757127b0d1ca2e17ada503fd0e6b3c853807
-  data.tar.gz: 9c2efad299bb412f8df89019ad76e35df631285e680ddd1044e5e66740f412928c4bbc0ac60a22ad4c738ad629403be17623382026dfdb3aef12789cbcfa5e45
+  metadata.gz: 4d3e69df1876b5a4ab25912f582253cd4077af340477f49b50d9d7e7749840dc0189d27505bf69e04573517f6fa96e89b4825e6d14d69774ae2e3a627fe4505a
+  data.tar.gz: f4e4cd3627257e5c10bacac186864dadbd5a42b68cc326395c03d3098ea06babbb90e06fb24c20a521d4ddefcb7500a8e4f78d371e03d7d9e52ddcd3b282ea5e

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # dev-lxc Change Log
 
+## 1.6.2 (2016-04-21)
+
+* Sync SSH public keys to /home/dev-lxc/.ssh/authorized_keys
+
+* Improve 'dev-lxc init' header
+
+* Validate dev-lxc.yml hostnames, mounts, packages and ssh-keys
+
+* Consolidate package paths for simpler updating
+
 ## 1.6.1 (2016-04-20)
 
 * Fix for open-source in "dev-lxc init"

data/README.md

@@ -497,27 +497,22 @@ dev-lxc init
 ```
 ## platform_image can be one of the following:
 ## p-centos-5, p-centos-6, p-centos-7, p-ubuntu-1204, p-ubuntu-1404 or p-ubuntu-1504
+platform_image: p-ubuntu-1404
 
-## platform_image_options can be set to provide additional arguments to the LXC create command.
+## platform_image_options can be set to provide additional arguments to the LXC create command
 ## reference arg examples: https://github.com/lxc/lxc/blob/lxc-2.0.0/templates/lxc-download.in#L200-L207
-## for example:
-## platform_image_options: --no-validate --keyserver http://my.key.server.com
-
-## Make sure all mount source directories exist in the LXC host
+#platform_image_options: --no-validate
 
-## Make sure all package paths are correct
+## list any host directories you want mounted into the servers
+mounts:
+  - /root/dev root/dev
 
-## All FQDNs and server names must end with the `.lxc` domain
+## list any SSH public keys you want added to /home/dev-lxc/.ssh/authorized_keys
+#ssh-keys:
+#  - /root/dev/clusters/id_rsa.pub
 
 ## DHCP reserved (static) IPs must be selected from the IP range 10.0.3.150 - 254
 
-## topology can be one of the following:
-## standalone (default), tier or open-source (for the old open source 11 chef server)
-
-platform_image: p-ubuntu-1404
-mounts:
-  - /root/dev root/dev
-
 chef-server:
   packages:
     server: /root/dev/chef-packages/cs/chef-server-core_12.5.0-1_amd64.deb

data/lib/dev-lxc/cli.rb

@@ -6,6 +6,59 @@ module DevLXC::CLI
   class DevLXC < Thor
 
     no_commands{
+      def validate_cluster_config(cluster_config)
+        hostnames = Array.new
+        mounts = Array.new
+        packages = Array.new
+        ssh_keys = Array.new
+
+        mounts.concat(cluster_config['mounts']) unless cluster_config['mounts'].nil?
+        ssh_keys.concat(cluster_config['ssh-keys']) unless cluster_config['ssh-keys'].nil?
+
+        %w(chef-server analytics compliance supermarket adhoc).each do |server_type|
+          unless cluster_config[server_type].nil?
+            hostnames << cluster_config[server_type]['api_fqdn'] unless cluster_config[server_type]['api_fqdn'].nil?
+            hostnames << cluster_config[server_type]['analytics_fqdn'] unless cluster_config[server_type]['analytics_fqdn'].nil?
+            hostnames.concat(cluster_config[server_type]['servers'].keys) unless cluster_config[server_type]['servers'].nil?
+            mounts.concat(cluster_config[server_type]['mounts']) unless cluster_config[server_type]['mounts'].nil?
+            packages.concat(cluster_config[server_type]['packages'].values) unless cluster_config[server_type]['packages'].nil?
+            ssh_keys.concat(cluster_config[server_type]['ssh-keys']) unless cluster_config[server_type]['ssh-keys'].nil?
+          end
+        end
+        unless hostnames.empty?
+          hostnames.each do |hostname|
+            unless hostname.end_with?(".lxc")
+              puts "ERROR: Hostname #{hostname} does not end with '.lxc'."
+              exit 1
+            end
+          end
+        end
+        unless mounts.empty?
+          mounts.each do |mount|
+            unless File.exists?(mount.split.first)
+              puts "ERROR: Mount source #{mount.split.first} does not exist."
+              exit 1
+            end
+          end
+        end
+        unless packages.empty?
+          packages.each do |package|
+            unless File.exists?(package)
+              puts "ERROR: Package #{package} does not exist."
+              exit 1
+            end
+          end
+        end
+        unless ssh_keys.empty?
+          ssh_keys.each do |ssh_key|
+            unless File.exists?(ssh_key)
+              puts "ERROR: SSH key #{ssh_key} does not exist."
+              exit 1
+            end
+          end
+        end
+      end
+
       def get_cluster(config_file=nil)
         config_file ||= "dev-lxc.yml"
         if ! File.exists?(config_file)
@@ -13,7 +66,9 @@ module DevLXC::CLI
           puts "       Create a `./dev-lxc.yml` file or specify the path using `--config`."
           exit 1
         end
-        ::DevLXC::Cluster.new(YAML.load(IO.read(config_file)))
+        cluster_config = YAML.load(IO.read(config_file))
+        validate_cluster_config(cluster_config)
+        ::DevLXC::Cluster.new(cluster_config)
       end
 
       def match_server_name_regex(server_name_regex)
@@ -124,42 +179,48 @@ module DevLXC::CLI
     def init(unique_string=nil)
       header = %Q(## platform_image can be one of the following:
 ## p-centos-5, p-centos-6, p-centos-7, p-ubuntu-1204, p-ubuntu-1404 or p-ubuntu-1504
+platform_image: p-ubuntu-1404
 
-## platform_image_options can be set to provide additional arguments to the LXC create command.
+## platform_image_options can be set to provide additional arguments to the LXC create command
 ## reference arg examples: https://github.com/lxc/lxc/blob/lxc-2.0.0/templates/lxc-download.in#L200-L207
-## for example:
-## platform_image_options: --no-validate --keyserver http://my.key.server.com
+#platform_image_options: --no-validate
 
-## Make sure all mount source directories exist in the LXC host
-
-## Make sure all package paths are correct
+## list any host directories you want mounted into the servers
+mounts:
+  - /root/dev root/dev
 
-## All FQDNs and server names must end with the `.lxc` domain
+## list any SSH public keys you want added to /home/dev-lxc/.ssh/authorized_keys
+#ssh-keys:
+#  - /root/dev/clusters/id_rsa.pub
 
 ## DHCP reserved (static) IPs must be selected from the IP range 10.0.3.150 - 254
-
-## topology can be one of the following:
-## standalone (default), tier or open-source (for the old open source 11 chef server)
-
-platform_image: p-ubuntu-1404
-mounts:
-  - /root/dev root/dev
 )
-      open_source_config = %Q(
-chef-server:
-  packages:
+      open_source_packages = %Q(  packages:
     server: /root/dev/chef-packages/osc/chef-server_11.1.6-1_amd64.deb
-  api_fqdn: chef.lxc
-  topology: open-source
-  servers:
-    osc-chef.lxc:
-      ipaddress: 10.0.3.200
 )
       chef_server_packages = %Q(  packages:
     server: /root/dev/chef-packages/cs/chef-server-core_12.5.0-1_amd64.deb
     manage: /root/dev/chef-packages/manage/chef-manage_2.2.1-1_amd64.deb
     reporting: /root/dev/chef-packages/reporting/opscode-reporting_1.5.6-1_amd64.deb
     push-jobs-server: /root/dev/chef-packages/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
+)
+      analytics_packages = %Q(  packages:
+    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.3.1-1_amd64.deb
+)
+      compliance_packages = %Q(  packages:
+    compliance: /root/dev/chef-packages/compliance/chef-compliance_1.1.2-1_amd64.deb
+)
+      supermarket_packages = %Q(  packages:
+    supermarket: /root/dev/chef-packages/supermarket/supermarket_2.5.2-1_amd64.deb
+)
+      open_source_config = %Q(
+chef-server:
+#{open_source_packages.chomp}
+  api_fqdn: chef.lxc
+  topology: open-source
+  servers:
+    osc-chef.lxc:
+      ipaddress: 10.0.3.200
 )
       tiered_chef_config = %Q(
 chef-server:
@@ -184,24 +245,21 @@ chef-server:
 )
       analytics_config = %Q(
 analytics:
-  packages:
-    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.3.1-1_amd64.deb
+#{analytics_packages.chomp}
   servers:
     analytics.lxc:
       ipaddress: 10.0.3.204
 )
       compliance_config = %Q(
 compliance:
-  packages:
-    compliance: /root/dev/chef-packages/compliance/chef-compliance_1.1.2-1_amd64.deb
+#{compliance_packages.chomp}
   servers:
     compliance.lxc:
       ipaddress: 10.0.3.205
 )
       supermarket_config = %Q(
 supermarket:
-  packages:
-    supermarket: /root/dev/chef-packages/supermarket/supermarket_2.5.2-1_amd64.deb
+#{supermarket_packages.chomp}
   servers:
     supermarket.lxc:
       ipaddress: 10.0.3.206

data/lib/dev-lxc/container.rb

@@ -52,10 +52,6 @@ module DevLXC
       end
       unless mounts.nil?
         mounts.each do |mount|
-          unless File.exists?(mount.split.first)
-            puts "ERROR: Mount source #{mount.split.first} does not exist."
-            exit 1
-          end
           if ! preserved_mounts.nil? && preserved_mounts.any? { |m| m.start_with?("#{mount} ") }
             puts "Skipping mount entry #{mount}, it already exists"
             next
@@ -68,6 +64,27 @@ module DevLXC
       self.save_config
     end
 
+    def sync_ssh_keys(ssh_keys)
+      dot_ssh_path = "/home/dev-lxc/.ssh"
+      unless File.exist?("#{config_item('lxc.rootfs')}#{dot_ssh_path}/authorized_keys")
+        run_command("sudo -u dev-lxc mkdir -p #{dot_ssh_path}")
+        run_command("sudo -u dev-lxc chmod 700 #{dot_ssh_path}")
+        run_command("sudo -u dev-lxc touch #{dot_ssh_path}/authorized_keys")
+        run_command("sudo -u dev-lxc chmod 600 #{dot_ssh_path}/authorized_keys")
+      end
+      authorized_keys = IO.read("#{config_item('lxc.rootfs')}#{dot_ssh_path}/authorized_keys").split("\n")
+      authorized_keys.delete_if { |m| m.end_with?("## dev-lxc ##") }
+      unless ssh_keys.nil?
+        ssh_keys.each do |ssh_key|
+          puts "Adding SSH key #{ssh_key} to #{dot_ssh_path}/authorized_keys"
+          authorized_keys << IO.read(ssh_key).chomp + "     ## dev-lxc ##"
+        end
+      end
+      authorized_keys_content = String.new
+      authorized_keys_content = authorized_keys.join("\n") + "\n" unless authorized_keys.empty?
+      IO.write("#{config_item('lxc.rootfs')}#{dot_ssh_path}/authorized_keys", authorized_keys_content)
+    end
+
     def run_command(command)
       unless running?
         puts "ERROR: Container '#{self.name}' must be running first"

data/lib/dev-lxc/server.rb

@@ -31,6 +31,8 @@ module DevLXC
       @role ||= 'standalone'
       @mounts = cluster_config[@server_type]["mounts"]
       @mounts ||= cluster_config["mounts"]
+      @ssh_keys = cluster_config[@server_type]["ssh-keys"]
+      @ssh_keys ||= cluster_config["ssh-keys"]
       @platform_image_name = cluster_config[@server_type]["platform_image"]
       @platform_image_name ||= cluster_config["platform_image"]
       @platform_image_options = cluster_config[@server_type]["platform_image_options"]
@@ -98,6 +100,7 @@ module DevLXC
       end
       @server.sync_mounts(@mounts)
       @server.start
+      @server.sync_ssh_keys(@ssh_keys)
     end
 
     def stop

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler