dev-lxc 0.2.3 → 0.2.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c4a6d760a6df8b811cd6028e91d1964e8396de53
+  data.tar.gz: 8aeba30eb10916eaf0e193addad0d1c6e126e28b
+SHA512:
+  metadata.gz: 5848cd101928b5769f0f1f376fd5900d7644a4069e9591c06554b5fba411d0c6176df9fa68e349b134cbdb12131af09a1c63d18d132095df10fc29d646a1239d
+  data.tar.gz: ee0568a316d55e9e3694d087407fbceb6c3957883b0317a1cb6ea068c44f1bc09febee771bd017d65b4124f8b799e41f9c442d609af78d7f3e6080e945184475

data/README.md

@@ -297,8 +297,11 @@ creation of the cluster's servers is very quick.
 
 [https://chef-tier.lxc](https://chef-tier.lxc) resolves to the frontend.
 
-Ponyville and wonderbolts orgs, users, knife.rb and keys are automatically created in
-the bootstrap backend server in /srv/piab/users for testing purposes.
+A test org and user and knife.rb and keys are automatically created in
+the bootstrap backend server in /root/chef-repo/.chef for testing purposes.
+The `knife-opc` plugin is installed in the embedded ruby environment of the
+Private Chef and Enterprise Chef server to facilitate the creation of the test
+org and user.
 
 Show the status of the cluster.
 

data/lib/dev-lxc/chef-cluster.rb

@@ -83,10 +83,6 @@ module DevLXC
 
     def chef_server_config
       chef_server_config = %Q(api_fqdn "#{@api_fqdn}"\n)
-      @cluster_config["packages"]["server"].to_s.match(/(private-chef|chef-server)[_-](\d+)\.(\d+\.?){2,}-/)
-      if Regexp.last_match[2].to_i >= 11
-        chef_server_config += %Q(bookshelf["vip"] = "#{@api_fqdn}"\n)
-      end
       if %w(tier ha).include?(@topology)
         chef_server_config += %Q(
 topology "#{@topology}"

data/lib/dev-lxc/chef-server.rb

@@ -28,9 +28,24 @@ module DevLXC
       @base_platform = cluster_config["base_platform"]
       @packages = cluster_config["packages"]
 
+      if File.basename(@packages["server"]).match(/^(\w+-\w+.*)[_-]((?:\d+\.?){3,})-/)
+        @chef_server_type = Regexp.last_match[1]
+        @chef_server_version = Regexp.last_match[2].gsub(".", "-")
+      end
+
       @base_server_name = @base_platform
-      @base_server_name += "-ec-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["server"].to_s.match(/private-chef[_-]((\d+\.?){3,})-/)
-      @base_server_name += "-osc-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["server"].to_s.match(/chef-server[_-]((\d+\.?){3,})-/)
+      case @chef_server_type
+      when 'chef-server-core'
+        @base_server_name += '-cs'
+        @server_ctl = 'chef-server'
+      when 'private-chef'
+        @base_server_name += '-ec'
+        @server_ctl = 'private-chef'
+      when 'chef-server'
+        @base_server_name += '-osc'
+        @server_ctl = 'chef-server'
+      end
+      @base_server_name += "-#{@chef_server_version}"
       @base_server_name += "-reporting-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["reporting"].to_s.match(/[_-]((\d+\.?){3,})-/)
       @base_server_name += "-pushy-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["push-jobs-server"].to_s.match(/[_-]((\d+\.?){3,})-/)
     end
@@ -181,19 +196,26 @@ module DevLXC
       case @role
       when "open-source"
         puts "Creating /etc/chef-server/chef-server.rb"
-        FileUtils.mkdir("#{@server.config_item('lxc.rootfs')}/etc/chef-server")
+        FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/etc/chef-server")
         IO.write("#{@server.config_item('lxc.rootfs')}/etc/chef-server/chef-server.rb", @chef_server_config)
-        run_ctl("chef-server", "reconfigure")
+        run_ctl(@server_ctl, "reconfigure")
       when "standalone", "bootstrap_backend"
-        puts "Creating /etc/opscode/private-chef.rb"
-        FileUtils.mkdir("#{@server.config_item('lxc.rootfs')}/etc/opscode")
-        IO.write("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", @chef_server_config)
-        run_ctl("private-chef", "reconfigure")
+        case @chef_server_type
+        when 'private-chef'
+          puts "Creating /etc/opscode/private-chef.rb"
+          FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/etc/opscode")
+          IO.write("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", @chef_server_config)
+        when 'chef-server-core'
+          puts "Creating /etc/opscode/chef-server.rb"
+          FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/etc/opscode")
+          IO.write("#{@server.config_item('lxc.rootfs')}/etc/opscode/chef-server.rb", @chef_server_config)
+        end
+        run_ctl(@server_ctl, "reconfigure")
       when "secondary_backend", "frontend"
         puts "Copying /etc/opscode from bootstrap backend"
         FileUtils.cp_r("#{LXC::Container.new(@bootstrap_backend).config_item('lxc.rootfs')}/etc/opscode",
                        "#{@server.config_item('lxc.rootfs')}/etc")
-        run_ctl("private-chef", "reconfigure")
+        run_ctl(@server_ctl, "reconfigure")
       end
     end
 
@@ -203,23 +225,25 @@ module DevLXC
         FileUtils.cp_r("#{LXC::Container.new(@bootstrap_backend).config_item('lxc.rootfs')}/etc/opscode-reporting",
                        "#{@server.config_item('lxc.rootfs')}/etc")
       end
-      run_ctl("private-chef", "reconfigure")
+      run_ctl(@server_ctl, "reconfigure")
       run_ctl("opscode-reporting", "reconfigure")
     end
 
     def configure_push_jobs_server
       run_ctl("opscode-push-jobs-server", "reconfigure")
       if %w(bootstrap_backend secondary_backend).include?(@role)
-        run_ctl("private-chef", "reconfigure")
+        run_ctl(@server_ctl, "reconfigure")
       end
-      run_ctl("private-chef", "restart opscode-pushy-server")
+      run_ctl(@server_ctl, "restart opscode-pushy-server")
     end
 
     def configure_manage
-      puts "Disabling old opscode-webui in /etc/opscode/private-chef.rb"
-      DevLXC.search_file_delete_line("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", /opscode_webui[.enable.]/)
-      DevLXC.append_line_to_file("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", "\nopscode_webui['enable'] = false\n")
-      run_ctl("private-chef", "reconfigure")
+      if @chef_server_type == 'private-chef'
+        puts "Disabling old opscode-webui in /etc/opscode/private-chef.rb"
+        DevLXC.search_file_delete_line("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", /opscode_webui[.enable.]/)
+        DevLXC.append_line_to_file("#{@server.config_item('lxc.rootfs')}/etc/opscode/private-chef.rb", "\nopscode_webui['enable'] = false\n")
+        run_ctl(@server_ctl, "reconfigure")
+      end
       run_ctl("opscode-manage", "reconfigure")
     end
 
@@ -229,17 +253,34 @@ module DevLXC
     end
 
     def create_users
-      puts "Creating users, keys and knife config files"
-      FileUtils.mkdir_p(["#{@server.config_item('lxc.rootfs')}/cookbooks/create_users/recipes",
-                         "#{@server.config_item('lxc.rootfs')}/cookbooks/create_users/templates/default",
-                        "#{@server.config_item('lxc.rootfs')}/cookbooks/create_users/libraries"])
-      FileUtils.cp("#{File.dirname(__FILE__)}/../../files/create_users/default.rb", "#{@server.config_item('lxc.rootfs')}/cookbooks/create_users/recipes")
-      DevLXC.search_file_replace("#{@server.config_item('lxc.rootfs')}/cookbooks/create_users/recipes/default.rb", /chef\.lxc/, @api_fqdn)
-      FileUtils.cp("#{File.dirname(__FILE__)}/../../files/create_users/knife.rb.erb", "#{@server.config_item('lxc.rootfs')}/cookbooks/create_users/templates/default")
-      FileUtils.cp("#{File.dirname(__FILE__)}/../../files/create_users/create_users.rb", "#{@server.config_item('lxc.rootfs')}/cookbooks/create_users/libraries")
-      IO.write("#{@server.config_item('lxc.rootfs')}/cookbooks/solo.rb", "cookbook_path '/cookbooks'")
-      @server.run_command("/opt/opscode/embedded/bin/chef-solo -c /cookbooks/solo.rb -o create_users -l info")
-      FileUtils.rm_r("#{@server.config_item('lxc.rootfs')}/cookbooks")
+      puts "Creating org, user, keys and knife.rb in /root/chef-repo/.chef"
+      FileUtils.mkdir_p("#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef")
+      knife_rb = "chef_server_url 'https://127.0.0.1/organizations/ponyville'\n"
+      knife_rb += "node_name 'rainbowdash'\n"
+      knife_rb += "client_key 'rainbowdash.pem'\n"
+      knife_rb += "knife[:chef_repo_path] = Dir.pwd\n"
+      IO.write("#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef/knife.rb", knife_rb)
+      case @chef_server_type
+      when 'private-chef'
+        # give time for all services to come up completely
+        sleep 60
+        pivotal_rb = "chef_server_root 'https://127.0.0.1/'\n"
+        pivotal_rb += "chef_server_url 'https://127.0.0.1/'\n"
+        pivotal_rb += "node_name 'pivotal'\n"
+        pivotal_rb += "client_key '/etc/opscode/pivotal.pem'\n"
+        pivotal_rb += "knife[:chef_repo_path] = Dir.pwd\n"
+        IO.write("#{@server.config_item('lxc.rootfs')}/root/chef-repo/.chef/pivotal.rb", pivotal_rb)
+        @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")
+      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")
+      end
     end
   end
 end

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/dev-lxc.rb

@@ -18,6 +18,8 @@ module DevLXC
       base_platform.create("download", "btrfs", 0, ["-d", "ubuntu", "-r", "lucid", "-a", "amd64"])
     when "b-ubuntu-1204"
       base_platform.create("download", "btrfs", 0, ["-d", "ubuntu", "-r", "precise", "-a", "amd64"])
+    when "b-ubuntu-1404"
+      base_platform.create("download", "btrfs", 0, ["-d", "ubuntu", "-r", "trusty", "-a", "amd64"])
     when "b-centos-5"
       base_platform.create("centos", "btrfs", 0, ["-R", "5"])
     when "b-centos-6"
@@ -45,7 +47,7 @@ module DevLXC
       end
       base_platform.run_command("apt-get update")
       base_platform.run_command("apt-get install -y standard^ server^ vim-nox emacs23-nox curl tree")
-    when "b-ubuntu-1204"
+    when "b-ubuntu-1204", "b-ubuntu-1404"
       base_platform.run_command("apt-get update")
       base_platform.run_command("apt-get install -y standard^ server^ vim-nox emacs23-nox tree")
     when "b-centos-5"

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.2.4
 platform: ruby
 authors:
 - Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-lxc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
 description: A tool for creating Chef server clusters using LXC containers
@@ -83,7 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -94,9 +85,6 @@ files:
 - files/configs/open-source.yaml
 - files/configs/standalone.yaml
 - files/configs/tier.yaml
-- files/create_users/create_users.rb
-- files/create_users/default.rb
-- files/create_users/knife.rb.erb
 - lib/dev-lxc.rb
 - lib/dev-lxc/chef-cluster.rb
 - lib/dev-lxc/chef-server.rb
@@ -106,27 +94,26 @@ files:
 homepage: https://github.com/jeremiahsnapp/dev-lxc
 licenses:
 - Apache2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A tool for creating Chef server clusters using LXC containers
 test_files: []
 has_rdoc: 

data/files/create_users/create_users.rb

@@ -1,53 +0,0 @@
-# Authors
-# Seth Chisamore
-# Seth Falcon
-# Jeremiah Snapp
-
-require 'chef/mixin/shell_out'
-include Chef::Mixin::ShellOut
-
-class PiabHelper
-
-  VALID_OMNIBUS_ROOTS = %w{
-    /opt/opscode
-    /opt/chef-server
-  }
-
-  def self.omnibus_root
-    @@root_path ||= begin
-      root_path = VALID_OMNIBUS_ROOTS.detect{|path| File.exists?(path) }
-      raise "Could not locate one of #{VALID_OMNIBUS_ROOTS.join(', ')}" unless root_path
-      root_path
-    end
-  end
-
-  def self.omnibus_bin_path
-    self.omnibus_root + "/embedded/bin"
-  end
-
-  def self.private_chef_ha?
-    File.exists?("/etc/opscode/private-chef.rb") && File.read("/etc/opscode/private-chef.rb") =~ /topology\s+.*ha/
-  end
-
-  def self.private_chef?
-    File.exists?("/opt/opscode/bin/private-chef-ctl")
-  end
-
-  def self.open_source_chef?
-    File.exists?("/opt/chef-server/bin/chef-server-ctl")
-  end
-
-  def self.existing_config
-    config_files = {
-      "private_chef" => "/etc/opscode/chef-server-running.json",
-      "chef_server" => "/etc/chef-server/chef-server-running.json"
-    }
-    config_files.each do |key, path|
-      if ::File.exists?(path)
-        return Chef::JSONCompat.from_json(IO.read(path))[key]
-      end
-    end
-    raise "No existing config found"
-  end
-
-end

data/files/create_users/default.rb

@@ -1,261 +0,0 @@
-# Authors
-# Seth Chisamore
-# Seth Falcon
-
-# OPC config data
-# TODO - read this in from /etc/opscode/chef-server-running.json
-opc_bundle = "#{PiabHelper.omnibus_root}/embedded/bin/bundle"
-opscode_account_url = "http://127.0.0.1:9465"
-opscode_account_path = "#{PiabHelper.omnibus_root}/embedded/service/opscode-account"
-superuser_pem = "/etc/opscode/pivotal.pem"
-superuser_name = ::File.basename(superuser_pem).split('.')[0]
-user_root = "/srv/piab/users"
-dev_users = {}
-
-organizations = {
-  'ponyville' => [
-      'rainbowdash',
-      'fluttershy',
-      'applejack',
-      'pinkiepie',
-      'twilightsparkle',
-      'rarity'
-  ],
-  'wonderbolts' => [
-      'spitfire',
-      'soarin',
-      'rapidfire',
-      'fleetfoot'
-  ]
-}
-
-organizations.each do |orgname, users|
-
-  users.each do |username|
-
-    folder = "#{user_root}/#{username}"
-    dot_chef = "#{folder}/.chef"
-
-    dev_users[username] = {
-      'username' => username,
-      'displayname' => username,
-      'email' => "#{username}@mylittlepony.com",
-      'orgname' => orgname,
-      'folder' => folder,
-      'private_key' => "#{dot_chef}/#{username}.pem",
-      'org_validator' => "#{dot_chef}/#{username}-validator.pem",
-      'knife_config' => "#{dot_chef}/knife.rb"
-    }
-
-  end
-end
-
-unless File.exists?("/srv/piab/dev_users_created")
-
-  ruby_block "Waiting for first-time OPC initializtion" do
-    block do
-      sleep 10
-    end
-  end
-
-  dev_users.each_pair do |name, options|
-
-    # create the students .chef/ dir
-    directory ::File.dirname(options['private_key']) do
-      recursive true
-      action :create
-    end
-
-    # create an account on the OPC for the student
-    execute "create OPC account #{name}" do
-      command <<-EOH
-#{opc_bundle} exec bin/createobjecttool --object-type 'user' -a '#{opscode_account_url}' \
---object-name #{options['username']} --displayname '#{options['displayname']}' -e '#{options['email']}' \
--f '#{options['displayname']}' -m '#{options['displayname']}' -l '#{options['displayname']}' \
---key-path #{options['private_key']} --user-password '#{options['username']}' \
---opscode-username #{superuser_name} --opscode-private-key #{superuser_pem}
-EOH
-      cwd opscode_account_path
-    end
-
-    # create a knife.rb file for the user
-    template "#{options['knife_config']}" do
-      source "knife.rb.erb"
-      variables(
-        :username => options['username'],
-        :orgname => options['orgname'],
-        :server_fqdn => 'chef.lxc'
-      )
-      mode "0777"
-      action :create
-    end
-
-  end
-
-  # create the orgs and associate the users
-  organizations.each do |orgname, users|
-
-    org_validator = "#{user_root}/#{orgname}-validator.pem"
-
-    ruby_block "create OPC organization #{orgname}" do
-      block do
-        cmd =<<-EOH
-#{opc_bundle} exec bin/createorgtool -t Business -a '#{opscode_account_url}' \
---org-name #{orgname} --customer-org-fullname '#{orgname}' \
---username '#{users.join(' ')}' \
---client-key-path #{org_validator} \
---opscode-username #{superuser_name} --opscode-private-key #{superuser_pem}
-EOH
-        waiting = true
-        while waiting
-          opts = {:cwd => opscode_account_path,
-                  :returns => [0,53]}
-          case shell_out(cmd, opts).exitstatus
-          when 53
-            Chef::Log.info("...")
-            sleep 10
-          when 0
-            Chef::Log.info("#{orgname} created!")
-            waiting = false
-          else
-            Chef::Log.error("#{orgname} not created...error!")
-            waiting = false
-          end
-        end
-      end
-    end
-
-  end
-
-  ruby_block 'LOL' do
-    block do
-      Chef::Log.info <<-EOH
-
-
-                            .`
-                  `,,,,,.`  ;,;
-             ,;;;;;''''';;;,:..;                   `        ;;
-         .;;;'''''''''''''';,...;                ;;;       ;,;
-   `  ,;;;''''''''''''';;;;;,....;              ;:,;      ;..;
-    ;;''''''';'''''';;;;;;;:,....,;            ;,,,;   ;:,,..;
-     :;;;;'';''''';;;;;;;;;,,.....:.          `;,,,:  ;,,:..,,
-        ```;'''';;;;;;;;;;..,...;..;          ;,,,:  :,,;..,:`
-          ;''';;;;;;;;;;;.,,:....:.,:         ;,,,;  :,,:...;      :;;;
-         ;''';;;;;;;;;;:,,,,;....;..;;`      .,,,,: :,,;....;    .:...;
-        ,;';;;;;;;;;;;,,,,.;,....,,.,:;.     ;,,,,. ;,,;...,:   ;....;
-       `;';;;;;;;;;;;,,,,,,;......:..';;.    ;,,,: `,,,:...:` .;....,,
-       ;';;;;;;;;;;;,,,,,,,,.....:;.,;;;;    ;,,,: ;,,:,...; ;;.....;
-      ,;;;;;;;;;;;;;,,,:,,'......,,..;;;';   ;,,,; ;,,:....;.::....:
-      ;;;;;;;;;;;;;.,,,'.:...........;;;;;   ;,,,; ;,,;....;;'....,:
-     ,;;;;;;;;;;;;,,,,,:,:...........:;;;;.  ;,,,: ;,,'....',,....;
-     ;;;;;;;;;;;;;,,,,;,;............,:;;';  ;,,,:,:,,;....';....,.
-    `:;;;;;;;;;;;.,,,';;.........,....';;;;  ;,,,,;:,,:,...;:....;
-    ;;;;;;;;;;;;;,,,;.;...........,...;;;;;  ;,,,,;:,,:....;....,`
-    ;;;;;;;;;;;;,,,;,,.+......;,':.;..:';;;  ;,,,,;,,:,....:....;
-   .;;;;;;:;;@;#,,'...;......@@@@:@,..,;;;;  :,,,,::,;.........,,
-   ;;;;;;;;;;+;;,;....,...,,@@@@@@.@..,;;;;  .:,,,,;,'.........;             .;
-   :;;;::;;;';@#;.........'# +@@@@;...,;;;;,  ;,,,,,,;........,;   ,;;;:   ;;;
-  ;;;;; ;;;;;#;,'...,@...@;` `\#@@@....,;;;';  ;,,,:;,;..;;....;` ;,...,: .;;;    .:;;;;;;;;;;,
- `:;;. :;;;+';,: ,..,;@@+ :  `\#@@@....:;;;;;` ;,,:,,::.'..,...;;,......:;;;; .;;'''''''''''''';;`
- ;::   ;;;;;.@@: @....;;  ;. ;@@@#....;;;;;;; ;,:,,,;,'..,,..::........;'';,;;'''''''''';;:::,,,,,
-.:    ,;;;` + ;' @....,,` :;+@@@@'..,:;;;;;;;.,,,,,,;:...,...'........;'';;'''''''''''';,
-      ;::      :'#:.....; `;;\#.\#@:..,;;;;;;;;;`:,,,,;:...;...........;;';;''''''';;;;'''';:
-      ;:       + @'.....@  ';;:;;;.,;;;;;;;;;;;:,,,,;...,:,........,;;'';''';;;;;;;;;;;;''';
-      :        `;@+,.....@  ';,...,;;;;;;';;;;;:,,,:,...;,:,......:;''';;;;;;;;;;;;;;;;;;''';
-     `          '::.......',..,...;;;;;;;;;;;;;,,,,;...;,...:,..,;;'''';;;;;;;;;;;;;;;;;;;''';
-                 '........,:,,...;;';;;;;;;;;';:,,,,..;....,,.,;,,;;'';;;;;;;;;;;;;;;;;;;;;''';
-                ;,.........,....:;;:;;;;;;;;;';:,,;..:.....;.,::,..,:;;;;;;;;;;;;;;;;;;;;;;;''';
-               .,.,..,..........;,;;;;;;;;;;''';,'........'..........;;;;;;;;;;;;;;;;;;';;;;'''';
-                ;....;.........,,:;;;;;;;;;'''';;........;,,,,......:';;;;;::::;;';;;;;;';;;;'''':
-                 ;;;;..........;,:;;;;;;;;;'''';,......,;,...,,....;,.,,,,,,,,,,,,,;';;;;;;;;;''';`
-                 `;,........,;;..;;;;;;;;;'''';.......,:.....;...,;;;;;::,,,..,,,,,,.;;;;;;;;;;''';
-                   .;;;;;;;;. :,:;;;;;;;;'';'';.......,,....,,.,;:;;;;;;;;;;;;;:.,,,,,,;;;;;;;;''';`
-                             ;..;;;;;;;;;;;'';..............;:;;;'''''''''''';;;;;.,,,,:;;;;;;;;''';
-                             ;,:;;;;;;;;;;'';............,:;;..;';;:::;;''''''';;;;,,,,.';;;;;;;''';
-                            :,.;;;;;;;;;;'';.........,,:;:,....,;       :;''''''';;;:,,,;;;;;;;;;'';
-                            ;.:;;;;;;;::'';....;.,.....,,,......:,       `;''';''';;;,,,:;;;;;;;;'';
-                           `:.;;;;;;;.:';;......;:.....,:,   :...;        :''';:''';;;.,,;;;;;;;;;';
-                           :.:;;;;:.,,;;,.........,:;;:,,     ...,`        ;''; ;'';;;:,.;;;;;;;;;';
-                           ;.;;;:...,;;...............` ,    .....;        ;''; :''';;;,.';;;;;;;;';
-                           ;;;;....,;;..............,,    , `.:...;        .'';  ;'';;;.,';;;;;,;;';
-                          `;;,.....;,................,    `    ..,:`       .'';  ;'';;;.,;;;;;;; ;;;
-                          .;..........................,:`  ,  ....:`       :'';  :'';;;.,:;;;;;; `;;
-                          ,............................,',,;.,....,`       ;';   ;'';;;.,:;;;;;;  ;;
-                          ,............................,'.,:,;....:`      .;;:   ;'';;;.,:;;;;;:  `;
-                          ,............................,',,,,:...,;       ;;,   .''';;;,,:;;;;;.   ;
-                          .,....................,;,.....';'',:....;      ;;.    ;''';;;,,:;;;;;`   ;
-                           :......................;.....;'::,,...,:     .;      ;'';;;;,,,;;;;;,   ,
-                :;;.       ;......................::....,:.,,,..,:`             ;'';;;;,,,;;;;;;
-                ;,,;;;:::;;,;.,....................;,......,,,...;              ;'';;;;,,,;;;;;;
-                ;,,,,,,,,,,,:,:,....................;,.....,:,....;`           .''';;;;.,,;;;;;;
-               `:,,,,,,,,,,,,;:......,............,;:;......:......;;.         ,''';;;;.,,;;;;;;
-               :,,,,,,,,,,,,,,;......'.........,;; ;,:;,....,........:;;:`     :''';;;;.,,;;;;;;
-               ;,,,,,,,,,,,,,,;......;,....,,;;,    ;,,;;,..............,;,    ;''';;;;,,,;;;;;:
-               ;,,,,,,,,,,,,,,:.....,:,::::,`        ;,,,:;,..............;`   ;''';;;:,,,;;;;;.
-              .:,,,,,:,:;;;;;;,......,`               ;:,,,:;;,...........,;   ;''';;::,,:;;;;;
-              ;,,,,,,::`     ;.......,,                ,;,,,,,;;,..........:;  ;''';;;,,,:;;;;;
-              ;,,,,,,:`      ;.......,:                  ;:,,,,,;;,.........;  ;''';;:.,,;;;;;,
-              ;,,,,,,,:      :........:                   .;,,,,,,;.........,; ;''';;;.,,;;;;;
-             ,:,,,,,,,;     ,,........;                    ::,,,,,,;.........; ;'''':;.,,';;;;
-             ;,,,,,,,,:`    ;.........;                     ;,,,,,,:,........:;,;''':;.,,';;;:
-             ;,,,,,,,,,;    ;.........:                     ;,,,,,,,;.........; ;''';;.,,';;;,
-             ;,,,,,,,,,;`   ,.........:                     ;,,,,,,,:;........;.,'''';,,,';;;.
-             ;,,,,,,,,,,;  ..........,,                     :,,,,,,,,;........,; ;'''.;,,;;;;,
-             ;,,,,,,,,,,;, ;.........,.                     :,,,,,,,,;.........;` ;'';`;,,;;;:
-            `:,,,,,,,,,,,; :.........,`                     :,,,,,,,,;,........:; ,;'; ,:.'';;
-            `:,,,,,,,,,,,;;,.........:                      ;,,,,,,,,::.........;  :;;  ::';;;
-            `:,,,,,,,,,,,,;.........,;                      ;,,,,,,,,:;,........;:  :':  ::;;;`
-             :,,,,,,,,,,,,:,.........;                      ;,,,,,,,,:;.........,;   :;   ,;;;;
-             ;,,,,,,,,,,,;...........;                     `:,,,,,,,,:;..........;.   ,;   ,;;;
-             ;,,,,,,,,,,,:,..........;                     :,,,,,,,,,;;..........:;    ,:   ,;;;
-             :,,,,,,,,,,;...........,.                     ;,,,,,,,,,;;..........,;     `:   ,;;
-              ;,,,,,,,,,,...........:`                     ;,,,,,,,,,;;...........;           :;,
-              ;,,,,,,,,;............;                     .;,,,,,,,,,;;...........;.           ;:
-              `:,,,,,,:.............;                     ;,,,,,,,,,,:;..........,::           .,
-               ;,,,,,;:............,:                     ;,,,,,,,,,,,;...........::            `
-                ;,,;;:.............:`                     ;,,,,,,,,,,`;...........,;
-                 :,  :.............;                     ,,,,,,,,,,,: ;,..........,;
-                    ;..............;                     ;,,,,,,,,,,:,:............;
-                   .:.............,`                    `;,,,,,,,,,,;;,............;`
-                   ;..............;                     ;,,,,,,,,,,,.;............,:`
-                  :,..............,                    `;,,,,:::::;;`;........,...:;
-                  :..............:                     ,,,,,..``     :...,,,::;;;;.
-                 ;;;::::::::::;;;;                                   ,;;:`
-
-           .     t#,     L.                       .,
-          ;W    ;##W.    EW:        ,ft t        ,Wt
-         f#E   :#L:WE    E##;       t#E Ej      i#D.
-       .E#f   .KG  ,#D   E###t      t#E E#,    f#f
-      iWW;    EE    ;#f  E#fE#f     t#E E#t  .D#i
-     L##Lffi f#.     t#i E#t D#G    t#E E#t :KW,     .......
-    tLLG##L  :#G     GK  E#t  f#E.  t#E E#t t#f      GEEEEEEf.
-      ,W#i    ;#L   LW.  E#t   t#K: t#E E#t  ;#G
-     j#E.      t#f f#:   E#t    ;#W,t#E E#t   :KE.
-   .D#j         f#D#;    E#t     :K#D#E E#t    .DW:
-  ,WK,           G#t     E#t      .E##E E#t      L#,
-  EG.             t      ..         G#E E#t       jt
-  ,                                  fE ,;.
-                                      ,
-                             L.                          t#,         t#,
-j.                       t   EW:        ,ft .           ;##W.       ;##W.
-EW,                   .. Ej  E##;       t#E Ef.        :#L:WE      :#L:WE             ..       :
-E##j                 ;W, E#, E###t      t#E E#Wi      .KG  ,#D    .KG  ,#D           ,W,     .Et
-E###D.              j##, E#t E#fE#f     t#E E#K#D:    EE    ;#f   EE    ;#f         t##,    ,W#t
-E#jG#W;            G###, E#t E#t D#G    t#E E#t,E#f. f#.     t#i f#.     t#i       L###,   j###t
-E#t t##f         :E####, E#t E#t  f#E.  t#E E#WEE##Wt:#G     GK  :#G     GK      .E#j##,  G#fE#t
-E#t  :K#E:      ;W#DG##, E#t E#t   t#K: t#E E##Ei;;;;.;#L   LW.   ;#L   LW.     ;WW; ##,:K#i E#t
-E#KDDDD###i    j###DW##, E#t E#t    ;#W,t#E E#DWWt     t#f f#:     t#f f#:     j#E.  ##f#W,  E#t
-E#f,t#Wi,,,   G##i,,G##, E#t E#t     :K#D#E E#t f#K;    f#D#;       f#D#;    .D#L    ###K:   E#t
-E#t  ;#W:   :K#K:   L##, E#t E#t      .E##E E#Dfff##E,   G#t         G#t    :K#t     ##D.    E#t
-DWi   ,KK: ;##D.    L##, E#t ..         G#E jLLLLLLLLL;   t           t     ...      #G      ..
-           ,,,      .,,  ,;.             fE                                          j
-                                          ,
-EOH
-    end
-  end
-
-  file "/srv/piab/dev_users_created" do
-    content "Canned dev users and organization created successfully at #{Time.now}"
-    action :create
-  end
-end

data/files/create_users/knife.rb.erb

@@ -1,15 +0,0 @@
-# Authors
-# Seth Chisamore
-# Mark Mzyk
-
-current_dir = File.dirname(__FILE__)
-log_level :info
-log_location STDOUT
-node_name "<%= @username %>"
-client_key "#{current_dir}/<%= @username %>.pem"
-validation_client_name "<%= @orgname %>-validator"
-validation_key "#{current_dir}/../../<%= @orgname %>-validator.pem"
-chef_server_url "https://<%= @server_fqdn %>/organizations/<%= @orgname %>"
-cache_type 'BasicFile'
-cache_options( :path => "#{ENV['HOME']}/.chef/checksums" )
-cookbook_path ["#{current_dir}/../cookbooks"]