dev-lxc 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb62e2541fe4750d85c6cad1d92f629b3cc59c7c
-  data.tar.gz: ceab7ced54d9dd2f34e142bfc764d688cfcd062a
+  metadata.gz: adb1cdf6e7713709e685315f22141444da1bd719
+  data.tar.gz: cf3f3f6ee779b6f28a3b59c9f598b407a5c17072
 SHA512:
-  metadata.gz: 8545fe8abb277e0051d8b9ea25a98ef24e6732180fc1ff52d129fe80227c761a42269582eebef538535ffd0a975a6c5f594d62c3b1e55284b370505754fa9786
-  data.tar.gz: 76a6df69e886559c4d1a415f328bc1d9d454e20841e274cf7fc53ef1fefcd5169549c1b04ee5d7031eccf8cdf756e16d06e2c570988155c1be496537e8673d4d
+  metadata.gz: dfc37aab34c3fda3b8dcb78512308479e3491453b337174e4729d7de1f2d8c2c2f325dabf226629a9f16e5619dadb18d37b843ace3a835bae473efca1f2ed5c4
+  data.tar.gz: 5ac66bb4a2669895356442ecc5c5e58f97d36d10cc3845c1008716d2353fb401e62c38ef00620253dbebcc79317051bcb5ae12f9efa44acd5754c6315a037380

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # dev-lxc Change Log
 
+## 1.5.1 (2015-04-15)
+
+* Add ability to pass options to LXC create calls
+  For example, this lets users pass the following options for more control over the creation process.
+  https://github.com/lxc/lxc/blob/lxc-2.0.0/templates/lxc-download.in#L200-L207
+
 ## 1.5.0 (2015-04-14)
 
 * Set lxc.network.hwaddr, if one doesn’t exist, instead of lxc.network.0.hwaddr

data/README.md

@@ -393,6 +393,13 @@ an Ubuntu 14.04 image now.
 dev-lxc create p-ubuntu-1404
 ```
 
+Note: It is possible to pass additional arguments to the underlying LXC create command.
+For example:
+
+```
+dev-lxc create p-ubuntu-1404 -o -- '--no-validate --keyserver http://my.key.server.com'
+```
+
 #### Install Chef Client in a Container
 
 Use the `-v` option to specify a particular version of Chef Client.
@@ -507,9 +514,9 @@ chef-server:
   mounts:
     - /root/dev root/dev
   packages:
-    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
+    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
 
   api_fqdn: chef.lxc
@@ -531,7 +538,7 @@ analytics:
   mounts:
     - /root/dev root/dev
   packages:
-    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.2.0-1_amd64.deb
+    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.3.1-1_amd64.deb
 
   analytics_fqdn: analytics.lxc
   topology: tier

data/files/configs/adhoc.yml

@@ -1,6 +1,11 @@
 ## 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_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 a mount's source directory exists in the LXC host
 
 ## Make sure a package's path is correct

data/files/configs/open-source.yml

@@ -1,6 +1,11 @@
 ## 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_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 a mount's source directory exists in the LXC host
 
 ## Make sure a package's path is correct

data/files/configs/standalone.yml

@@ -1,6 +1,11 @@
 ## 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_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 a mount's source directory exists in the LXC host
 
 ## Make sure a package's path is correct
@@ -17,9 +22,9 @@ chef-server:
   mounts:
     - /root/dev root/dev
   packages:
-    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
+    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
 
   api_fqdn: chef.lxc
@@ -33,7 +38,7 @@ analytics:
   mounts:
     - /root/dev root/dev
   packages:
-    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.2.0-1_amd64.deb
+    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.3.1-1_amd64.deb
 
   analytics_fqdn: analytics.lxc
   topology: standalone

data/files/configs/tier.yml

@@ -1,6 +1,11 @@
 ## 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_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 a mount's source directory exists in the LXC host
 
 ## Make sure a package's path is correct
@@ -17,9 +22,9 @@ chef-server:
   mounts:
     - /root/dev root/dev
   packages:
-    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
+    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
 
   api_fqdn: chef.lxc
@@ -41,7 +46,7 @@ analytics:
   mounts:
     - /root/dev root/dev
   packages:
-    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.2.0-1_amd64.deb
+    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.3.1-1_amd64.deb
 
   analytics_fqdn: analytics.lxc
   topology: tier

data/lib/dev-lxc/cli.rb

@@ -26,6 +26,7 @@ module DevLXC::CLI
     }
 
     desc "create [PLATFORM_IMAGE_NAME]", "Create a platform image"
+    option :options, :aliases => "-o", :desc => "Specify additional options for the lxc create"
     def create(platform_image_name=nil)
       start_time = Time.now
       platform_image_names = %w(p-ubuntu-1204 p-ubuntu-1404 p-ubuntu-1504 p-centos-5 p-centos-6 p-centos-7)
@@ -35,7 +36,7 @@ module DevLXC::CLI
         selection = ask("Which platform image do you want to create?", :limited_to => platform_image_names_with_index.map{|c| c[0].to_s})
         platform_image_name = platform_image_names[selection.to_i - 1]
       end
-      ::DevLXC.create_platform_image(platform_image_name)
+      ::DevLXC.create_platform_image(platform_image_name, options[:options])
       puts
       print_elapsed_time(Time.now - start_time)
     end

data/lib/dev-lxc/server.rb

@@ -3,7 +3,7 @@ require "dev-lxc/cluster"
 
 module DevLXC
   class Server
-    attr_reader :server, :platform_image_name, :shared_image_name
+    attr_reader :server, :platform_image_name, :platform_image_options, :shared_image_name
 
     def initialize(name, server_type, cluster_config)
       unless cluster_config[server_type]["servers"].keys.include?(name)
@@ -26,6 +26,7 @@ module DevLXC
       @role = @config["role"] ? @config["role"] : cluster_config[@server_type]['topology']
       @mounts = cluster_config[@server_type]["mounts"]
       @platform_image_name = cluster_config[@server_type]["platform_image"]
+      @platform_image_options = cluster_config[@server_type]["platform_image_options"]
       @packages = cluster_config[@server_type]["packages"]
 
       case @server_type
@@ -163,7 +164,7 @@ module DevLXC
       else
         puts "Creating container '#{@server.name}'"
         if @server_type == 'adhoc'
-          platform_image = DevLXC.create_platform_image(@platform_image_name, @lxc_config_path)
+          platform_image = DevLXC.create_platform_image(@platform_image_name, @platform_image_options, @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
@@ -232,7 +233,7 @@ module DevLXC
         puts "Using existing shared image '#{shared_image.name}'"
         return shared_image
       end
-      platform_image = DevLXC.create_platform_image(@platform_image_name, @lxc_config_path)
+      platform_image = DevLXC.create_platform_image(@platform_image_name, @platform_image_options, @lxc_config_path)
       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)

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/lib/dev-lxc.rb

@@ -6,28 +6,34 @@ require "dev-lxc/server"
 require "dev-lxc/cluster"
 
 module DevLXC
-  def self.create_platform_image(platform_image_name, lxc_config_path='/var/lib/lxc')
+  def self.create_platform_image(platform_image_name, platform_image_options, lxc_config_path='/var/lib/lxc')
     platform_image = DevLXC::Container.new(platform_image_name, lxc_config_path)
     if platform_image.defined?
       puts "Using existing platform image '#{platform_image.name}'"
       return platform_image
     end
     puts "Creating platform image '#{platform_image.name}'"
+    template = "download"
     case platform_image.name
     when "p-ubuntu-1004"
-      platform_image.create("download", "btrfs", {}, 0, ["-d", "ubuntu", "-r", "lucid", "-a", "amd64"])
+      options = ["-d", "ubuntu", "-r", "lucid", "-a", "amd64"]
     when "p-ubuntu-1204"
-      platform_image.create("download", "btrfs", {}, 0, ["-d", "ubuntu", "-r", "precise", "-a", "amd64"])
+      options = ["-d", "ubuntu", "-r", "precise", "-a", "amd64"]
     when "p-ubuntu-1404"
-      platform_image.create("download", "btrfs", {}, 0, ["-d", "ubuntu", "-r", "trusty", "-a", "amd64"])
+      options = ["-d", "ubuntu", "-r", "trusty", "-a", "amd64"]
     when "p-ubuntu-1504"
-      platform_image.create("download", "btrfs", {}, 0, ["-d", "ubuntu", "-r", "vivid", "-a", "amd64"])
+      options = ["-d", "ubuntu", "-r", "vivid", "-a", "amd64"]
     when "p-centos-5"
-      platform_image.create("centos", "btrfs", {}, 0, ["-R", "5"])
+      template = "centos"
+      options = ["-R", "5"]
     when "p-centos-6"
-      platform_image.create("download", "btrfs", {}, 0, ["-d", "centos", "-r", "6", "-a", "amd64"])
+      options = ["-d", "centos", "-r", "6", "-a", "amd64"]
     when "p-centos-7"
-      platform_image.create("download", "btrfs", {}, 0, ["-d", "centos", "-r", "7", "-a", "amd64"])
+      options = ["-d", "centos", "-r", "7", "-a", "amd64"]
+    end
+    options.concat(platform_image_options.split) unless platform_image_options.nil?
+    platform_image.create(template, "btrfs", {}, 0, options)
+    if platform_image.name == "p-centos-7"
       # 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

metadata

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