dev-lxc 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f871a43dea58908ab84c21ed956c63585749b86c
-  data.tar.gz: 106896247fff4158856d8b7e7b68d855b53f856b
+  metadata.gz: 325efef6d895b0c1a50eda5b5fa7a83288036324
+  data.tar.gz: b21fa16693ab0f68a9b3588c40e809f26b09da95
 SHA512:
-  metadata.gz: 06f0045440c5d62985634e90dec1b55cf693afb51e9a3c6ed2320dd0d553d85dfdb4973e11cdaab392ba53f2acc89e334fe48cb5430eaaa32204a38b82a29eb2
-  data.tar.gz: 0474c7ad48397b3015cb5086260c587006d9aed88ea9abe3ee1f6bf0d5063ceceb168f268880ccf02cbdd0e51741fe1908b51b8de1d8a935d86d3d0045b25d1e
+  metadata.gz: b32a36d756fa23c7cead5c03891212da4864a1e9a8d42bab010b2b3c46bb792a02eed10e8152de47c23a9eb8069d9f7be381ca003cf54b92321391dd78493e25
+  data.tar.gz: 4bdb524fc69e72c06ca10ef0c1ae63717ea845986370803a6e7cda55f74732aae65ca9f187b05f1811ab24d73f0cd84b9d014ed1054519a8c651120efe541631

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # dev-lxc Change Log
 
+## 2.2.0 (2016-07-20)
+
+* Make build nodes reregister to Chef Server
+* Make build nodes sleep 5s for DNS resolution availability
+* Allow build-nodes to use different base_containers than Chef Automate's
+* Change default mount point from dev to work
+
 ## 2.1.0 (2016-07-19)
 
 * Provide ability to define Chef org for node's chef-client config

data/README.md

@@ -114,7 +114,7 @@ Create the [dev-lxc.yml config file](docs/configuration.md) for the cluster.
 First, create an arbitrary directory to hold the dev-lxc.yml file.
 
 ```
-mkdir -p /root/dev/clusters/automate
+mkdir -p /root/work/clusters/automate
 ```
 
 Then use the `init` subcommand to generate a sample configuration using the available options. Run `dl help init` to see what options are available.
@@ -122,13 +122,13 @@ Then use the `init` subcommand to generate a sample configuration using the avai
 The following command configures a standalone Chef Server, a Chef Automate server and a build node.
 
 ```
-dl init --chef --automate --build-nodes -f /root/dev/clusters/automate/dev-lxc.yml
+dl init --chef --automate --build-nodes -f /root/work/clusters/automate/dev-lxc.yml
 ```
 
 We can easily append additional configurations to this file. For example, the following command appends an infrastructure node.
 
 ```
-dl init --nodes -a -f /root/dev/clusters/automate/dev-lxc.yml
+dl init --nodes -a -f /root/work/clusters/automate/dev-lxc.yml
 ```
 
 Edit the dev-lxc.yml file:
@@ -150,10 +150,10 @@ The right pane updates every 0.5 seconds with the cluster's status provided by `
 The session's second window is named "shell". It opens in the same directory as the
 cluster's `dev-lxc.yml` file and is useful for attaching to a server to perform system administration tasks.
 
-See the [Usage docs](docs/usage.md) for more information about how to close/kill Byobu sessions.
+See the [usage docs](docs/usage.md) for more information about how to close/kill Byobu sessions.
 
 ```
-cluster-view /root/dev/clusters/automate
+cluster-view /root/work/clusters/automate
 ```
 
 #### Specifying a Subset of Servers

data/docs/adhoc_clusters.md

@@ -13,8 +13,8 @@ The number of servers, their names and their IP addresses can be changed to fit
 particular requirements.
 
 ```
-mkdir -p /root/dev/clusters/delivery
-cd /root/dev/clusters/delivery
+mkdir -p /root/work/clusters/delivery
+cd /root/work/clusters/delivery
 dev-lxc init --adhoc > dev-lxc.yml
 # edit dev-lxc.yml to have enough adhoc servers for a delivery cluster
 cluster-view

data/docs/configuration.md

@@ -19,11 +19,11 @@ base_container: b-ubuntu-1404
 
 # list any host directories you want mounted into the servers
 #mounts:
-#  - /root/dev root/dev
+#  - /root/work root/work
 
 # list any SSH public keys you want added to /home/dev-lxc/.ssh/authorized_keys
 #ssh-keys:
-#  - /root/dev/clusters/id_rsa.pub
+#  - /root/work/clusters/id_rsa.pub
 
 # DHCP reserved (static) IPs must be selected from the IP range 10.0.3.150 - 254
 
@@ -59,7 +59,6 @@ automate:
       ipaddress: 10.0.3.200
       products:
         delivery:
-        chefdk:     # downloaded only for build nodes
       license_path: /CHANGE/ME
       chef_org: delivery
       enterprise_name: demo-ent
@@ -67,6 +66,8 @@ automate:
 build-nodes:
   servers:
     build-node-1.lxc:
+      products:
+        chefdk:     # downloaded only
 
 nodes:
   chef_server_url: https://chef.lxc/organizations/demo

data/lib/dev-lxc/cli.rb

@@ -63,11 +63,11 @@ base_container: b-ubuntu-1404
 
 # list any host directories you want mounted into the servers
 #mounts:
-#  - /root/dev root/dev
+#  - /root/work root/work
 
 # list any SSH public keys you want added to /home/dev-lxc/.ssh/authorized_keys
 #ssh-keys:
-#  - /root/dev/clusters/id_rsa.pub
+#  - /root/work/clusters/id_rsa.pub
 
 # DHCP reserved (static) IPs must be selected from the IP range 10.0.3.150 - 254
 )
@@ -129,7 +129,6 @@ automate:
       ipaddress: 10.0.3.200
       products:
         delivery:
-        chefdk:     # downloaded only for build nodes
       license_path: /CHANGE/ME
       chef_org: delivery
       enterprise_name: demo-ent
@@ -138,6 +137,8 @@ automate:
 build-nodes:
   servers:
     build-node-1.lxc:
+      products:
+        chefdk:     # downloaded only
 )
       analytics_config = %Q(
 analytics:

data/lib/dev-lxc/cluster.rb

@@ -394,6 +394,8 @@ module DevLXC
       end
       servers = get_sorted_servers(server_name_regex)
       servers.each do |server|
+        # if this is a build node and it only has one product (chefdk) then skip the install
+        next if @server_configs[server.name][:server_type] == "build-nodes" && @server_configs[server.name][:required_products].length == 1
         install_products(server) unless @server_configs[server.name][:required_products].empty?
       end
       servers.each do |server|
@@ -531,11 +533,8 @@ module DevLXC
         server.start
       end
       @server_configs[server.name][:required_products].each do |product_name, package_source|
-        if @server_configs[server.name][:server_type] == "automate" && product_name == "chefdk"
-          IO.write("#{server.container.config_item('lxc.rootfs')}/root/build_node_chefdk_package_path", "#{package_source}\n")
-        else
-          server.install_package(package_source)
-        end
+        next if @server_configs[server.name][:server_type] == "build-nodes" && product_name == "chefdk"
+        server.install_package(package_source)
       end
       server.stop
       server.snapshot("dev-lxc build: products installed")
@@ -556,6 +555,7 @@ module DevLXC
       when 'analytics'
         configure_analytics(server) if required_products.include?('analytics')
       when 'build-nodes'
+        sleep 5     # give time for DNS resolution to be available
         configure_build_node(server)
       when 'chef-backend'
         configure_chef_backend(server) if required_products.include?('chef-backend')
@@ -642,15 +642,13 @@ module DevLXC
       automate_server_name = @server_configs.select {|name, config| config[:server_type] == 'automate'}.keys.first
       if automate_server_name
         automate_server = get_server(automate_server_name)
-        if File.exist?("#{automate_server.container.config_item('lxc.rootfs')}/root/build_node_chefdk_package_path")
-          build_node_chefdk_package_path = IO.read("#{automate_server.container.config_item('lxc.rootfs')}/root/build_node_chefdk_package_path").chomp
-          install_build_node_cmd = "install-build-node"
-          install_build_node_cmd += " --fqdn #{server.name}"
-          install_build_node_cmd += " --username dev-lxc"
-          install_build_node_cmd += " --password dev-lxc"
-          install_build_node_cmd += " --installer #{build_node_chefdk_package_path}"
-          run_ctl(automate_server, "delivery", install_build_node_cmd)
-        end
+        install_build_node_cmd = "install-build-node"
+        install_build_node_cmd += " --fqdn #{server.name}"
+        install_build_node_cmd += " --username dev-lxc"
+        install_build_node_cmd += " --password dev-lxc"
+        install_build_node_cmd += " --installer #{@server_configs[server.name][:required_products]["chefdk"]}"
+        install_build_node_cmd += " --overwrite-registration"
+        run_ctl(automate_server, "delivery", install_build_node_cmd)
       end
     end
 

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

metadata

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