dev-lxc 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fea4ad6ddf4d00a8b9ae50752739377968e9148e
-  data.tar.gz: e3690d903aa0ddd0fc4ec5fc82432684293e57a9
+  metadata.gz: bb62e2541fe4750d85c6cad1d92f629b3cc59c7c
+  data.tar.gz: ceab7ced54d9dd2f34e142bfc764d688cfcd062a
 SHA512:
-  metadata.gz: 091700cdc50e548222eff1ddd74a627075624d906a9e3efb04c05dfd92a5c67783e5370baed064888384fda2ed932a8f6cc64a4b8f6e033eb5b7f89fbbb8d683
-  data.tar.gz: e72904c833aa229875e06499a843d674ca64608a0f2bf8efeb266252a704f6f97049dcc001fcb7c34e3574866b8fd2698a2115c3e27d4738ab7af072d8802fef
+  metadata.gz: 8545fe8abb277e0051d8b9ea25a98ef24e6732180fc1ff52d129fe80227c761a42269582eebef538535ffd0a975a6c5f594d62c3b1e55284b370505754fa9786
+  data.tar.gz: 76a6df69e886559c4d1a415f328bc1d9d454e20841e274cf7fc53ef1fefcd5169549c1b04ee5d7031eccf8cdf756e16d06e2c570988155c1be496537e8673d4d

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # dev-lxc Change Log
 
+## 1.5.0 (2015-04-14)
+
+* Set lxc.network.hwaddr, if one doesn’t exist, instead of lxc.network.0.hwaddr
+  Fixes a bug that caused containers to get identical hwaddrs and IPs
+
+* Remove chef-sync since it is EOL
+
+* Refactor removal of container config's mount entries
+  Make sure you are using LXC 2.0 which includes a fix that allows the refactor to work
+
+* Make mount section in dev-lxc.yml optional
+
 ## 1.4.0 (2015-12-08)
 
 * Add ability to build and use Ubuntu 15.04 and Centos 7 platform containers

data/README.md

@@ -75,8 +75,7 @@ If you aren't familiar with using containers please read this introduction.
 ├── manage
 ├── osc
 ├── push-jobs-server
-├── reporting
-└── sync
+└── reporting
 ```
 
 ## Update dev-lxc gem
@@ -512,10 +511,6 @@ chef-server:
     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
-
-##   The chef-sync package will only be installed.
-##   chef-sync will NOT be configured since we don't know whether it should be a master or replica.
 
   api_fqdn: chef.lxc
   topology: tier
@@ -678,7 +673,7 @@ There are four image categories.
     `DevLXC::Server#create_shared_image` controls the creation of a shared image.
 
     Chef packages that are common to all servers in a Chef cluster, such as chef-server-core,
-	opscode-reporting, opscode-push-jobs-server and chef-sync are installed using `dpkg` or `rpm`.
+	opscode-reporting and opscode-push-jobs-server are installed using `dpkg` or `rpm`.
 
     Note the manage package will not be installed at this point since it is not common to all
 	servers (i.e. it does not get installed on backend servers).

data/files/configs/standalone.yml

@@ -21,10 +21,6 @@ chef-server:
     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
-
-##   The chef-sync package will only be installed.
-##   chef-sync will NOT be configured since we don't know whether it should be a master or replica.
 
   api_fqdn: chef.lxc
   topology: standalone

data/files/configs/tier.yml

@@ -21,10 +21,6 @@ chef-server:
     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
-
-##   The chef-sync package will only be installed.
-##   chef-sync will NOT be configured since we don't know whether it should be a master or replica.
 
   api_fqdn: chef.lxc
   topology: tier

data/lib/dev-lxc/container.rb

@@ -47,23 +47,22 @@ 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') 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.clear_config_item('lxc.mount.entry')
         self.set_config_item("lxc.mount.entry", preserved_mounts)
       end
-      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
-        else
-          puts "Adding mount entry #{mount}"
-          self.set_config_item("lxc.mount.entry", "#{mount} none bind,optional,create=dir 0 0     ## dev-lxc ##")
+      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
+          else
+            puts "Adding mount entry #{mount}"
+            self.set_config_item("lxc.mount.entry", "#{mount} none bind,optional,create=dir 0 0     ## dev-lxc ##")
+          end
         end
       end
       self.save_config

data/lib/dev-lxc/server.rb

@@ -55,7 +55,6 @@ module DevLXC
         @shared_image_name += "-#{@chef_server_version}"
         @shared_image_name += "-reporting-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["reporting"].to_s.match(/[_-]((\d+\.?){3,})/)
         @shared_image_name += "-pushy-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["push-jobs-server"].to_s.match(/[_-]((\d+\.?){3,})/)
-        @shared_image_name += "-sync-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["sync"].to_s.match(/[_-]((\d+\.?){3,})/)
       end
     end
 
@@ -261,7 +260,6 @@ module DevLXC
         shared_image.install_package(@packages["server"]) unless @packages["server"].nil?
         shared_image.install_package(@packages["reporting"]) unless @packages["reporting"].nil?
         shared_image.install_package(@packages["push-jobs-server"]) unless @packages["push-jobs-server"].nil?
-        shared_image.install_package(@packages["sync"]) unless @packages["sync"].nil?
       end
       shared_image.stop
       return shared_image

data/lib/dev-lxc/version.rb

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

data/lib/dev-lxc.rb

@@ -39,9 +39,11 @@ module DevLXC
     unless platform_image.config_item("lxc.mount.auto").nil?
       platform_image.set_config_item("lxc.mount.auto", "proc:rw sys:rw")
     end
-    hwaddr = '00:16:3e:' + Digest::SHA1.hexdigest(Time.now.to_s).slice(0..5).unpack('a2a2a2').join(':')
-    puts "Setting '#{platform_image.name}' platform image's lxc.network.0.hwaddr to #{hwaddr}"
-    platform_image.set_config_item("lxc.network.0.hwaddr", hwaddr)
+    if platform_image.config_item("lxc.network.0.hwaddr").nil?
+      hwaddr = '00:16:3e:' + Digest::SHA1.hexdigest(Time.now.to_s).slice(0..5).unpack('a2a2a2').join(':')
+      puts "Setting '#{platform_image.name}' platform image's lxc.network.hwaddr to #{hwaddr}"
+      platform_image.set_config_item("lxc.network.hwaddr", hwaddr)
+    end
     platform_image.save_config
     platform_image.start
     puts "Installing packages in platform image '#{platform_image.name}'"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2016-04-14 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.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A tool for creating Chef server clusters using LXC containers