gogetit 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0069b408c8ca685e130a7e0d999dcada0260cd6d'
-  data.tar.gz: 823609fa164ac340398640d288ea7a186d398641
+  metadata.gz: 1f33677b64fb94c2039ff7aca0675ff5166a5d10
+  data.tar.gz: b1984bee721e53fc456cee41dffb5b404521d45f
 SHA512:
-  metadata.gz: 40df33d8170177b3404c0aba7eb180624dd4d4f9a61ec656b557cf40ce2b6c2666a05cc443066cdeaad4bf4a6e94dc001ddcc215f763016a9bf9a249cbcc1878
-  data.tar.gz: c7821587c326c9ff112efb1d3cccd6a56c0bfe17409df63b60ef8e87e599d73a6e1cc0c5b4fb891bd061574a7b2bd89f09fa05f593b438783efbbdaea02fa85c
+  metadata.gz: d7b7f4f94038df38b32ff160c966fa739c9f212bfb7d546112ed937f4c7266fbb2fdc1de89cbdc492ced11e8db364a2274331b56dc8b0ab7d1f12a384261f9a7
+  data.tar.gz: 054a08528c44b4aecab3b695d2f121df63718531a59b0a58e62cda617026b675a0e3b9a2454314f79a9c34251b4956bee8f5ac143cb68f08c94904cd67cb014d

data/README.md

@@ -60,8 +60,8 @@ gogetit create kvm01 -p libvirt
 gogetit create kvm01 -p libvirt -i 192.168.10.10 10.0.0.2
 
 # When specifying alias for LXD provider
-gogetit create kvm01 -a centos7
-gogetit create kvm01 -p lxd -a centos7
+gogetit create lxd01 -a centos7
+gogetit create lxd02 -p lxd -a centos7
 
 # When specifying distro for Libvirt provider
 gogetit create kvm01 -p libvirt -d centos
@@ -74,20 +74,18 @@ gogetit deploy kvm01 -d centos
 gogetit create lxd01 --no-maas -f lxd_without_maas.yml
 gogetit create lxd01 --no-maas -f lxd_without_maas_vlans.yml
 
-# to provision with a bare metal machine
-# gogetit create kvm01 -p bare
-
 gogetit destroy lxd01
 
 # This feature is broken and might be deprecated in the future.
 # gogetit rebuild kvm01
 
-# to create a container bootstrapping as a chef node
+# to create a container bootstrapping as server node
 gogetit create chef01 --chef
+gogetit destroy chef01 --chef
 
-or
-
-CHEF=true gogetit create chef01
+# to create a container bootstrapping as zero(local) node
+gogetit create chef01 --zero
+gogetit destroy chef01 --zero
 
 
 # to destroy a container deleting corresponding chef node and client

data/lib/gogetit/cli.rb

@@ -61,6 +61,8 @@ module Gogetit
       :desc => 'A distro name with its series for libvirt provider'
     method_option :chef, :aliases => '-c', :type => :boolean, \
       :default => false, :desc => 'Chef awareness'
+    method_option :zero, :aliases => '-z', :type => :boolean, \
+      :default => false, :desc => 'Chef Zero awareness'
     method_option :vlans, :aliases => '-v', :type => :array, \
       :desc => 'A list of VLAN IDs to connect to'
     method_option :ipaddresses, :aliases => '-i', :type => :array, \
@@ -73,6 +75,9 @@ module Gogetit
       abort("'vlans' and 'ipaddresses' can not be set together.") \
         if options['vlans'] and options['ipaddresses']
 
+      abort("'chef' and 'zero' can not be set together.") \
+        if options['chef'] and options['zero']
+
       abort("when 'no-maas', the network configuration have to be set by 'file'.") \
         if options['no-maas'] and (options['vlans'] or options['ipaddresses'])
 
@@ -96,14 +101,22 @@ module Gogetit
 
       # post-tasks
       if options['chef']
-        knife_bootstrap(name, options[:provider], config, logger)
-        update_databags(config, logger)
+        bootstrap_chef(name, options[:provider], config)
+        update_databags(config)
+      elsif options['zero']
+        knife_bootstrap_zero(name, options[:provider], config)
       end
     end
 
     desc 'destroy NAME', 'Destroy either a container or KVM instance.'
-    method_option :chef, :type => :boolean, :desc => "Enable chef awareness."
+    method_option :chef, :aliases => '-c', :type => :boolean, \
+      :default => false, :desc => 'Chef awareness'
+    method_option :zero, :aliases => '-z', :type => :boolean, \
+      :default => false, :desc => 'Chef Zero awareness'
     def destroy(name)
+      abort("'chef' and 'zero' can not be set together.") \
+        if options['chef'] and options['zero']
+
       provider = get_provider_of(name, providers)
       if provider
         case provider
@@ -117,8 +130,10 @@ module Gogetit
       end
       # post-tasks
       if options['chef']
-        knife_remove(name) if options[:chef]
+        knife_remove(name, options)
         update_databags(config)
+      elsif options['zero']
+        knife_remove(name, options)
       end
     end
 
@@ -127,25 +142,41 @@ module Gogetit
       :desc => 'A distro name with its series for libvirt provider'
     method_option :chef, :aliases => '-c', :type => :boolean, \
       :default => false, :desc => 'Chef awareness'
+    method_option :zero, :aliases => '-z', :type => :boolean, \
+      :default => false, :desc => 'Chef Zero awareness'
     def deploy(name)
+      abort("'chef' and 'zero' can not be set together.") \
+        if options['chef'] and options['zero']
+
       Gogetit::CLI.result = libvirt.deploy(name, options.to_hash)
 
       # post-tasks
       if options['chef']
-        knife_bootstrap(name, options[:provider], config, logger)
-        update_databags(config, logger)
+        knife_bootstrap(name, options[:provider], config)
+        update_databags(config)
+      elsif options['zero']
+        knife_bootstrap_zero(name, options[:provider], config)
       end
     end
 
     desc 'release NAME', 'Release a node in MAAS'
     method_option :chef, :type => :boolean, :desc => "Enable chef awareness."
+    method_option :chef, :aliases => '-c', :type => :boolean, \
+      :default => false, :desc => 'Chef awareness'
+    method_option :zero, :aliases => '-z', :type => :boolean, \
+      :default => false, :desc => 'Chef Zero awareness'
     def release(name)
+      abort("'chef' and 'zero' can not be set together.") \
+        if options['chef'] and options['zero']
+
       Gogetit::CLI.result = libvirt.release(name)
 
       # post-tasks
       if options['chef']
-        knife_remove(name) if options[:chef]
+        knife_remove(name, options)
         update_databags(config)
+      elsif options['zero']
+        knife_remove(name, options)
       end
     end
 
@@ -153,7 +184,12 @@ module Gogetit
     ' either a container or a node(machine) in MAAS again.'
     method_option :chef, :aliases => '-c', :type => :boolean, \
       :default => false, :desc => 'Chef awareness'
+    method_option :zero, :aliases => '-z', :type => :boolean, \
+      :default => false, :desc => 'Chef Zero awareness'
     def rebuild(name)
+      abort("'chef' and 'zero' can not be set together.") \
+        if options['chef'] and options['zero']
+
       provider = get_provider_of(name, providers)
       if provider
         case provider
@@ -177,8 +213,8 @@ module Gogetit
       end
       # post-tasks
       if options['chef']
-        knife_remove(name, logger) if options[:chef]
-        update_databags(config, logger)
+        knife_remove(name) if options[:chef]
+        update_databags(config)
       end
     end
   end

data/lib/gogetit/util.rb

@@ -65,7 +65,7 @@ module Gogetit
       end
     end
 
-    def knife_bootstrap(name, provider, config)
+    def knife_bootstrap_chef(name, provider, config)
       logger.info("Calling <#{__method__.to_s}>")
       config[:chef][:target_environment] ||= '_default'
       if find_executable 'knife'
@@ -79,13 +79,28 @@ module Gogetit
           --sudo \
           --environment #{config[:chef][:target_environment]} \
           --bootstrap-install-command \"#{install_cmd}\"".gsub(/ * /, ' ')
-          puts 'Bootstrapping..'
-          puts knife_cmd
+          puts 'Bootstrapping with chef-server..'
+          logger.info(knife_cmd)
           system(knife_cmd)
         end
       end
     end
 
+    def knife_bootstrap_zero(name, provider, config)
+      logger.info("Calling <#{__method__.to_s}>")
+      config[:chef][:target_environment] ||= '_default'
+      if find_executable 'knife'
+        knife_cmd = "knife zero bootstrap #{name} \
+        --node-name #{name} \
+        --ssh-user ubuntu \
+        --sudo \
+        --environment #{config[:chef][:target_environment]}".gsub(/ * /, ' ')
+        puts 'Bootstrapping with chef-zero..'
+        logger.info(knife_cmd)
+        system(knife_cmd)
+      end
+    end
+
     def update_databags(config)
       logger.info("Calling <#{__method__.to_s}>")
       data_bags_dir = "#{config[:chef][:chef_repo_root]}/data_bags"
@@ -146,13 +161,28 @@ module Gogetit
       end
     end
 
-    def knife_remove(name)
+    def knife_remove(name, options)
       logger.info("Calling <#{__method__.to_s}>")
       if find_executable 'knife'
-        if system('knife ssl check')
+        if options['chef']
+          if system('knife ssl check')
+            logger.info("With chef-server..")
+            puts "Deleting node #{name}.."
+            logger.info("knife node delete -y #{name}")
+            system("knife node delete -y #{name}")
+            puts "Deleting client #{name}.."
+            logger.info("knife client delete -y #{name}")
+            system("knife client delete -y #{name}")
+          else
+            abort('knife is not configured properly.')
+          end
+        elsif options['zero']
+          logger.info("With chef-zero..")
           puts "Deleting node #{name}.."
+          logger.info("knife node delete -y #{name}")
           system("knife node delete -y #{name}")
           puts "Deleting client #{name}.."
+          logger.info("knife client delete -y #{name}")
           system("knife client delete -y #{name}")
         end
       end

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler