gogetit 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50839ba142f697a535889fdeb14730b24b257a57
-  data.tar.gz: be5d2bb3ed08a08174858af92a4914994f380b31
+  metadata.gz: eece96e8731a88531e7acb63f44b960d4a674cd9
+  data.tar.gz: 69eda3942e9e7ed98edb508fe2c42894aa206b07
 SHA512:
-  metadata.gz: 07293a16bcc9666c3953122344de58ffd930dc9358f3bb4edcba474b3d5e075d8c5568c8ba8f99ef0c17cd04e5603f30f5beddfc72ce07909778d286ff61549f
-  data.tar.gz: 014c4ebd0557c194db8cc6368f727c3009554e750843125ffa1c7a39bec56ae79f4bab3191cde2b490fe51ec19bad9aa10675705c487c4800e7d4fc1d77da0ee
+  metadata.gz: a24f807fd2271e9c7336cfbb187d5cb7a30d00b3fa3091a2bf43f8988844b575a34a20e1b30d785974253bbab747259cd26ed6357c21f389183bc231f654084b
+  data.tar.gz: 724ba1bceefcf866b18d18665eab1e39997920ffd8fd79a6e1d416376432e8a8def9b082f91734689652581c4051966ce63a069681bab4f5eceffbe3738f07f9

data/README.md

@@ -79,13 +79,17 @@ gogetit destroy chef01 --chef
 ```ruby
 require 'gogetit'
 ```
+## To make Gogetit recognize data bag that needs to be encrypted by Vault
+- Fill this out!
 
-## TODO
-- Provisioning LXD with useful cloud-init user-data.
-- Deploying bare metal machine from machine pool.
-- Static IP auto-assignment with VLAN info.
+## To develop
+- Deploying bare metal machine from machine pool
+- Static IP auto-assignment with VLAN info
 - Working with Multiple LXD and Libvirt hosts
 
+## To document
+- How to make Gogetit recognize vault data bag items
+
 ## Development and Contributing
 Clone and then execute followings:
 

data/gogetit.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   #spec.add_runtime_dependency 'etcd-rb', '~> 1.1.0'
   spec.add_runtime_dependency 'json', '~> 2.1.0'
   spec.add_runtime_dependency 'hyperkit', '~> 1.1.0'
-  spec.add_runtime_dependency 'maas-client', '~> 0.2.1'
+  spec.add_runtime_dependency 'maas-client'
   spec.add_runtime_dependency 'ruby-libvirt', '~> 0.7.0'
   spec.add_runtime_dependency 'oga', '~> 2.10'
   spec.add_runtime_dependency 'net-ssh', '~> 4.1.0'

data/lib/gogetit/cli.rb

@@ -42,7 +42,7 @@ module Gogetit
       # post-tasks
       if options[:chef]
         knife_bootstrap(name, options[:provider], Gogetit.config, Gogetit.logger)
-        update_vault(Gogetit.config, Gogetit.logger)
+        update_databags(Gogetit.config, Gogetit.logger)
       end
       Gogetit.config[:default][:user] ||= ENV['USER']
       puts "ssh #{Gogetit.config[:default][:user]}@#{name}"
@@ -66,7 +66,7 @@ module Gogetit
       # post-tasks
       if options[:chef]
         knife_remove(name, Gogetit.logger) if options[:chef]
-        update_vault(Gogetit.config, Gogetit.logger)
+        update_databags(Gogetit.config, Gogetit.logger)
       end
     end
 

data/lib/gogetit/util.rb

@@ -1,11 +1,18 @@
 require 'mkmf'
 require 'net/ssh'
 require 'active_support/core_ext/hash'
+require 'json'
 
 module Gogetit
   module Util
+    def run_command(cmd, logger)
+      logger.info("Calling <#{__method__.to_s}> to run #{cmd}")
+      system(cmd)
+    end
+
     def knife_bootstrap(name, provider, config, logger)
       logger.info("Calling <#{__method__.to_s}>")
+      config[:chef][:target_environment] ||= '_default'
       if find_executable 'knife'
         if system('knife ssl check')
           install_cmd = "curl \
@@ -15,6 +22,7 @@ module Gogetit
           --node-name #{name} \
           --ssh-user ubuntu \
           --sudo \
+          --environment #{config[:chef][:target_environment]} \
           --bootstrap-install-command \"#{install_cmd}\"".gsub(/ * /, ' ')
           puts 'Bootstrapping..'
           puts knife_cmd
@@ -23,28 +31,64 @@ module Gogetit
       end
     end
 
-    def update_vault(config, logger)
+    def update_databags(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|
-            # it will only take the bags created by vault command.
-            /^.*_keys.json/.match(f)
+
+      puts 'Listing databags..'
+      databags_as_is = `knife data bag list`.split
+      databags_to_be = Dir.entries(data_bags_dir) - ['.', '..']
+
+      puts 'Checking databags to delete..'
+      (databags_as_is - databags_to_be).each do |bag|
+        puts "Deleting databag '#{bag}'.."
+          answer = ask(
+            'Do you really want to delete this?',
+            :echo => true,
+            :limited_to => ['y', 'n']
+          )
+          case answer
+          when 'y'
+            run_command("knife data bag delete -y #{bag}", logger)
+          when 'n'
+            puts 'Keeping..'
+          end
+      end
+
+      puts 'Checking databags to create..'
+      (databags_to_be - databags_as_is).each do |bag|
+        puts "Creating databag '#{bag}'.."
+        run_command("knife data bag create #{bag}", logger)
+      end
+
+      puts 'Checking items..'
+      databags_to_be.each do |bag|
+        items_as_is = `knife data bag show #{bag}`.split
+        Dir.entries(data_bags_dir+'/'+bag).select do |file|
+          /^.*\.json/.match(file)
+        end.each do |item|
+          item_file = data_bags_dir+'/'+bag+'/'+item
+          item = item.gsub('.json', '')
+          if JSON.parse(File.read(item_file))['vault']
+            if items_as_is.include? item
+              run_command(
+                "knife vault update #{bag} #{item} --json #{item_file} --search '*:*' -M client",
+                logger
+              )
+            else
+              run_command(
+                "knife vault create #{bag} #{item} --json #{item_file} --search '*:*' -M client",
+                logger
+              )
+            end
+            run_command(
+              "knife vault refresh #{bag} #{item} --clean-unknown-clients -M client",
+              logger
+            )
+          else
+            run_command("knife data bag from file #{bag} #{item_file}", logger)
           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
-          system(refresh_cmd)
         end
-        puts 'Updating data bags..'
-        update_cmd = "knife data bag from file #{bag} #{data_bags_dir}/#{bag}"
-        puts update_cmd
-        system(update_cmd)
       end
     end
 

data/lib/gogetit/version.rb

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

data/lib/providers/lxd.rb

@@ -169,16 +169,16 @@ module Gogetit
         args[:config][:'user.user-data']['ssh_authorized_keys'].push(key['key'])
       end
 
+      # To disable to update apt database on first boot
+      # so chef client can keep doing its job.
+      args[:config][:'user.user-data']['package_update'] = false
+
       pkg_repos.each do |repo|
         if repo['name'] == 'main_archive'
           args[:config][:'user.user-data']['apt_mirror'] = repo['url']
         end
       end
 
-      # To disable to update apt database on first boot
-      # so chef client can keep doing its job.
-      args[:config][:'user.user-data']['package_update'] = false
-
       args[:config][:"user.user-data"] = \
         YAML.dump(args[:config][:"user.user-data"])[4..-1]
 

data/lib/sample_conf/gogetit.yml

@@ -42,6 +42,7 @@ libvirt:
 # about Chef
 chef:
   chef_repo_root: /SOMEWHERE/CHEF_REPO
+  target_environment: THE_ENV_YOU_ARE_TARGETING
   bootstrap:
     install_script: 
       libvirt: http://chef.example.com/install_chef_script.sh

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,16 +112,16 @@ dependencies:
   name: maas-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-libvirt
   requirement: !ruby/object:Gem::Requirement