dev-lxc 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8824c3d24a5ba9e63bca4fdeeec59220ea35f656
-  data.tar.gz: b4f6c6304ceced41d0fc2913140d9540a55c6055
+  metadata.gz: ae5600852b4374df914684ee67a4d57471f4140f
+  data.tar.gz: cb8a2dfd12ef0330d3d52414b63704fd75b152a8
 SHA512:
-  metadata.gz: a9618dd49101a04df2d44a01ecbc67439af667bb93fa9314c5012f8af8c228dccece53eac7608590cc76599e229d7d9fab7568697f5b3523f33412c40b3c1093
-  data.tar.gz: 76897cac3f3b281060dc7ceb0fa667b71bfb74a127ea616bb1062f818c69a641062f0fd8aa95d8b646f2fe5499907286eb48f38b65c5e0134d7745ecd644fc85
+  metadata.gz: f408414657e710600d142565b9236c3f77037d0450fe564a77462fbec606289f9a48f2349afba3fb7698b14100b4454e485a32f3de32bade39cb51c73ab14ed4
+  data.tar.gz: 6fa526eb15c58413087b57d74809f62ac8832f92a6019964d94b79341a9fb3925bb45826dedbe7abeab9a91e8cf02b6bb2a74175672ccf57a93af4eca39cdcbe

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # dev-lxc Change Log
 
+## 2.6.0 (2017-02-09)
+
+* Make api_fqdn unique for chef-tier and chef-backend configs
+* Add https_proxy to generated knife.rb and client.rb files
+
 ## 2.5.0 (2017-02-08)
 
 * Add memory_per_server config option to limit memory per server

data/README.md

@@ -123,10 +123,11 @@ 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.
 
-The following command configures a standalone Chef Server, a Chef Automate server and a job dispatch runner.
+The following command configures a standalone Chef Server, Supermarket server, Compliance server,
+Chef Automate server, and a job dispatch runner.
 
 ```
-dl init --chef --automate --runners -f /root/work/clusters/automate/dev-lxc.yml
+dl init --chef --compliance --supermarket --automate --runners -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.
@@ -190,7 +191,7 @@ This can be helpful when you don't want to start building the cluster yet but yo
 
 At this point all of the cluster's servers should be running.
 
-If you setup the workstation's networking correctly as described in the prerequisites you should be able to ping any server from your workstation using it's FQDN. You can also browse to any server that has a web interface.
+If you enabled dynamic forwarding (SOCKS v5) in your workstation's SSH config file and configured a web browser to use the SOCKS v5 proxy as described in the dev-lxc-platform README.md then you should be able to browse from your workstation to any dev-lxc server that has a web interface using its FQDN.
 
 Since the cluster has a Chef Server you can use the `chef-repo` subcommand to create a chef-repo directory in the host instance that contains a knife.rb and all of the keys for the users and org validator clients that are defined in dev-lxc.yml. This makes it very easy to use tools such as knife or berkshelf.
 
@@ -212,11 +213,19 @@ You can use the `attach` subcommand to login to the root user of a server.
 For example, the following command should attach to the Chef Server.
 
 ```
-dl at chef
+dl attach chef
 ```
 
 Since the cluster has a Chef Server and an infrastructure node dev-lxc made sure it configured the node's chef-client for the Chef Server so it is easy to converge the node.
 
+### Use mitmproxy to view HTTP traffic
+
+Run `mitmproxy` in a terminal on the host instance.
+
+Uncomment the `https_proxy` line in the `chef-repo/.chef/knife.rb` or in a node's `/etc/chef/client.rb` so traffic will be proxied through mitmproxy.
+
+Run chef-client in the node or knife commands from the chef-repo and watch the HTTP requests appear in the mitmproxy console.
+
 ### Manage the Cluster
 
 The right pane of the "cluster" window should show `dev-lxc status` output. This shows the status of each server including any existing snapshots.

data/docs/configuration.md

@@ -4,11 +4,11 @@ dev-lxc uses a YAML configuration file named `dev-lxc.yml` to define a cluster.
 
 The `init` command generates sample config files for various server types.
 
-Let's generate a config for a cluster with a standalone Chef Server, Chef Automate server,
-private Supermarket server, job dispatch runner and an infrastructure node.
+Let's generate a config for a cluster with a standalone Chef Server, Supermarket server,
+Compliance server, Chef Automate server, job dispatch runner and an infrastructure node.
 
 ```
-dev-lxc init --chef --automate --supermarket --runners --nodes > dev-lxc.yml
+dev-lxc init --chef --compliance --supermarket --automate --runners --nodes > dev-lxc.yml
 ```
 
 The contents of `dev-lxc.yml` should look like this.
@@ -57,6 +57,14 @@ chef-server:
         push-jobs-server:
         reporting:
 
+compliance:
+  admin_user: admin         # the password will be the same as the username
+  servers:
+    compliance.lxc:
+      ipaddress: 10.0.3.205
+      products:
+        compliance:
+
 supermarket:
   servers:
     supermarket.lxc:
@@ -94,12 +102,14 @@ nodes:
 The dev-lxc.yml config file is very customizable. You can add or remove mounts, products or servers,
 change ip addresses, server names, the base_container and more.
 
-As you can see there are four server types represented by five servers.
+As you can see there are six server types represented by six servers.
 
 1. chef-server - chef.lxc
-2. analytics - analytics.lxc
+2. compliance - compliance.lxc
 3. supermarket - supermarket.lxc
-4. nodes - node-1.lxc
+4. automate - automate.lxc
+5. runners - runner-1.lxc
+6. nodes - node-1.lxc
 
 #### Global Settings
 
@@ -171,7 +181,7 @@ When defining a Chef Server you can include organizations and users that will be
 dev-lxc knows how to automatically configure Chef Server standalone, Chef Server tier topology,
 Chef Server HA 2.0 as well as Chef Automate, Chef Client, Analytics, Compliance and Supermarket.
 
-If a Chef Automate, Analytics server or Supermarket server is defined in the same config file as
+If a Chef Automate server, Compliance server, Analytics server or Supermarket server is defined in the same config file as
 a Chef Server then each server will automatically be integrated with that Chef Server.
 
 If a node server with Chef Client or Chef DK installed is defined in the same config file as

data/lib/dev-lxc/cli.rb

@@ -87,7 +87,7 @@ base_container: b-ubuntu-1404
       chef_tier_config = %Q(
 chef-server:
   topology: tier
-  api_fqdn: chef.lxc
+  api_fqdn: chef-tier.lxc
   users:          # a user's password will be the same as its username
     - mary-admin
     - joe-user
@@ -193,7 +193,7 @@ adhoc:
 )
       chef_backend_config = %Q(
 chef-backend:
-  api_fqdn: chef.lxc
+  api_fqdn: chef-ha.lxc
   users:          # a user's password will be the same as its username
     - mary-admin
     - joe-user

data/lib/dev-lxc/cluster.rb

@@ -803,7 +803,9 @@ module DevLXC
         FileUtils.cp(validation_key, "#{server.container.config_item('lxc.rootfs')}/etc/chef/") if File.exists?(validation_key)
       end
 
-      client_rb = %Q(chef_server_url '#{chef_server_url}'
+      client_rb = %Q(#https_proxy 'https://10.0.3.1:8080'
+
+chef_server_url '#{chef_server_url}'
 validation_client_name '#{validation_client_name}'
 validation_key '/etc/chef/#{validation_client_name}.pem'
 ssl_verify_mode :verify_none
@@ -1027,7 +1029,8 @@ ssl_verify_mode :verify_none
     end
 
     def create_knife_config(fqdn, dot_chef_path)
-      knife_rb = %Q(
+      knife_rb = %Q(#https_proxy 'https://10.0.3.1:8080'
+
 username = "CHANGEME"
 orgname = "CHANGEME"
 

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "2.5.0"
+  VERSION = "2.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler