dev-lxc 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adb1cdf6e7713709e685315f22141444da1bd719
-  data.tar.gz: cf3f3f6ee779b6f28a3b59c9f598b407a5c17072
+  metadata.gz: cc3e32a92441d13891b9d18d695f0090b66fda21
+  data.tar.gz: 88ffc5dd9c96a388b05bd667efa0911f49a7b9ed
 SHA512:
-  metadata.gz: dfc37aab34c3fda3b8dcb78512308479e3491453b337174e4729d7de1f2d8c2c2f325dabf226629a9f16e5619dadb18d37b843ace3a835bae473efca1f2ed5c4
-  data.tar.gz: 5ac66bb4a2669895356442ecc5c5e58f97d36d10cc3845c1008716d2353fb401e62c38ef00620253dbebcc79317051bcb5ae12f9efa44acd5754c6315a037380
+  metadata.gz: 036550a1aa6075233f9ca49dd69e97dee81e34b0b08b11b19eb4ed277d3a0308b5e422d8ca28c979c91c770651210723e38be3292dc83b2faf355a6a36fc2d72
+  data.tar.gz: 25a763a9686080b77466efe50e77ad7326081ed6569056362a00d2088786f5d471bc826656ba6d582c53106c45d67b623e7f69afe4856b7d45402eb42725bfc2

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # dev-lxc Change Log
 
+## 1.6.0 (2015-04-20)
+
+* Rewrite "dev-lxc init" so its options determine what config gets generated
+
+* Allow mounts, platform_image and platform_image_options to be set globally
+
+* Create demo org and mary-admin and joe-user users
+
+* Add Supermarket server build capability
+
+* Add Compliance server build capability
+
+* Improve "dev-lxc status" output
+
+* Generate Chef Server config in one shot
+
+* Make standalone topology the default for Analytics
+
+* Make standalone topology the default for Chef Server
+
 ## 1.5.1 (2015-04-15)
 
 * Add ability to pass options to LXC create calls

data/README.md

@@ -106,8 +106,8 @@ You only have to type enough of a `dev-lxc` subcommand to make it unique.
 The following commands are equivalent:
 
 ```
-dev-lxc init standalone > dev-lxc.yml
-dl i standalone > dev-lxc.yml
+dev-lxc init --chef > dev-lxc.yml
+dl i --chef > dev-lxc.yml
 ```
 
 ```
@@ -127,7 +127,7 @@ dl d
 
 ### Create and Manage a Cluster
 
-The following instructions will build a tier Chef Server with a tier Analytics server
+The following instructions will build a tier Chef Server with an Analytics server
 for demonstration purposes.
 The size of this cluster uses about 3GB ram and takes awhile for the first
 build of the servers. Feel free to try the standalone config first.
@@ -141,7 +141,7 @@ Be sure you configure the
 appropriately.
 
 ```
-dev-lxc init tier > dev-lxc.yml
+dev-lxc init --tiered-chef --analytics > dev-lxc.yml
 ```
 
 #### List Images
@@ -364,7 +364,7 @@ Chef Delivery cluster.
 ```
 mkdir -p /root/dev/clusters/delivery
 cd /root/dev/clusters/delivery
-dev-lxc init adhoc > dev-lxc.yml
+dev-lxc init --adhoc > dev-lxc.yml
 cluster-view
 dl up
 ```
@@ -492,67 +492,55 @@ The following command generates sample config files for various cluster topologi
 dev-lxc init
 ```
 
-`dev-lxc init tier > dev-lxc.yml` creates a `dev-lxc.yml` file with the following content:
+`dev-lxc init --tiered-chef --analytics > dev-lxc.yml` creates a `dev-lxc.yml` file with the following content:
 
 ```
 ## 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
 
-## Make sure a mount's source directory exists in the LXC host
+## 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 package's path is correct
+## Make sure all mount source directories exist in the LXC host
+
+## Make sure all package paths are 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)
+## standalone (default), tier or open-source (for the old open source 11 chef server)
+
+platform_image: p-ubuntu-1404
+mounts:
+  - /root/dev root/dev
 
 chef-server:
-  platform_image: p-ubuntu-1404
-  mounts:
-    - /root/dev root/dev
   packages:
     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
+    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
   topology: tier
+  api_fqdn: chef.lxc
   servers:
     chef-be.lxc:
+      ipaddress: 10.0.3.201
       role: backend
-      ipaddress: 10.0.3.203
       bootstrap: true
     chef-fe1.lxc:
+      ipaddress: 10.0.3.202
       role: frontend
-      ipaddress: 10.0.3.204
-#    chef-fe2.lxc:
-#      role: frontend
-#      ipaddress: 10.0.3.205
 
 analytics:
-  platform_image: p-ubuntu-1404
-  mounts:
-    - /root/dev root/dev
   packages:
     analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.3.1-1_amd64.deb
-
-  analytics_fqdn: analytics.lxc
-  topology: tier
   servers:
-    analytics-be.lxc:
-      role: backend
-      ipaddress: 10.0.3.206
-      bootstrap: true
-    analytics-fe1.lxc:
-      role: frontend
-      ipaddress: 10.0.3.207
-#    analytics-fe2.lxc:
-#      role: frontend
-#      ipaddress: 10.0.3.208
+    analytics.lxc:
+      ipaddress: 10.0.3.204
 ```
 
 This config defines a tier cluster consisting of a single backend and a single frontend.
@@ -591,8 +579,8 @@ each cluster's config file.
 
 ```
 mkdir -p ~/clusters/{clusterA,clusterB}
-dev-lxc init tier > ~/clusters/clusterA/dev-lxc.yml
-dev-lxc init standalone > ~/clusters/clusterB/dev-lxc.yml
+dev-lxc init --tiered-chef > ~/clusters/clusterA/dev-lxc.yml
+dev-lxc init --chef > ~/clusters/clusterB/dev-lxc.yml
 cd ~/clusters/clusterA && dev-lxc up  # starts clusterA
 cd ~/clusters/clusterB && dev-lxc up  # starts clusterB
 ```
@@ -619,7 +607,7 @@ more clusters you have to maintain uniqueness across the YAML config files for t
 	For example, you can use the following command to prefix the servers names with `1234-` when
 	generating a cluster's config.
 
-        dev-lxc init tier 1234- > dev-lxc.yml
+        dev-lxc init --tiered-chef 1234- > dev-lxc.yml
 
 * IP Addresses
 

data/lib/dev-lxc/cli.rb

@@ -68,9 +68,9 @@ module DevLXC::CLI
           puts "ERROR: Can not copy validation key because Chef Server '#{chef_server_bootstrap_backend.name}' is not created."
           exit 1
         end
-        chef_server_url = "https://#{cluster.api_fqdn}/organizations/ponyville"
-        validation_client_name = 'ponyville-validator'
-        validation_key = "#{chef_server_bootstrap_backend.config_item('lxc.rootfs')}/root/chef-repo/.chef/ponyville-validator.pem"
+        chef_server_url = "https://#{cluster.api_fqdn}/organizations/demo"
+        validation_client_name = 'demo-validator'
+        validation_key = "#{chef_server_bootstrap_backend.config_item('lxc.rootfs')}/root/chef-repo/.chef/demo-validator.pem"
       elsif chef_server_url.nil? || validation_client_name.nil? || validation_key.nil?
         puts "ERROR: All of the --chef-server-url, --validation-client-name and --validation-key options must be set or left unset. Do not set only some of these options."
         exit 1
@@ -100,9 +100,9 @@ module DevLXC::CLI
           puts "ERROR: Can not copy validation key because Chef Server '#{chef_server_bootstrap_backend.name}' is not created."
           exit 1
         end
-        chef_server_url = "https://#{cluster.api_fqdn}/organizations/ponyville"
-        validation_client_name = 'ponyville-validator'
-        validation_key = "#{chef_server_bootstrap_backend.config_item('lxc.rootfs')}/root/chef-repo/.chef/ponyville-validator.pem"
+        chef_server_url = "https://#{cluster.api_fqdn}/organizations/demo"
+        validation_client_name = 'demo-validator'
+        validation_key = "#{chef_server_bootstrap_backend.config_item('lxc.rootfs')}/root/chef-repo/.chef/demo-validator.pem"
       elsif chef_server_url.nil? || validation_client_name.nil? || validation_key.nil?
         puts "ERROR: All of the --chef-server-url, --validation-client-name and --validation-key options must be set or left unset. Do not set only some of these options."
         exit 1
@@ -113,25 +113,122 @@ module DevLXC::CLI
       print_elapsed_time(Time.now - start_time)
     end
 
-    desc "init [TOPOLOGY] [UNIQUE_STRING]", "Provide a cluster config file with optional uniqueness in server names and FQDNs"
-    def init(topology=nil, unique_string=nil)
-      topologies = %w(adhoc open-source standalone tier)
-      if topology.nil? || ! topologies.include?(topology)
-        topologies_with_index = topologies.map.with_index{ |a, i| [i+1, *a]}
-        print_table topologies_with_index
-        selection = ask("Which cluster topology do you want to use?", :limited_to => topologies_with_index.map{|c| c[0].to_s})
-        topology = topologies[selection.to_i - 1]
-      end
-      config = IO.read("#{File.dirname(__FILE__)}/../../files/configs/#{topology}.yml")
+    desc "init [UNIQUE_STRING]", "Provide a cluster config file with optional uniqueness in server names and FQDNs"
+    option :open_source, :type => :boolean, :desc => "Standalone Old Open Source Chef Server"
+    option :tiered_chef, :type => :boolean, :desc => "Tiered Chef Server"
+    option :chef, :type => :boolean, :desc => "Standalone Chef Server"
+    option :analytics, :type => :boolean, :desc => "Analytics Server"
+    option :compliance, :type => :boolean, :desc => "Compliance Server"
+    option :supermarket, :type => :boolean, :desc => "Supermarket Server"
+    option :adhoc, :type => :boolean, :desc => "Adhoc Servers"
+    def init(unique_string=nil)
+      header = %Q(## 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 all mount source directories exist in the LXC host
+
+## Make sure all package paths are 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 (default), tier or open-source (for the old open source 11 chef server)
+
+platform_image: p-ubuntu-1404
+mounts:
+  - /root/dev root/dev
+)
+      open_source_config = %Q(
+chef-server:
+  packages:
+    server: /root/dev/chef-packages/osc/chef-server_11.1.6-1_amd64.deb
+  api_fqdn: chef.lxc
+  topology: open-source
+  servers:
+    osc-chef.lxc:
+      ipaddress: 10.0.3.200
+)
+      chef_server_packages = %Q(  packages:
+    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
+)
+      tiered_chef_config = %Q(
+chef-server:
+#{chef_server_packages.chomp}
+  topology: tier
+  api_fqdn: chef.lxc
+  servers:
+    chef-be.lxc:
+      ipaddress: 10.0.3.201
+      role: backend
+      bootstrap: true
+    chef-fe1.lxc:
+      ipaddress: 10.0.3.202
+      role: frontend
+)
+      chef_config = %Q(
+chef-server:
+#{chef_server_packages.chomp}
+  servers:
+    chef.lxc:
+      ipaddress: 10.0.3.203
+)
+      analytics_config = %Q(
+analytics:
+  packages:
+    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.3.1-1_amd64.deb
+  servers:
+    analytics.lxc:
+      ipaddress: 10.0.3.204
+)
+      compliance_config = %Q(
+compliance:
+  packages:
+    compliance: /root/dev/chef-packages/compliance/chef-compliance_1.1.2-1_amd64.deb
+  servers:
+    compliance.lxc:
+      ipaddress: 10.0.3.205
+)
+      supermarket_config = %Q(
+supermarket:
+  packages:
+    supermarket: /root/dev/chef-packages/supermarket/supermarket_2.5.2-1_amd64.deb
+  servers:
+    supermarket.lxc:
+      ipaddress: 10.0.3.206
+)
+      adhoc_config = %Q(
+adhoc:
+  servers:
+    adhoc.lxc:
+      ipaddress: 10.0.3.207
+)
+      config = header
+      config += chef_config if options[:chef]
+      config += tiered_chef_config if options[:tiered_chef]
+      config += analytics_config if options[:analytics]
+      config += compliance_config if options[:compliance]
+      config += supermarket_config if options[:supermarket]
+      config += adhoc_config if options[:adhoc]
       unless unique_string.nil?
         config_hash = YAML.load(config.gsub(/^#/, ''))
         config.gsub!(/api_fqdn:\s+#{config_hash['api_fqdn']}/, "api_fqdn: #{unique_string}#{config_hash['api_fqdn']}")
         config.gsub!(/analytics_fqdn:\s+#{config_hash['analytics_fqdn']}/, "analytics_fqdn: #{unique_string}#{config_hash['analytics_fqdn']}")
-        config_hash['chef-server']['servers'].keys.each do |server_name|
-          config.gsub!(/ #{server_name}:/, " #{unique_string}#{server_name}:")
-        end
-        config_hash['analytics']['servers'].keys.each do |server_name|
-          config.gsub!(/ #{server_name}:/, " #{unique_string}#{server_name}:")
+        %w(open-source chef-server analytics compliance supermarket adhoc).each do |server_type|
+          if config_hash[server_type]
+            config_hash[server_type]['servers'].keys.each do |server_name|
+              config.gsub!(/ #{server_name}:/, " #{unique_string}#{server_name}:")
+            end
+          end
         end
       end
       puts config
@@ -149,8 +246,11 @@ module DevLXC::CLI
     option :config, :desc => "Specify a cluster's YAML config file. `./dev-lxc.yml` will be used by default"
     def status(server_name_regex=nil)
       cluster = get_cluster(options[:config])
-      puts "Chef Server: https://#{cluster.api_fqdn}\n\n" if cluster.api_fqdn
-      puts "Analytics:   https://#{cluster.analytics_fqdn}\n\n" if cluster.analytics_fqdn
+      puts "Chef Server FQDN: #{cluster.api_fqdn}\n" if cluster.api_fqdn
+      puts "Analytics FQDN:   #{cluster.analytics_fqdn}\n" if cluster.analytics_fqdn
+      puts "Compliance FQDN:  #{cluster.compliance_fqdn}\n" if cluster.compliance_fqdn
+      puts "Supermarket FQDN: #{cluster.supermarket_fqdn}\n" if cluster.supermarket_fqdn
+      puts
       servers = Array.new
       match_server_name_regex(server_name_regex).map { |s| servers << s.server.status }
       max_server_name_length = servers.max_by { |s| s['name'].length }['name'].length unless servers.empty?

data/lib/dev-lxc/cluster.rb

@@ -2,7 +2,7 @@ require "dev-lxc/server"
 
 module DevLXC
   class Cluster
-    attr_reader :api_fqdn, :analytics_fqdn, :chef_server_bootstrap_backend, :analytics_bootstrap_backend, :lxc_config_path
+    attr_reader :api_fqdn, :chef_server_bootstrap_backend, :analytics_fqdn, :analytics_bootstrap_backend, :compliance_fqdn, :supermarket_fqdn, :lxc_config_path
 
     def initialize(cluster_config)
       @cluster_config = cluster_config
@@ -16,6 +16,7 @@ module DevLXC
 
       if @cluster_config["chef-server"]
         @chef_server_topology = @cluster_config["chef-server"]["topology"]
+        @chef_server_topology ||= 'standalone'
         @api_fqdn = @cluster_config["chef-server"]["api_fqdn"]
         @chef_server_servers = @cluster_config["chef-server"]["servers"]
         @chef_server_frontends = Array.new
@@ -23,6 +24,7 @@ module DevLXC
           case @chef_server_topology
           when 'open-source', 'standalone'
             @chef_server_bootstrap_backend = name if config["role"].nil?
+            @api_fqdn ||= @chef_server_bootstrap_backend
           when 'tier'
             @chef_server_bootstrap_backend = name if config["role"] == "backend" && config["bootstrap"] == true
             @chef_server_frontends << name if config["role"] == "frontend"
@@ -32,6 +34,7 @@ module DevLXC
 
       if @cluster_config["analytics"]
         @analytics_topology = @cluster_config["analytics"]["topology"]
+        @analytics_topology ||= 'standalone'
         @analytics_fqdn = @cluster_config["analytics"]["analytics_fqdn"]
         @analytics_servers = @cluster_config["analytics"]["servers"]
         @analytics_frontends = Array.new
@@ -39,12 +42,27 @@ module DevLXC
           case @analytics_topology
           when 'standalone'
             @analytics_bootstrap_backend = name if config["role"].nil?
+            @analytics_fqdn ||= @analytics_bootstrap_backend
           when 'tier'
             @analytics_bootstrap_backend = name if config["role"] == "backend" && config["bootstrap"] == true
             @analytics_frontends << name if config["role"] == "frontend"
           end
         end
       end
+
+      if @cluster_config["compliance"]
+        compliance_servers = @cluster_config["compliance"]["servers"]
+        compliance_servers.each_key do |name|
+          @compliance_fqdn = name
+        end
+      end
+
+      if @cluster_config["supermarket"]
+        supermarket_servers = @cluster_config["supermarket"]["servers"]
+        supermarket_servers.each_key do |name|
+          @supermarket_fqdn = name
+        end
+      end
     end
 
     def servers
@@ -69,6 +87,9 @@ module DevLXC
         end
       end
       servers = adhoc_servers + chef_servers + analytics_servers
+      servers << Server.new(@compliance_fqdn, 'compliance', @cluster_config) if @compliance_fqdn
+      servers << Server.new(@supermarket_fqdn, 'supermarket', @cluster_config) if @supermarket_fqdn
+      servers
     end
 
     def chef_repo(force=false, pivotal=false)
@@ -98,8 +119,8 @@ module DevLXC
         validator_name = "chef-validator"
       else
         chef_server_root = "https://#{@api_fqdn}"
-        chef_server_url = "https://#{@api_fqdn}/organizations/ponyville"
-        validator_name = "ponyville-validator"
+        chef_server_url = "https://#{@api_fqdn}/organizations/demo"
+        validator_name = "demo-validator"
 
         if pivotal
           if File.exists?("./chef-repo/.chef/pivotal.rb") && ! force
@@ -154,6 +175,24 @@ server "#{frontend_name}",
 )
         end
       end
+      if @analytics_fqdn
+        chef_server_config += %Q(
+oc_id['applications'] ||= {}
+oc_id['applications']['analytics'] = {
+  'redirect_uri' => 'https://#{@analytics_fqdn}/'
+}
+rabbitmq['vip'] = '#{@chef_server_bootstrap_backend}'
+rabbitmq['node_ip_address'] = '0.0.0.0'
+)
+      end
+      if @supermarket_fqdn
+        chef_server_config += %Q(
+oc_id['applications'] ||= {}
+oc_id['applications']['supermarket'] = {
+  'redirect_uri' => 'https://#{@supermarket_fqdn}/auth/chef_oauth2/callback'
+}
+)
+      end
       return chef_server_config
     end
 

data/lib/dev-lxc/server.rb

@@ -1,3 +1,4 @@
+require "json"
 require "dev-lxc/container"
 require "dev-lxc/cluster"
 
@@ -15,6 +16,8 @@ module DevLXC
       @lxc_config_path = cluster.lxc_config_path
       @api_fqdn = cluster.api_fqdn
       @analytics_fqdn = cluster.analytics_fqdn
+      @compliance_fqdn = cluster.compliance_fqdn
+      @supermarket_fqdn = cluster.supermarket_fqdn
       @chef_server_bootstrap_backend = cluster.chef_server_bootstrap_backend
       @analytics_bootstrap_backend = cluster.analytics_bootstrap_backend
       @chef_server_config = cluster.chef_server_config
@@ -23,14 +26,19 @@ module DevLXC
       @server = DevLXC::Container.new(name, @lxc_config_path)
       @config = cluster_config[@server_type]["servers"][@server.name]
       @ipaddress = @config["ipaddress"]
-      @role = @config["role"] ? @config["role"] : cluster_config[@server_type]['topology']
+      @role = @config["role"]
+      @role ||= cluster_config[@server_type]['topology']
+      @role ||= 'standalone'
       @mounts = cluster_config[@server_type]["mounts"]
+      @mounts ||= cluster_config["mounts"]
       @platform_image_name = cluster_config[@server_type]["platform_image"]
+      @platform_image_name ||= cluster_config["platform_image"]
       @platform_image_options = cluster_config[@server_type]["platform_image_options"]
+      @platform_image_options ||= cluster_config["platform_image_options"]
       @packages = cluster_config[@server_type]["packages"]
 
       case @server_type
-      when 'adhoc'
+      when 'adhoc', 'compliance', 'supermarket'
         @shared_image_name = ''
       when 'analytics'
         @shared_image_name = "s#{@platform_image_name[1..-1]}"
@@ -82,6 +90,10 @@ module DevLXC
           DevLXC.create_dns_record(@analytics_fqdn, @server.name, @ipaddress)
         when 'chef-server'
           DevLXC.create_dns_record(@api_fqdn, @server.name, @ipaddress)
+        when 'compliance'
+          DevLXC.create_dns_record(@compliance_fqdn, @server.name, @ipaddress)
+        when 'supermarket'
+          DevLXC.create_dns_record(@supermarket_fqdn, @server.name, @ipaddress)
         end
       end
       @server.sync_mounts(@mounts)
@@ -163,7 +175,11 @@ module DevLXC
         return
       else
         puts "Creating container '#{@server.name}'"
-        if @server_type == 'adhoc'
+        if %w(adhoc compliance supermarket).include?(@server_type)
+          if @server_type == 'supermarket' && (@chef_server_bootstrap_backend && ! DevLXC::Container.new(@chef_server_bootstrap_backend, @lxc_config_path).defined?)
+            puts "ERROR: The bootstrap backend server '#{@chef_server_bootstrap_backend}' must be created first."
+            exit 1
+          end
           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})
@@ -194,6 +210,10 @@ module DevLXC
             DevLXC.create_dns_record(@analytics_fqdn, @server.name, @ipaddress)
           when 'chef-server'
             DevLXC.create_dns_record(@api_fqdn, @server.name, @ipaddress)
+          when 'compliance'
+            DevLXC.create_dns_record(@compliance_fqdn, @server.name, @ipaddress)
+          when 'supermarket'
+            DevLXC.create_dns_record(@supermarket_fqdn, @server.name, @ipaddress)
           end
         end
         @server.sync_mounts(@mounts)
@@ -205,7 +225,15 @@ module DevLXC
         @server.start
         # Allow adhoc servers time to generate SSH Server Host Keys
         sleep 5 if @server_type == 'adhoc'
+        case @server_type
+        when 'compliance'
+          @server.install_package(@packages["compliance"]) unless @packages["compliance"].nil?
+        when 'supermarket'
+          @server.install_package(@packages["supermarket"]) unless @packages["supermarket"].nil?
+        end
         configure_analytics if @server_type == 'analytics'
+        configure_compliance if @server_type == 'compliance'
+        configure_supermarket if @server_type == 'supermarket'
         if @server_type == 'chef-server' && ! @packages["server"].nil?
           configure_server
           create_users if @server.name == @chef_server_bootstrap_backend
@@ -216,9 +244,6 @@ module DevLXC
           unless @role == 'open-source'
             configure_reporting unless @packages["reporting"].nil?
             configure_push_jobs_server unless @packages["push-jobs-server"].nil?
-            if @analytics_bootstrap_backend && %w(standalone backend).include?(@role)
-              configure_chef_server_for_analytics
-            end
           end
         end
         @server.stop
@@ -316,29 +341,6 @@ module DevLXC
       run_ctl("opscode-manage", "reconfigure")
     end
 
-    def configure_chef_server_for_analytics
-      puts "Configuring for Analytics"
-      case @chef_server_type
-      when 'private-chef'
-        DevLXC.append_line_to_file("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb",
-          "\noc_id['applications'] = {\n  'analytics' => {\n    'redirect_uri' => 'https://#{@analytics_fqdn}/'\n  }\n}\n")
-
-        DevLXC.append_line_to_file("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb",
-          "\nrabbitmq['vip'] = '#{@chef_server_bootstrap_backend}'\nrabbitmq['node_ip_address'] = '0.0.0.0'\n")
-      when 'chef-server-core'
-        DevLXC.append_line_to_file("#{@server.config_item('lxc.rootfs')}/etc/opscode/chef-server.rb",
-          "\noc_id['applications'] = {\n  'analytics' => {\n    'redirect_uri' => 'https://#{@analytics_fqdn}/'\n  }\n}\n")
-
-        DevLXC.append_line_to_file("#{@server.config_item('lxc.rootfs')}/etc/opscode/chef-server.rb",
-          "\nrabbitmq['vip'] = '#{@chef_server_bootstrap_backend}'\nrabbitmq['node_ip_address'] = '0.0.0.0'\n")
-      end
-
-      run_ctl(@server_ctl, "stop")
-      run_ctl(@server_ctl, "reconfigure")
-      run_ctl(@server_ctl, "restart")
-      run_ctl("opscode-manage", "reconfigure") if @role == 'frontend'
-    end
-
     def configure_analytics
       case @role
       when "standalone", "backend"
@@ -355,6 +357,25 @@ module DevLXC
       run_ctl("opscode-analytics", "reconfigure")
     end
 
+    def configure_compliance
+      run_ctl("chef-compliance", "reconfigure")
+    end
+
+    def configure_supermarket
+      if @chef_server_bootstrap_backend && DevLXC::Container.new(@chef_server_bootstrap_backend, @lxc_config_path).defined?
+        chef_server_supermarket_config = JSON.parse(IO.read("#{LXC::Container.new(@chef_server_bootstrap_backend, @lxc_config_path).config_item('lxc.rootfs')}/etc/opscode/oc-id-applications/supermarket.json"))
+        supermarket_config = {
+          'chef_server_url' => "https://#{@api_fqdn}/",
+          'chef_oauth2_app_id' => chef_server_supermarket_config['uid'],
+          'chef_oauth2_secret' => chef_server_supermarket_config['secret'],
+          'chef_oauth2_verify_ssl' => false
+        }
+        FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/etc/supermarket")
+        IO.write("#{@server.config_item('lxc.rootfs')}/etc/supermarket/supermarket.json", JSON.pretty_generate(supermarket_config))
+      end
+      run_ctl("supermarket", "reconfigure")
+    end
+
     def run_ctl(component, subcommand)
       puts "Running `#{component}-ctl #{subcommand}` in '#{@server.name}'"
       @server.run_command("#{component}-ctl #{subcommand}")
@@ -367,15 +388,16 @@ module DevLXC
       case @chef_server_type
       when 'chef-server'
         chef_server_url = "https://127.0.0.1"
-        username = "admin"
+        admin_username = "admin"
         validator_name = "chef-validator"
 
         FileUtils.cp( Dir.glob("#{@server.config_item('lxc.rootfs')}/etc/chef-server/{admin,chef-validator}.pem"), "#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef" )
       when 'private-chef', 'chef-server-core'
         chef_server_root = "https://127.0.0.1"
-        chef_server_url = "https://127.0.0.1/organizations/ponyville"
-        username = "rainbowdash"
-        validator_name = "ponyville-validator"
+        chef_server_url = "https://127.0.0.1/organizations/demo"
+        admin_username = "mary-admin"
+        username = "joe-user"
+        validator_name = "demo-validator"
 
         FileUtils.cp( "#{@server.config_item('lxc.rootfs')}/etc/opscode/pivotal.pem", "#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef" )
 
@@ -401,9 +423,16 @@ current_dir = File.dirname(__FILE__)
 
 chef_server_url "#{chef_server_url}"
 
-node_name "#{username}"
-client_key "\#{current_dir}/#{username}.pem"
+node_name "#{admin_username}"
+client_key "\#{current_dir}/#{admin_username}.pem"
+)
+
+      knife_rb += %Q(
+#node_name "#{username}"
+#client_key "\#{current_dir}/#{username}.pem"
+) unless username.nil?
 
+      knife_rb += %Q(
 validation_client_name "#{validator_name}"
 validation_key "\#{current_dir}/#{validator_name}.pem"
 
@@ -419,15 +448,19 @@ ssl_verify_mode :verify_none
         # give time for all services to come up completely
         sleep 60
         @server.run_command("/opt/opscode/embedded/bin/gem install knife-opc --no-ri --no-rdoc")
-        @server.run_command("/opt/opscode/embedded/bin/knife opc org create ponyville ponyville --filename /root/chef-repo/.chef/ponyville-validator.pem -c /root/chef-repo/.chef/pivotal.rb")
-        @server.run_command("/opt/opscode/embedded/bin/knife opc user create rainbowdash rainbowdash rainbowdash rainbowdash@noreply.com rainbowdash --filename /root/chef-repo/.chef/rainbowdash.pem -c /root/chef-repo/.chef/pivotal.rb")
-        @server.run_command("/opt/opscode/embedded/bin/knife opc org user add ponyville rainbowdash --admin -c /root/chef-repo/.chef/pivotal.rb")
+        @server.run_command("/opt/opscode/embedded/bin/knife opc org create demo demo --filename /root/chef-repo/.chef/demo-validator.pem -c /root/chef-repo/.chef/pivotal.rb")
+        @server.run_command("/opt/opscode/embedded/bin/knife opc user create mary-admin mary admin mary-admin@noreply.com mary-admin --filename /root/chef-repo/.chef/mary-admin.pem -c /root/chef-repo/.chef/pivotal.rb")
+        @server.run_command("/opt/opscode/embedded/bin/knife opc org user add demo mary-admin --admin -c /root/chef-repo/.chef/pivotal.rb")
+        @server.run_command("/opt/opscode/embedded/bin/knife opc user create joe-user joe user joe-user@noreply.com joe-user --filename /root/chef-repo/.chef/joe-user.pem -c /root/chef-repo/.chef/pivotal.rb")
+        @server.run_command("/opt/opscode/embedded/bin/knife opc org user add demo joe-user -c /root/chef-repo/.chef/pivotal.rb")
       when 'chef-server-core'
         # give time for all services to come up completely
         sleep 10
-        run_ctl(@server_ctl, "org-create ponyville ponyville --filename /root/chef-repo/.chef/ponyville-validator.pem")
-        run_ctl(@server_ctl, "user-create rainbowdash rainbowdash rainbowdash rainbowdash@noreply.com rainbowdash --filename /root/chef-repo/.chef/rainbowdash.pem")
-        run_ctl(@server_ctl, "org-user-add ponyville rainbowdash --admin")
+        run_ctl(@server_ctl, "org-create demo demo --filename /root/chef-repo/.chef/demo-validator.pem")
+        run_ctl(@server_ctl, "user-create mary-admin mary admin mary-admin@noreply.com mary-admin --filename /root/chef-repo/.chef/mary-admin.pem")
+        run_ctl(@server_ctl, "org-user-add demo mary-admin --admin")
+        run_ctl(@server_ctl, "user-create joe-user joe user joe-user@noreply.com joe-user --filename /root/chef-repo/.chef/joe-user.pem")
+        run_ctl(@server_ctl, "org-user-add demo joe-user")
       end
     end
   end

data/lib/dev-lxc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,10 +82,6 @@ files:
 - Rakefile
 - bin/dev-lxc
 - dev-lxc.gemspec
-- files/configs/adhoc.yml
-- files/configs/open-source.yml
-- files/configs/standalone.yml
-- files/configs/tier.yml
 - lib/dev-lxc.rb
 - lib/dev-lxc/cli.rb
 - lib/dev-lxc/cluster.rb

data/files/configs/adhoc.yml

@@ -1,31 +0,0 @@
-## 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
-
-## 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)
-
-adhoc:
-  platform_image: p-ubuntu-1404
-  mounts:
-    - /root/dev root/dev
-
-  servers:
-    chef.lxc:
-      ipaddress: 10.0.3.210
-    delivery.lxc:
-      ipaddress: 10.0.3.211
-    build-1.lxc:
-      ipaddress: 10.0.3.212

data/files/configs/open-source.yml

@@ -1,31 +0,0 @@
-## 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
-
-## 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-1204
-  mounts:
-    - /root/dev root/dev
-  packages:
-    server: /root/dev/chef-packages/osc/chef-server_11.1.6-1_amd64.deb
-
-  api_fqdn: chef.lxc
-  topology: open-source
-  servers:
-    osc-chef.lxc:
-      ipaddress: 10.0.3.199

data/files/configs/standalone.yml

@@ -1,47 +0,0 @@
-## 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
-
-## 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:
-    - /root/dev root/dev
-  packages:
-    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
-  topology: standalone
-  servers:
-    chef.lxc:
-      ipaddress: 10.0.3.201
-
-analytics:
-  platform_image: p-ubuntu-1404
-  mounts:
-    - /root/dev root/dev
-  packages:
-    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.3.1-1_amd64.deb
-
-  analytics_fqdn: analytics.lxc
-  topology: standalone
-  servers:
-    analytics.lxc:
-      ipaddress: 10.0.3.202

data/files/configs/tier.yml

@@ -1,63 +0,0 @@
-## 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
-
-## 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:
-    - /root/dev root/dev
-  packages:
-    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
-  topology: tier
-  servers:
-    chef-be.lxc:
-      role: backend
-      ipaddress: 10.0.3.203
-      bootstrap: true
-    chef-fe1.lxc:
-      role: frontend
-      ipaddress: 10.0.3.204
-#    chef-fe2.lxc:
-#      role: frontend
-#      ipaddress: 10.0.3.205
-
-analytics:
-  platform_image: p-ubuntu-1404
-  mounts:
-    - /root/dev root/dev
-  packages:
-    analytics: /root/dev/chef-packages/analytics/opscode-analytics_1.3.1-1_amd64.deb
-
-  analytics_fqdn: analytics.lxc
-  topology: tier
-  servers:
-    analytics-be.lxc:
-      role: backend
-      ipaddress: 10.0.3.206
-      bootstrap: true
-    analytics-fe1.lxc:
-      role: frontend
-      ipaddress: 10.0.3.207
-#    analytics-fe2.lxc:
-#      role: frontend
-#      ipaddress: 10.0.3.208