dev-lxc 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5587c9d2b0002b0c4da9024a5c84b64726dcaf3
-  data.tar.gz: 6ff40230fdab7aeb5272a52a588abca27608bae5
+  metadata.gz: 864064b9723364e779abf93415aa8cbf64f9f743
+  data.tar.gz: 6d969f2f41568feda063c4baa2e1161fe797e4d7
 SHA512:
-  metadata.gz: 568446f08b6d31503e0e6485de0fa57bd56ccf7e08dbbd27eb8b3e942b681e39ba82897e7a7ca46d629efac9ac7f944279160af9452d72667fefd579a4d401b3
-  data.tar.gz: 26730281a47f8e35cc6b080a1bddacf28e962e6ea7b930e0e84f912873275b28d1d72d8d7a8eee0c80d0268ee287df9d23ec8f84ab559a435e509f93a0db070c
+  metadata.gz: b3eb932287776d238b13e33effdf81579382467b09bff068a3da56c48903be539cc5f02f80e6431d2de96ac3545add1f241c8c4b8d35349c1260e1d3351ac37a
+  data.tar.gz: f4569376b362d19c33ed84d177a644230c45556b0b76a95a517927cf710bf917213dbb101188c2e8242e56e428e83e3763f31b68825c68234a6d540227c0f15c

data/README.md

@@ -317,28 +317,34 @@ dev-lxc init
 `dev-lxc init tier > dev-lxc.yml` creates a `dev-lxc.yml` file with the following content:
 
 ```
-## Mount source directories must exist in the LXC host
+## platform_image can be one of the following:
+## p-centos-5, p-centos-6, p-ubuntu-1204 or p-ubuntu-1404
 
-## Make sure package paths are correct
+## Make sure a mount's source directory exists in the LXC host
+
+## Make sure a package's path is correct
 
 ## All FQDNs and server names must end with the `.lxc` domain
 
 ## DHCP reserved (static) IPs must be selected from the IP range 10.0.3.150 - 254
 
+## topology can be one of the following:
+## standalone, tier or open-source (for the old open source 11 chef server)
+
 chef-server:
   platform_image: p-ubuntu-1404
   mounts:
     - /dev-shared dev-shared
   packages:
-    server: /dev-shared/chef-packages/cs/chef-server-core_12.0.6-1_amd64.deb
+    server: /dev-shared/chef-packages/cs/chef-server-core_12.0.7-1_amd64.deb
     manage: /dev-shared/chef-packages/manage/opscode-manage_1.11.2-1_amd64.deb
 #    reporting: /dev-shared/chef-packages/reporting/opscode-reporting_1.2.3-1_amd64.deb
 #    push-jobs-server: /dev-shared/chef-packages/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
-
-##   The chef-sync package would only be installed.
-##   It would NOT be configured since we don't know whether it should be a master or replica.
 #    sync: /dev-shared/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
   servers:

data/files/configs/standalone.yml

@@ -21,11 +21,11 @@ chef-server:
     manage: /dev-shared/chef-packages/manage/opscode-manage_1.11.2-1_amd64.deb
 #    reporting: /dev-shared/chef-packages/reporting/opscode-reporting_1.2.3-1_amd64.deb
 #    push-jobs-server: /dev-shared/chef-packages/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
-
-##   The chef-sync package would only be installed.
-##   It would NOT be configured since we don't know whether it should be a master or replica.
 #    sync: /dev-shared/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
   servers:

data/files/configs/tier.yml

@@ -21,11 +21,11 @@ chef-server:
     manage: /dev-shared/chef-packages/manage/opscode-manage_1.11.2-1_amd64.deb
 #    reporting: /dev-shared/chef-packages/reporting/opscode-reporting_1.2.3-1_amd64.deb
 #    push-jobs-server: /dev-shared/chef-packages/push-jobs-server/opscode-push-jobs-server_1.1.6-1_amd64.deb
-
-##   The chef-sync package would only be installed.
-##   It would NOT be configured since we don't know whether it should be a master or replica.
 #    sync: /dev-shared/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
   servers:

data/lib/dev-lxc/cli.rb

@@ -11,7 +11,7 @@ module DevLXC::CLI
         config ||= "dev-lxc.yml"
         if ! File.exists?(config)
           puts "ERROR: Cluster config file `config` does not exist."
-          puts "       Create a `./dev-lxc.yml` file or specify the path using `-c`."
+          puts "       Create a `./dev-lxc.yml` file or specify the path using `--config`."
           exit 1
         end
         ::DevLXC::Cluster.new(YAML.load(IO.read(config)))
@@ -82,7 +82,7 @@ module DevLXC::CLI
     end
 
     desc "list_images [SERVER_NAME_REGEX]", "List of each servers' images created during the build process"
-    option :config, :aliases => "-c", :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
+    option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
     def list_images(server_name_regex=nil)
       images = Hash.new { |h,k| h[k] = Hash.new { |h,k| h[k] = Array.new } }
       match_server_name_regex(server_name_regex).each do |s|

data/lib/dev-lxc/cluster.rb

@@ -7,45 +7,49 @@ module DevLXC
     def initialize(cluster_config)
       @cluster_config = cluster_config
 
-      @chef_server_topology = @cluster_config["chef-server"]["topology"]
-      @api_fqdn = @cluster_config["chef-server"]["api_fqdn"]
-      @chef_server_servers = @cluster_config["chef-server"]["servers"]
-      @chef_server_frontends = Array.new
-      @chef_server_servers.each do |name, config|
-        case @chef_server_topology
-        when 'open-source', 'standalone'
-          @chef_server_bootstrap_backend = name if config["role"].nil?
-        when 'tier'
-          @chef_server_bootstrap_backend = name if config["role"] == "backend" && config["bootstrap"] == true
-          @chef_server_frontends << name if config["role"] == "frontend"
+      if @cluster_config["chef-server"]
+        @chef_server_topology = @cluster_config["chef-server"]["topology"]
+        @api_fqdn = @cluster_config["chef-server"]["api_fqdn"]
+        @chef_server_servers = @cluster_config["chef-server"]["servers"]
+        @chef_server_frontends = Array.new
+        @chef_server_servers.each do |name, config|
+          case @chef_server_topology
+          when 'open-source', 'standalone'
+            @chef_server_bootstrap_backend = name if config["role"].nil?
+          when 'tier'
+            @chef_server_bootstrap_backend = name if config["role"] == "backend" && config["bootstrap"] == true
+            @chef_server_frontends << name if config["role"] == "frontend"
+          end
         end
       end
 
-      @analytics_topology = @cluster_config["analytics"]["topology"]
-      @analytics_fqdn = @cluster_config["analytics"]["analytics_fqdn"]
-      @analytics_servers = @cluster_config["analytics"]["servers"]
-      @analytics_frontends = Array.new
-      @analytics_servers.each do |name, config|
-        case @analytics_topology
-        when 'standalone'
-          @analytics_bootstrap_backend = name if config["role"].nil?
-        when 'tier'
-          @analytics_bootstrap_backend = name if config["role"] == "backend" && config["bootstrap"] == true
-          @analytics_frontends << name if config["role"] == "frontend"
+      if @cluster_config["analytics"]
+        @analytics_topology = @cluster_config["analytics"]["topology"]
+        @analytics_fqdn = @cluster_config["analytics"]["analytics_fqdn"]
+        @analytics_servers = @cluster_config["analytics"]["servers"]
+        @analytics_frontends = Array.new
+        @analytics_servers.each do |name, config|
+          case @analytics_topology
+          when 'standalone'
+            @analytics_bootstrap_backend = name if config["role"].nil?
+          when 'tier'
+            @analytics_bootstrap_backend = name if config["role"] == "backend" && config["bootstrap"] == true
+            @analytics_frontends << name if config["role"] == "frontend"
+          end
         end
       end
     end
 
     def servers
       chef_servers = Array.new
-      chef_servers << Server.new(@chef_server_bootstrap_backend, 'chef-server', @cluster_config)
+      chef_servers << Server.new(@chef_server_bootstrap_backend, 'chef-server', @cluster_config) if @chef_server_bootstrap_backend
       if @chef_server_topology == "tier"
         @chef_server_frontends.each do |frontend_name|
           chef_servers << Server.new(frontend_name, 'chef-server', @cluster_config)
         end
       end
       analytics_servers = Array.new
-      analytics_servers << Server.new(@analytics_bootstrap_backend, 'analytics', @cluster_config)
+      analytics_servers << Server.new(@analytics_bootstrap_backend, 'analytics', @cluster_config) if @analytics_bootstrap_backend
       if @analytics_topology == "tier"
         @analytics_frontends.each do |frontend_name|
           analytics_servers << Server.new(frontend_name, 'analytics', @cluster_config)
@@ -55,6 +59,10 @@ module DevLXC
     end
 
     def chef_repo
+      if @chef_server_bootstrap_backend.nil?
+        puts "A bootstrap backend Chef Server is not defined in the cluster's config. Please define it first."
+        exit 1
+      end
       chef_server = Server.new(@chef_server_bootstrap_backend, 'chef-server', @cluster_config)
       if ! chef_server.server.defined?
         puts "The '#{chef_server.server.name}' Chef Server does not exist. Please create it first."

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jeremiah Snapp