dev-lxc 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd60a719f985a22500e7b9985b82330c905b34b0
-  data.tar.gz: 9419f498e4565fe466115f9a9b424167625205cf
+  metadata.gz: f1a4805d460555cf0c64c63c32b6ba18be490b42
+  data.tar.gz: 51aee814b7dab8bb786ac95fc3def208845d873e
 SHA512:
-  metadata.gz: 4d3e69df1876b5a4ab25912f582253cd4077af340477f49b50d9d7e7749840dc0189d27505bf69e04573517f6fa96e89b4825e6d14d69774ae2e3a627fe4505a
-  data.tar.gz: f4e4cd3627257e5c10bacac186864dadbd5a42b68cc326395c03d3098ea06babbb90e06fb24c20a521d4ddefcb7500a8e4f78d371e03d7d9e52ddcd3b282ea5e
+  metadata.gz: 4c83ee825bd77d2fff383af3f2bc7f32df9467a6c6941678f17dea8c140f372b5671baf1cb9a5b956bd32c209dc8851e593f5145e78b9c4f34f13b052b559c29
+  data.tar.gz: 20208edfcc2cd3b4278f64e62772ae9fbbd9043fc93f453a0d9e716edb825ec1a56d772fea7c88f703e54c3da687d5d71bb5437f67c961ba72ca75dcc5d73cbe

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # dev-lxc Change Log
 
+## 1.6.3 (2016-05-04)
+
+* Put adhoc servers at the end of the servers list
+
+* Only destroy a shared image if it has a name
+
+* Auto accept license agreements
+
+* Define default package names more cleanly
+
+* Minor update to README.md
+
 ## 1.6.2 (2016-04-21)
 
 * Sync SSH public keys to /home/dev-lxc/.ssh/authorized_keys

data/README.md

@@ -163,14 +163,12 @@ dev-lxc status
 This is an example of the output.
 
 ```
-Chef Server: https://chef.lxc
+Chef Server: chef.lxc
+Analytics:   analytics.lxc
 
-Analytics:   https://analytics.lxc
-
-      chef-be.lxc     running         10.0.3.203
-     chef-fe1.lxc     running         10.0.3.204
- analytics-be.lxc     running         10.0.3.206
-analytics-fe1.lxc     running         10.0.3.207
+      chef-be.lxc     running         10.0.3.201
+     chef-fe1.lxc     running         10.0.3.202
+    analytics.lxc     running         10.0.3.204
 ```
 
 #### cluster-view, tks, tls commands

data/lib/dev-lxc/cli.rb

@@ -195,27 +195,21 @@ mounts:
 
 ## DHCP reserved (static) IPs must be selected from the IP range 10.0.3.150 - 254
 )
-      open_source_packages = %Q(  packages:
-    server: /root/dev/chef-packages/osc/chef-server_11.1.6-1_amd64.deb
-)
-      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
-)
+
+      chef_packages_path = "/root/dev/chef-packages"
+      open_source_package = "server: #{chef_packages_path}/osc/chef-server_11.1.6-1_amd64.deb"
+      chef_server_package = "server: #{chef_packages_path}/cs/chef-server-core_12.6.0-1_amd64.deb"
+      manage_package = "manage: #{chef_packages_path}/manage/chef-manage_2.3.0-1_amd64.deb"
+      reporting_package = "reporting: #{chef_packages_path}/reporting/opscode-reporting_1.5.6-1_amd64.deb"
+      push_jobs_server_package = "push-jobs-server: #{chef_packages_path}/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb"
+      analytics_package = "analytics: #{chef_packages_path}/analytics/opscode-analytics_1.4.0-1_amd64.deb"
+      compliance_package = "compliance: #{chef_packages_path}/compliance/chef-compliance_1.1.9-1_amd64.deb"
+      supermarket_package = "supermarket: #{chef_packages_path}/supermarket/supermarket_2.5.2-1_amd64.deb"
+
       open_source_config = %Q(
 chef-server:
-#{open_source_packages.chomp}
+  packages:
+    #{open_source_package}
   api_fqdn: chef.lxc
   topology: open-source
   servers:
@@ -224,7 +218,11 @@ chef-server:
 )
       tiered_chef_config = %Q(
 chef-server:
-#{chef_server_packages.chomp}
+  packages:
+    #{chef_server_package}
+    #{manage_package}
+    #{reporting_package}
+    #{push_jobs_server_package}
   topology: tier
   api_fqdn: chef.lxc
   servers:
@@ -238,28 +236,35 @@ chef-server:
 )
       chef_config = %Q(
 chef-server:
-#{chef_server_packages.chomp}
+  packages:
+    #{chef_server_package}
+    #{manage_package}
+    #{reporting_package}
+    #{push_jobs_server_package}
   servers:
     chef.lxc:
       ipaddress: 10.0.3.203
 )
       analytics_config = %Q(
 analytics:
-#{analytics_packages.chomp}
+  packages:
+    #{analytics_package}
   servers:
     analytics.lxc:
       ipaddress: 10.0.3.204
 )
       compliance_config = %Q(
 compliance:
-#{compliance_packages.chomp}
+  packages:
+    #{compliance_package}
   servers:
     compliance.lxc:
       ipaddress: 10.0.3.205
 )
       supermarket_config = %Q(
 supermarket:
-#{supermarket_packages.chomp}
+  packages:
+    #{supermarket_package}
   servers:
     supermarket.lxc:
       ipaddress: 10.0.3.206

data/lib/dev-lxc/cluster.rb

@@ -66,12 +66,6 @@ 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"
@@ -86,9 +80,16 @@ module DevLXC
           analytics_servers << Server.new(frontend_name, 'analytics', @cluster_config)
         end
       end
-      servers = adhoc_servers + chef_servers + analytics_servers
+      adhoc_servers = Array.new
+      if @adhoc_servers
+        @adhoc_servers.each do |name|
+          adhoc_servers << Server.new(name, 'adhoc', @cluster_config)
+        end
+      end
+      servers = chef_servers + analytics_servers
       servers << Server.new(@compliance_fqdn, 'compliance', @cluster_config) if @compliance_fqdn
       servers << Server.new(@supermarket_fqdn, 'supermarket', @cluster_config) if @supermarket_fqdn
+      servers += adhoc_servers
       servers
     end
 

data/lib/dev-lxc/server.rb

@@ -153,7 +153,7 @@ module DevLXC
       when :unique
         DevLXC::Container.new("u-#{@server.name}", @lxc_config_path).destroy
       when :shared
-        DevLXC::Container.new(@shared_image_name, @lxc_config_path).destroy
+        DevLXC::Container.new(@shared_image_name, @lxc_config_path).destroy unless @shared_image_name.empty?
       when :platform
         DevLXC::Container.new(@platform_image_name, @lxc_config_path).destroy
       end
@@ -320,6 +320,8 @@ module DevLXC
     end
 
     def configure_reporting
+      FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/var/opt/opscode-reporting")
+      FileUtils.touch("#{@server.config_item('lxc.rootfs')}/var/opt/opscode-reporting/.license.accepted")
       if @role == 'frontend'
         puts "Copying /etc/opscode-reporting from bootstrap backend '#{@chef_server_bootstrap_backend}'"
         FileUtils.cp_r("#{LXC::Container.new(@chef_server_bootstrap_backend, @lxc_config_path).config_item('lxc.rootfs')}/etc/opscode-reporting",
@@ -335,6 +337,8 @@ module DevLXC
     end
 
     def configure_manage
+      FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/var/opt/chef-manage")
+      FileUtils.touch("#{@server.config_item('lxc.rootfs')}/var/opt/chef-manage/.license.accepted")
       if @chef_server_type == 'private-chef'
         puts "Disabling old opscode-webui in /etc/opscode/private-chef.rb"
         DevLXC.search_file_delete_line("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", /opscode_webui[.enable.]/)
@@ -345,6 +349,8 @@ module DevLXC
     end
 
     def configure_analytics
+      FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/var/opt/opscode-analytics")
+      FileUtils.touch("#{@server.config_item('lxc.rootfs')}/var/opt/opscode-analytics/.license.accepted")
       case @role
       when "standalone", "backend"
         puts "Copying /etc/opscode-analytics from Chef Server bootstrap backend '#{@chef_server_bootstrap_backend}'"
@@ -361,6 +367,8 @@ module DevLXC
     end
 
     def configure_compliance
+      FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/var/opt/chef-compliance")
+      FileUtils.touch("#{@server.config_item('lxc.rootfs')}/var/opt/chef-compliance/.license.accepted")
       run_ctl("chef-compliance", "reconfigure")
     end
 

data/lib/dev-lxc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A tool for creating Chef server clusters using LXC containers