corl 0.5.11 → 0.5.12

data/lib/nucleon/action/node/identity.rb

@@ -3,64 +3,110 @@ module Nucleon
 module Action
 module Node
 class Identity < Nucleon.plugin_class(:nucleon, :cloud_action)
- 
+
   #-----------------------------------------------------------------------------
   # Info
-  
+
   def self.describe
     super(:node, :identity, 700)
   end
- 
+
   #-----------------------------------------------------------------------------
   # Settings
-  
+
   def configure
     super do
-      codes :identity_upload_failure
-      
-      register_str :name
+      codes :identity_required, :identity_upload_failure
+
+      register_str :name, nil
       register_project :identity
-      register_nodes :identity_nodes      
+      register_nodes :identity_nodes
+
+      register_bool :delete, false
     end
   end
-  
+
   #---
-  
+
   def ignore
     [ :nodes ]
   end
-  
+
   def arguments
     [ :name, :identity_nodes ]
   end
 
   #-----------------------------------------------------------------------------
   # Operations
-   
+
   def execute
     super do |local_node|
       ensure_network do
-        builder = network.identity_builder({ settings[:name] => settings[:identity] })
-        
-        if builder.build(local_node)
+        if settings[:identity]
+          # Get identity builder
+          builder = network.identity_builder({ settings[:name] => settings[:identity] })
+        else
+          # Search for identity
+          builder            = network.identity_builder
           identity_directory = File.join(builder.build_directory, settings[:name])
-          
+
+          if File.directory?(identity_directory)
+            identity_nucleon_file = File.join(identity_directory, '.nucleon')
+
+            if File.exists?(identity_nucleon_file)
+              json_data           = Util::Disk.read(identity_nucleon_file)
+              project_info        = symbol_map(Util::Data.parse_json(json_data))
+              settings[:identity] = "#{project_info[:provider]}:::#{project_info[:edit]}[#{project_info[:revision]}]"
+            end
+          end
+
+          if settings[:identity]
+            # Get identity builder
+            info('using_identity', { :identity => settings[:identity], :directory => identity_directory })
+            builder = network.identity_builder({ settings[:name] => settings[:identity] })
+          else
+            warn('identity_required')
+            myself.status = code.identity_required
+          end
+        end
+
+        # Build identity into local network project
+        if myself.status == code.success && ( settings[:delete] || builder.build(local_node) )
+          identity_directory = File.join(builder.build_directory, settings[:name])
+
+          # Loop over all nodes to assign identity to (or delete)
           success = network.batch(settings[:identity_nodes], settings[:node_provider], settings[:parallel]) do |node|
-            info('start', { :provider => node.plugin_provider, :name => node.plugin_name })
-            
-            remote_network_directory  = node.lookup(:corl_network)
-            
-            remote_config_directory        = File.join(remote_network_directory, network.config_directory.sub(/#{network.directory}#{File::SEPARATOR}/, ''))            
+            if settings[:delete]
+              info('start_delete', { :provider => node.plugin_provider, :name => node.plugin_name })
+            else
+              info('start_add', { :provider => node.plugin_provider, :name => node.plugin_name })
+            end
+
+            # Lookup remote network path
+            success                        = true
+            remote_network_directory       = node.lookup(:corl_network)
+            remote_config_directory        = File.join(remote_network_directory, network.config_directory.sub(/#{network.directory}#{File::SEPARATOR}/, ''))
             remote_identity_base_directory = File.join(remote_network_directory, builder.build_directory.sub(/#{network.directory}#{File::SEPARATOR}/, ''))
             remote_identity_directory      = File.join(remote_identity_base_directory, settings[:name])
-            
-            node.cli.mkdir('-p', remote_identity_base_directory)
-            node.cli.rm('-Rf', remote_identity_directory)
-            
-            if success = node.send_files(identity_directory, remote_identity_directory, nil, '0700')
-              dbg('we were successful!')   
-            end        
-            success        
+
+            # Ensure proper remote directories are ready for identity
+            result  = node.cli.mkdir('-p', remote_identity_base_directory)
+            success = false unless result.status == code.success
+
+            if success
+              result  = node.cli.rm('-Rf', remote_identity_directory)
+              success = false unless result.status == code.success
+
+              # Send identity through SCP to remote machine
+              success = node.send_files(identity_directory, remote_identity_directory, nil, '0700') if success && ! settings[:delete]
+            end
+            success
+          end
+
+          if success && settings[:delete]
+            # Remove local identity last
+            info('local_delete', { :directory => identity_directory })
+            FileUtils.rm_rf(identity_directory)
           end
         end
         myself.status = code.batch_error unless success

data/lib/nucleon/action/node/keypair.rb

@@ -3,79 +3,81 @@ module Nucleon
 module Action
 module Node
 class Keypair < Nucleon.plugin_class(:nucleon, :cloud_action)
-  
+
   include Mixin::Action::Keypair
-  
+
   #-----------------------------------------------------------------------------
   # Info
-  
+
   def self.describe
     super(:node, :keypair, 545)
   end
- 
+
   #----------------------------------------------------------------------------
   # Settings
-  
+
   def configure
     super do
       codes :key_failure
-      
+
       register :json, :bool, true
       register :both, :bool, false
       keypair_config
     end
   end
-  
+
   #---
-  
+
   def ignore
     node_ignore
   end
-  
+
   #-----------------------------------------------------------------------------
   # Operations
- 
+
   def execute
     super do |node|
       if keys = keypair
         ui.info("\n", { :prefix => false })
-        ui_group(Util::Console.cyan("#{keys.type.upcase} SSH keypair")) do |ui|          
-          render_json = lambda do 
+        ui_group(Util::Console.cyan("#{keys.type.upcase} SSH keypair")) do |ui|
+          render_json = lambda do
             private_key = Util::Console.blue(Util::Data.to_json(keys.encrypted_key, true))
-            ssh_key     = keys.ssh_key.gsub(/^ssh\-[a-z]+\s+/, '')           
+            ssh_key     = keys.ssh_key.gsub(/^ssh\-[a-z]+\s+/, '')
             ssh_key     = Util::Console.green(Util::Data.to_json(ssh_key, true))
-            
+
             ui.info("-----------------------------------------------------")
             ui.info(yellow("SSH JSON string"))
-            ui.info("SSH private key:\n#{private_key}")
-            ui.info("SSH public key:\n#{ssh_key}")
-            ui.info("\n", { :prefix => false })  
+            ui.info("\n", { :prefix => false })
+            ui.info("SSH private key:\n#{private_key}", { :prefix => false })
+            ui.info("SSH public key:\n#{ssh_key}", { :prefix => false })
+            ui.info("\n", { :prefix => false })
           end
-          
+
           render_file = lambda do
             private_key = Util::Console.blue(keys.encrypted_key)
             ssh_key     = Util::Console.green(keys.ssh_key)
-            
+
             ui.info("-----------------------------------------------------")
             ui.info(yellow("SSH file rendering"))
-            ui.info("SSH private key:\n#{private_key}")
-            ui.info("SSH public key:\n#{ssh_key}")
-            ui.info("\n", { :prefix => false })  
+            ui.info("\n", { :prefix => false })
+            ui.info("SSH private key:\n#{private_key}", { :prefix => false })
+            ui.info("SSH public key:\n#{ssh_key}", { :prefix => false })
+            ui.info("\n", { :prefix => false })
           end
-        
+
           if settings[:both]
             render_json.call
-            render_file.call  
+            render_file.call
           else
             if settings[:json]
               render_json.call
             else
-              render_file.call      
+              render_file.call
             end
           end
-        end          
+        end
       else
-        myself.status = code.key_failure  
+        myself.status = code.key_failure
       end
     end
   end

data/lib/nucleon/action/node/revoke.rb

@@ -3,51 +3,51 @@ module Nucleon
 module Action
 module Node
 class Revoke < Nucleon.plugin_class(:nucleon, :cloud_action)
-  
+
   #-----------------------------------------------------------------------------
   # Info
-  
+
   def self.describe
     super(:node, :revoke, 550)
   end
- 
+
   #-----------------------------------------------------------------------------
   # Settings
-  
+
   def configure
     super do
       codes :key_remove_failure
-      
+
       register :public_key, :str, nil
     end
   end
-  
+
   #---
-  
+
   def arguments
     [ :public_key ]
   end
 
   #-----------------------------------------------------------------------------
   # Operations
-   
+
   def execute
     super do |node|
       info('corl.actions.revoke.start')
-      
+
       ensure_node(node) do
         ssh_path        = Util::SSH.key_path
-        authorized_keys = File.join(ssh_path, 'authorized_keys')        
+        authorized_keys = File.join(ssh_path, 'authorized_keys')
         public_key      = settings[:public_key].strip
         output_keys     = []
-                
+
         if File.exists?(authorized_keys)
           Util::Disk.read(authorized_keys).split("\n").each do |line|
             if line.strip.include?(public_key)
               key_found = true
             else
-              output_keys << public_key
-            end            
+              output_keys << line
+            end
           end
         end
         unless key_found

data/locales/en.yml

@@ -121,7 +121,7 @@ en:
           success:
             saved: |-
               Plugin successfully saved to %{file}
-      cloud:
+      network:
         create:
           description: |-
             Create a new network project
@@ -159,7 +159,7 @@ en:
           help: |-
             Inspect any defined network configuration.  It is not intended to access or
             set the node configurations defined in the config directory, which you can use the `node lookup` and
-            `cloud config` actions.
+            `network config` actions.
 
             Nested configurations can be accessed by specifying the nested keys in sequence in the arguments.
 
@@ -537,6 +537,19 @@ en:
               Reinitializing network
             updating: |-
               Updating node network configurations
+        identity:
+          warn:
+            identity_required: |-
+              Identity option `--identity` required or identity needs to exist locally when adding identities to the network
+          info:
+            using_identity: |-
+              Using local identity %{identity} at %{directory}
+            start_add: |-
+              Setting identity on %{provider} machine %{name}
+            start_delete: |-
+              Removing identity from %{provider} machine %{name}
+            local_delete: |-
+              Removing the local identity from %{directory}
         build:
           description: |-
             Build projects into the network project or global filesystem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nucleon
@@ -266,15 +266,15 @@ files:
 - lib/facter/custom_facts.rb
 - lib/facter/vagrant_exists.rb
 - lib/hiera/corl_logger.rb
-- lib/nucleon/action/cloud/config.rb
-- lib/nucleon/action/cloud/create.rb
-- lib/nucleon/action/cloud/images.rb
-- lib/nucleon/action/cloud/inspect.rb
-- lib/nucleon/action/cloud/machines.rb
-- lib/nucleon/action/cloud/regions.rb
-- lib/nucleon/action/cloud/remote.rb
-- lib/nucleon/action/cloud/settings.rb
-- lib/nucleon/action/cloud/vagrantfile.rb
+- lib/nucleon/action/network/config.rb
+- lib/nucleon/action/network/create.rb
+- lib/nucleon/action/network/images.rb
+- lib/nucleon/action/network/inspect.rb
+- lib/nucleon/action/network/machines.rb
+- lib/nucleon/action/network/regions.rb
+- lib/nucleon/action/network/remote.rb
+- lib/nucleon/action/network/settings.rb
+- lib/nucleon/action/network/vagrantfile.rb
 - lib/nucleon/action/node/IP.rb
 - lib/nucleon/action/node/SSH.rb
 - lib/nucleon/action/node/authorize.rb