dev-lxc 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21945c23e47ac1accdf2ca5b7306d1cd17432c48
-  data.tar.gz: d2f766cc7eb50e63054c990fc390548fb0867f6e
+  metadata.gz: fea4ad6ddf4d00a8b9ae50752739377968e9148e
+  data.tar.gz: e3690d903aa0ddd0fc4ec5fc82432684293e57a9
 SHA512:
-  metadata.gz: 97e7697f28fe8aaa171d3741789c6435e8f0cbb6639f43b4ffbd3fdf6a1a5f8fd8b195a606d2405a509cde5420c1457803f555a5755a0a1ab07ba4e709bfcfe0
-  data.tar.gz: 6d4fd975ac261a43405b18ae6ce4ec2045608810f40f9cdf2507dc63cbb25f6144cbf92dd4ba181f0f209623bc28b2bb52c673d9e77aeb617d065d535b94e48f
+  metadata.gz: 091700cdc50e548222eff1ddd74a627075624d906a9e3efb04c05dfd92a5c67783e5370baed064888384fda2ed932a8f6cc64a4b8f6e033eb5b7f89fbbb8d683
+  data.tar.gz: e72904c833aa229875e06499a843d674ca64608a0f2bf8efeb266252a704f6f97049dcc001fcb7c34e3574866b8fd2698a2115c3e27d4738ab7af072d8802fef

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # dev-lxc Change Log
 
+## 1.4.0 (2015-12-08)
+
+* Add ability to build and use Ubuntu 15.04 and Centos 7 platform containers
+
+* Update versions of Chef packages
+
+* Refactor removal of container config's mount entries
+
 ## 1.3.1 (2015-05-21)
 
 * Allow adhoc servers time to generate SSH Server Host Keys

data/README.md

@@ -490,7 +490,7 @@ dev-lxc init
 
 ```
 ## platform_image can be one of the following:
-## p-centos-5, p-centos-6, p-ubuntu-1204 or p-ubuntu-1404
+## p-centos-5, p-centos-6, p-centos-7, p-ubuntu-1204, p-ubuntu-1404 or p-ubuntu-1504
 
 ## Make sure a mount's source directory exists in the LXC host
 
@@ -508,9 +508,9 @@ chef-server:
   mounts:
     - /root/dev root/dev
   packages:
-    server: /root/dev/chef-packages/cs/chef-server-core_12.0.7-1_amd64.deb
-    manage: /root/dev/chef-packages/manage/opscode-manage_1.11.2-1_amd64.deb
-#    reporting: /root/dev/chef-packages/reporting/opscode-reporting_1.2.3-1_amd64.deb
+    server: /root/dev/chef-packages/cs/chef-server-core_12.3.1-1_amd64.deb
+    manage: /root/dev/chef-packages/manage/chef-manage_2.1.1-1_amd64.deb
+#    reporting: /root/dev/chef-packages/reporting/opscode-reporting_1.5.5-1_amd64.deb
 #    push-jobs-server: /root/dev/chef-packages/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
 #    sync: /root/dev/chef-packages/sync/chef-sync_1.0.0~rc.6-1_amd64.deb
 
@@ -536,7 +536,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.2.0-1_amd64.deb
 
   analytics_fqdn: analytics.lxc
   topology: tier

data/files/configs/adhoc.yml

@@ -1,5 +1,5 @@
 ## platform_image can be one of the following:
-## p-centos-5, p-centos-6, p-ubuntu-1204 or p-ubuntu-1404
+## p-centos-5, p-centos-6, p-centos-7, p-ubuntu-1204, p-ubuntu-1404 or p-ubuntu-1504
 
 ## Make sure a mount's source directory exists in the LXC host
 

data/files/configs/open-source.yml

@@ -1,5 +1,5 @@
 ## platform_image can be one of the following:
-## p-centos-5, p-centos-6, p-ubuntu-1204 or p-ubuntu-1404
+## p-centos-5, p-centos-6, p-centos-7, p-ubuntu-1204, p-ubuntu-1404 or p-ubuntu-1504
 
 ## Make sure a mount's source directory exists in the LXC host
 

data/files/configs/standalone.yml

@@ -1,5 +1,5 @@
 ## platform_image can be one of the following:
-## p-centos-5, p-centos-6, p-ubuntu-1204 or p-ubuntu-1404
+## p-centos-5, p-centos-6, p-centos-7, p-ubuntu-1204, p-ubuntu-1404 or p-ubuntu-1504
 
 ## Make sure a mount's source directory exists in the LXC host
 
@@ -17,9 +17,9 @@ chef-server:
   mounts:
     - /root/dev root/dev
   packages:
-    server: /root/dev/chef-packages/cs/chef-server-core_12.0.8-1_amd64.deb
-    manage: /root/dev/chef-packages/manage/opscode-manage_1.13.0-1_amd64.deb
-#    reporting: /root/dev/chef-packages/reporting/opscode-reporting_1.3.0-1_amd64.deb
+    server: /root/dev/chef-packages/cs/chef-server-core_12.3.1-1_amd64.deb
+    manage: /root/dev/chef-packages/manage/chef-manage_2.1.1-1_amd64.deb
+#    reporting: /root/dev/chef-packages/reporting/opscode-reporting_1.5.5-1_amd64.deb
 #    push-jobs-server: /root/dev/chef-packages/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
 #    sync: /root/dev/chef-packages/sync/chef-sync_1.0.0~rc.6-1_amd64.deb
 
@@ -37,7 +37,7 @@ analytics:
   mounts:
     - /root/dev root/dev
   packages:
-    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.1.3-1_amd64.deb
+    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.2.0-1_amd64.deb
 
   analytics_fqdn: analytics.lxc
   topology: standalone

data/files/configs/tier.yml

@@ -1,5 +1,5 @@
 ## platform_image can be one of the following:
-## p-centos-5, p-centos-6, p-ubuntu-1204 or p-ubuntu-1404
+## p-centos-5, p-centos-6, p-centos-7, p-ubuntu-1204, p-ubuntu-1404 or p-ubuntu-1504
 
 ## Make sure a mount's source directory exists in the LXC host
 
@@ -17,9 +17,9 @@ chef-server:
   mounts:
     - /root/dev root/dev
   packages:
-    server: /root/dev/chef-packages/cs/chef-server-core_12.0.8-1_amd64.deb
-    manage: /root/dev/chef-packages/manage/opscode-manage_1.13.0-1_amd64.deb
-#    reporting: /root/dev/chef-packages/reporting/opscode-reporting_1.3.0-1_amd64.deb
+    server: /root/dev/chef-packages/cs/chef-server-core_12.3.1-1_amd64.deb
+    manage: /root/dev/chef-packages/manage/chef-manage_2.1.1-1_amd64.deb
+#    reporting: /root/dev/chef-packages/reporting/opscode-reporting_1.5.5-1_amd64.deb
 #    push-jobs-server: /root/dev/chef-packages/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
 #    sync: /root/dev/chef-packages/sync/chef-sync_1.0.0~rc.6-1_amd64.deb
 
@@ -45,7 +45,7 @@ analytics:
   mounts:
     - /root/dev root/dev
   packages:
-    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.1.3-1_amd64.deb
+    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.2.0-1_amd64.deb
 
   analytics_fqdn: analytics.lxc
   topology: tier

data/lib/dev-lxc/cli.rb

@@ -28,7 +28,7 @@ module DevLXC::CLI
     desc "create [PLATFORM_IMAGE_NAME]", "Create a platform image"
     def create(platform_image_name=nil)
       start_time = Time.now
-      platform_image_names = %w(p-ubuntu-1204 p-ubuntu-1404 p-centos-5 p-centos-6)
+      platform_image_names = %w(p-ubuntu-1204 p-ubuntu-1404 p-ubuntu-1504 p-centos-5 p-centos-6 p-centos-7)
       if platform_image_name.nil? || ! platform_image_names.include?(platform_image_name)
         platform_image_names_with_index = platform_image_names.map.with_index{ |a, i| [i+1, *a]}
         print_table platform_image_names_with_index

data/lib/dev-lxc/container.rb

@@ -47,7 +47,10 @@ module DevLXC
       existing_mounts = self.config_item("lxc.mount.entry")
       unless existing_mounts.nil?
         preserved_mounts = existing_mounts.delete_if { |m| m.end_with?("## dev-lxc ##") }
-        self.clear_config_item('lxc.mount.entries')
+        # self.clear_config_item('lxc.mount.entries') doesn't work as of liblxc 1.1.2 and at least up to 1.1.5-0ubuntu3~ubuntu15.04.1~ppa1
+        DevLXC.search_file_delete_line(self.config_file_name, /^lxc.mount.entry/)
+        self.clear_config
+        self.load_config
         self.set_config_item("lxc.mount.entry", preserved_mounts)
       end
       mounts.each do |mount|

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/lib/dev-lxc.rb

@@ -20,10 +20,21 @@ module DevLXC
       platform_image.create("download", "btrfs", {}, 0, ["-d", "ubuntu", "-r", "precise", "-a", "amd64"])
     when "p-ubuntu-1404"
       platform_image.create("download", "btrfs", {}, 0, ["-d", "ubuntu", "-r", "trusty", "-a", "amd64"])
+    when "p-ubuntu-1504"
+      platform_image.create("download", "btrfs", {}, 0, ["-d", "ubuntu", "-r", "vivid", "-a", "amd64"])
     when "p-centos-5"
       platform_image.create("centos", "btrfs", {}, 0, ["-R", "5"])
     when "p-centos-6"
       platform_image.create("download", "btrfs", {}, 0, ["-d", "centos", "-r", "6", "-a", "amd64"])
+    when "p-centos-7"
+      platform_image.create("download", "btrfs", {}, 0, ["-d", "centos", "-r", "7", "-a", "amd64"])
+      # Centos 7 needs setpcap capabilities
+      # ref: https://bugzilla.redhat.com/show_bug.cgi?id=1176816
+      # ref: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1339781
+      # ref: http://vfamilyserver.org/blog/2015/05/centos-7-lxc-container-slow-boot/
+      DevLXC.search_file_replace(platform_image.config_file_name, /centos.common.conf/, 'fedora.common.conf')
+      platform_image.clear_config
+      platform_image.load_config
     end
     unless platform_image.config_item("lxc.mount.auto").nil?
       platform_image.set_config_item("lxc.mount.auto", "proc:rw sys:rw")
@@ -43,12 +54,19 @@ module DevLXC
       end
       platform_image.run_command("apt-get update")
       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")
+      IO.write("#{platform_image.config_item('lxc.rootfs')}/etc/rc.local", "#!/usr/bin/env bash\n\n/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 openssh-server")
-      IO.write("#{platform_image.config_item('lxc.rootfs')}/etc/rc.local", "/usr/sbin/dpkg-reconfigure openssh-server\n")
+      IO.write("#{platform_image.config_item('lxc.rootfs')}/etc/rc.local", "#!/usr/bin/env bash\n\n/usr/sbin/dpkg-reconfigure openssh-server\n")
+      FileUtils.chmod(0755, "#{platform_image.config_item('lxc.rootfs')}/etc/rc.local")
+    when "p-ubuntu-1504"
+      platform_image.run_command("apt-get update")
+      # install policykit-1 first Ref: https://bugs.launchpad.net/ubuntu/+source/policykit-1/+bug/1447654/
+      platform_image.run_command("apt-get install -y policykit-1")
+      platform_image.run_command("apt-get install -y standard^ server^ vim-nox emacs24-nox tree openssh-server")
+      IO.write("#{platform_image.config_item('lxc.rootfs')}/etc/rc.local", "#!/usr/bin/env bash\n\n/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
@@ -60,6 +78,8 @@ module DevLXC
       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 openssh-server")
+    when "p-centos-7"
+      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")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A tool for creating Chef server clusters using LXC containers