knife-clc-chef-server 0.1.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aee3d53c78370e8cb2150027a3d44d1f2f787ef4
-  data.tar.gz: e02688ed11531f156a514bf10113b347ffc07703
+  metadata.gz: f4e86c5562cbe1bdfd540be428333864df3b5a2e
+  data.tar.gz: 6b4ce1e3a07ad2a9c0cb1b294d26aab73f37ae1b
 SHA512:
-  metadata.gz: f017c671d5583ef34430513c164b18bfd9383ec31faf0a52b1065d424fad306c8f0a17f9fa88bddc5bbebb29dfca679c635fb411a2575da4eb1b1f38d9474849
-  data.tar.gz: 0420051c279b1601fbf32176d49095aeae74fbc1ebc9f516bd869b0395817b09b5814d44a2f97348b3ad8e716b2f2521b5fbaae447eaf22e066ca448d2730831
+  metadata.gz: a6972cc8d5a608ab0fb7d01efca456975cda0f273901f142dccf663a41c426e5958d32f9c3729e5dd646417ef181f48ad9602437394565d724cb96f480e2e25d
+  data.tar.gz: 0649cdd39f962c8034a84c5646972016661d48c0f7194d83b26bca928b546af6c19ead52315816a6a7e0f29bad4ea1d88ab525d782463d60b1ce47f451ff6f6d

data/Rakefile

@@ -1,10 +1,2 @@
 require "bundler/gem_tasks"
 
-module Bundler
-  class GemHelper
-    def rubygem_push(path)
-      gems = Dir.glob(File.join(File.dirname(__FILE__), 'pkg', 'knife-clc-chef-server-*.gem'))
-      system("gem push '#{gems[0]}' --host http://172.22.10.137:8081/artifactory/api/gems/localgems -k clc_api_key")
-    end
-  end
-end

data/lib/chef/knife/{client_run.rb → provision.rb}

@@ -2,9 +2,9 @@ require 'chef/knife'
 require 'clc_chef_server'
 
 module KnifeClcServer
-  class ClientRun < Chef::Knife
+  class Provision < Chef::Knife
 
-    banner "knife client run ENVIRONMENT"
+    banner "knife provision CLUSTERS -E ENVIRONMENT"
 
       option :node,
         :short => "-n NODE",
@@ -12,11 +12,6 @@ module KnifeClcServer
         :description => "chef node to run (QA3T3NPROVISIONER01 is the default)",
         :default => "QA3T3NPROVISIONER01"
 
-      option :clusters,
-        :short => "-C CLUSTERS",
-        :long => "--clusters CLUSTERS",
-        :description => "comma delimited list of clusters to provision (Defaults to all clusters)"
-
       option :ssh_user,
         :short => "-x SSH_USER",
         :long => "--ssh_user SSH_USER",
@@ -29,8 +24,19 @@ module KnifeClcServer
         :description => "ssh password used to login to node - defaults to 'Password123'",
         :default => "Password123"
 
+      option :no_converge,
+        :long => "--no_converge",
+        :description => "do not converge the node. Just create it.",
+        :default => false
+
     def run
       if @name_args.length < 1
+        show_usage
+        ui.error("You must specify one or more clusters to provision")
+        exit 1
+      end
+
+      if config[:environment].nil?
         show_usage
         ui.error("You must specify an environment to target")
         exit 1
@@ -39,7 +45,16 @@ module KnifeClcServer
       server_path = URI(Chef::Config[:chef_server_url]).path
       org = server_path[server_path.rindex('/')+1..-1]
 
-      ClcChefServer.client_run(org, config[:node], config[:clusters], @name_args[0], config[:ssh_user], config[:ssh_password])
+      ClcChefServer.client_run(
+        org,
+        config[:node],
+        @name_args[0], 
+        config[:environment], 
+        config[:ssh_user], 
+        config[:ssh_password], 
+        config[:no_converge] ? false : true,
+        ui
+      )
     end
   end
 end

data/lib/clc_chef_server.rb

@@ -4,12 +4,12 @@ require "clc_chef_server/version"
 
 module ClcChefServer
   class << self
-    TMP_DIR = '/tmp/clc_chef_server/cookbooks'
+    TMP_DIR = '/tmp/clc_chef_server'
 
     def create_sandbox(organization, ui = nil)
       repo = Chef::Config.find_chef_repo_path(Dir.pwd)
       chef_server = URI(Chef::Config[:chef_server_url]).host
-      Chef::Config[:cookbook_path] = TMP_DIR
+      Chef::Config[:cookbook_path] = File.join(TMP_DIR, "cookbooks")
 
       %w[clc_library chef_server chef-vault chef-client cron logrotate newrelic].each do |cb|
         download_cookbook(cb, ui)
@@ -30,26 +30,43 @@ module ClcChefServer
       shell(command)
     end
 
-    def client_run(organization, node, clusters, environment, ssh_user, ssh_password)
+    def client_run(organization, node, clusters, environment, ssh_user, ssh_password, converge, ui)
+      require 'chef/knife/ssh'
       repo = Chef::Config.find_chef_repo_path(Dir.pwd)
-      knife_path = "#{repo}/.chef/knife_#{organization}.rb"
-      puts "Searching chef server for node #{node}..."
-      out = `knife search 'name:#{node}' -c #{knife_path} -a metal.location.ipaddress`
+      ui.info "Searching chef server for node #{node}..."
+      out = `knife search 'name:#{node}' -a metal.location.ipaddress -c #{Chef::Config[:config_file]}`
       ip=out[/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/]
+      
+      if ip
+        ui.info ip
+      else
+        ui.error "Unable to find an ip."
+      end
+
       if system("ssh-keygen -F #{ip} -f ~/.ssh/known_hosts > /dev/null")
         system("ssh-keygen -f ~/.ssh/known_hosts -R #{ip} > /dev/null")
       end
 
       command =  <<-EOS
-        knife ssh "name:#{node}" "echo '{
+        echo "{ 
                 \\"provisioner\\": {
-                  \\"clusters\\": \\"#{clusters}\\"
+                \\"clusters\\": \\"#{clusters}\\",
+                \\"converge\\": #{converge}
                 }
-              }' | chef-client -E #{environment} \\
+              }" | chef-client -E #{environment} \\
                                -l info \\
-                               -j /dev/stdin" -x #{ssh_user} -P #{ssh_password} -c #{knife_path} --attribute metal.location.ipaddress
+                               -j /dev/stdin
       EOS
-      shell(command)
+
+      Chef::Knife::Ssh.load_deps
+      knife = Chef::Knife::Ssh.new
+      knife.config[:attribute] = 'ipaddress'
+      knife.config[:ssh_user] = ssh_user
+      knife.config[:ssh_password_ng] = ssh_password
+      knife.config[:config_file] = Chef::Config[:config_file]
+      knife.name_args = ["name:#{node}", command]
+
+      knife.run
     end
 
     private

data/lib/clc_chef_server/version.rb

@@ -1,3 +1,3 @@
 module ClcChefServer
-  VERSION = "0.1.0"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-clc-chef-server
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.2
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,7 +51,7 @@ files:
 - README.md
 - Rakefile
 - knife-clc-chef-server.gemspec
-- lib/chef/knife/client_run.rb
+- lib/chef/knife/provision.rb
 - lib/chef/knife/server_sandbox.rb
 - lib/clc_chef_server.rb
 - lib/clc_chef_server/version.rb