gogetit 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba25e354af7e871467815ee7ee211978b13fd2b1
-  data.tar.gz: 1056a526be418a64b7f4f08ee42c6195e1b16372
+  metadata.gz: 50839ba142f697a535889fdeb14730b24b257a57
+  data.tar.gz: be5d2bb3ed08a08174858af92a4914994f380b31
 SHA512:
-  metadata.gz: 6740ad1b301616c777da614f28c54da58b1c1f6885bc66c13cf79055c6fddaac80c15ea8e3583ba2524b68508b357a736380a2189af4c1f26652e06723cc0e4b
-  data.tar.gz: af8648d442cf64042c3c358573a7ba5390a509a65bc1abe339abc7c783b5056958123e2df4c190456a09f277184c5c78673b8cc3a0c8e850d71d931227c11066
+  metadata.gz: 07293a16bcc9666c3953122344de58ffd930dc9358f3bb4edcba474b3d5e075d8c5568c8ba8f99ef0c17cd04e5603f30f5beddfc72ce07909778d286ff61549f
+  data.tar.gz: 014c4ebd0557c194db8cc6368f727c3009554e750843125ffa1c7a39bec56ae79f4bab3191cde2b490fe51ec19bad9aa10675705c487c4800e7d4fc1d77da0ee

data/README.md

@@ -60,7 +60,9 @@ gogetit create kvm01 -p libvirt -i 192.168.10.10 10.0.0.2
 # gogetit create kvm01 -p bare
 
 gogetit destroy lxd01
-gogetit rebuild kvm01
+
+# This feature is broken and might be deprecated in the future.
+# gogetit rebuild kvm01
 
 # to create a container bootstrapping as a chef node
 gogetit create chef01 --chef

data/lib/gogetit/cli.rb

@@ -16,7 +16,7 @@ module Gogetit
       system("virsh -c #{Gogetit.config[:libvirt][:url]} list --all")
     end
 
-    desc 'create (TYPE) NAME', 'Create either a container or KVM domain.'
+    desc 'create NAME', 'Create either a container or KVM domain.'
     method_option :provider, :aliases => '-p', :type => :string, \
       :default => 'lxd', :desc => 'A provider such as lxd and libvirt'
     method_option :chef, :aliases => '-c', :type => :boolean, \
@@ -41,7 +41,7 @@ module Gogetit
 
       # post-tasks
       if options[:chef]
-        knife_bootstrap(name, type, Gogetit.config, Gogetit.logger)
+        knife_bootstrap(name, options[:provider], Gogetit.config, Gogetit.logger)
         update_vault(Gogetit.config, Gogetit.logger)
       end
       Gogetit.config[:default][:user] ||= ENV['USER']
@@ -51,9 +51,10 @@ module Gogetit
     desc 'destroy NAME', 'Destroy either a container or KVM domain.'
     method_option :chef, :type => :boolean, :desc => "Enable chef awareness."
     def destroy(name)
-      type = Gogetit.get_provider_of(name)
-      if type
-        case type
+      # Let Gogetit recognize the provider.
+      provider = Gogetit.get_provider_of(name)
+      if provider
+        case provider
         when 'lxd'
           Gogetit.lxd.destroy(name)
         when 'libvirt'
@@ -69,10 +70,11 @@ module Gogetit
       end
     end
 
-    desc 'rebuild NAME', 'Destroy and create either a container or KVM domain again.'
-    def rebuild(type=nil, name)
-      invoke :destroy, [name]
-      invoke :create, [type, name]
-    end
+    # This feature is broken and might be deprecated in the future.
+    # desc 'rebuild NAME', 'Destroy and create either a container or KVM domain again.'
+    # def rebuild(type=nil, name)
+    #   invoke :destroy, [name]
+    #   invoke :create, [type, name]
+    # end
   end
 end

data/lib/gogetit/util.rb

@@ -4,12 +4,12 @@ require 'active_support/core_ext/hash'
 
 module Gogetit
   module Util
-    def knife_bootstrap(name, type, config, logger)
+    def knife_bootstrap(name, provider, config, logger)
       logger.info("Calling <#{__method__.to_s}>")
       if find_executable 'knife'
         if system('knife ssl check')
           install_cmd = "curl \
-          -l #{config[:chef][:bootstrap][:install_script][type.to_sym]} \
+          -l #{config[:chef][:bootstrap][:install_script][provider.to_sym]} \
           | sudo bash -s --"
           knife_cmd = "knife bootstrap -y #{name} \
           --node-name #{name} \
@@ -26,12 +26,16 @@ module Gogetit
     def update_vault(config, logger)
       logger.info("Calling <#{__method__.to_s}>")
       # It assumes the data_bags directory is under the root directory of Chef Repo
+      vaults = `knife vault list`.split
       data_bags_dir = "#{config[:chef][:chef_repo_root]}/data_bags"
       (Dir.entries("#{data_bags_dir}") - ['.', '..']).each do |bag|
-        (Dir.entries("#{data_bags_dir}/#{bag}").select do |f|
-            /^((?!keys).)*\.json/.match(f)
+        (
+          (Dir.entries("#{data_bags_dir}/#{bag}") - ['.', '..']).select do |f|
+            # it will only take the bags created by vault command.
+            /^.*_keys.json/.match(f)
           end
         ).each do |item|
+          item.slice! '_keys'
           puts 'Refreshing vaults..'
           refresh_cmd = "knife vault refresh #{bag} #{item.gsub('.json', '')} --clean-unknown-clients"
           puts refresh_cmd

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -216,7 +216,7 @@ files:
 - lib/providers/libvirt.rb
 - lib/providers/lxd.rb
 - lib/sample_conf/gogetit.yml
-- lib/sample_conf/lxd_profile.yaml
+- lib/sample_conf/lxd_profile.yml
 - lib/template/disk.xml
 - lib/template/domain.xml
 - lib/template/nic.xml