hybrid_platforms_conductor 32.4.1 → 32.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e0dfe56d0297ba7c9c90dfbf4737cd6b4754b20a36f7dec0962d62a19b5bf2b
-  data.tar.gz: 3a0363efcb7dc771c9cf41911d3012fae0a764a465e4bd925f241a422d5f11b0
+  metadata.gz: 544df1af20b12202d76519a9ebb2a7ea824e676fca1d04af0b546baa759d97ae
+  data.tar.gz: 19aa74c8d6f634d1b8618ba5b701c2b4dfb4457db8f69b2db84a8f08563bc891
 SHA512:
-  metadata.gz: e1dae403085c924a043dfee0185b46478eff9c99fa1d69848f5e92b571e4dfb1dc62ab1f80792d3b1928323eecf72a8f0904317b17facf3b92b6a07b82381112
-  data.tar.gz: 6156b57048a690c5bc6e91ffd61a8276b84b2a2196206a8b77779ee25fe559aa4a4ec21bf741f015736cb3796b9bf4c33d9ec0203b4e4ff7c44a77c1d06fbe83
+  metadata.gz: c7aeb4324286b216d36b0b3f205af58dd3a92d1655d74d05275de1c911cf0137198dda7e3c23d226e0b0a5c0b127eeef4e79a22bc1f585d4058cb2f31abfc09f
+  data.tar.gz: 84493300be870ee61c7f154b92eee7b27cbcbcd8af7c7fe4cbeed0f853c982e00587aa6294230552a2526bd57e76716a7b8d157097ce33c254d6f2206a9c3fa9

data/lib/hybrid_platforms_conductor/hpc_plugins/connector/ssh.rb

@@ -10,6 +10,10 @@ module HybridPlatformsConductor
       # Connect to node using SSH
       class Ssh < HybridPlatformsConductor::Connector
 
+        # Exception raise when a node is not connectable using SSH
+        class NotConnectableError < RuntimeError
+        end
+
         module PlatformsDslSsh
 
           # Initialize the DSL
@@ -329,14 +333,18 @@ module HybridPlatformsConductor
           @nodes_handler.prefetch_metadata_of nodes, %i[private_ips hostname host_ip description]
           nodes.sort.each do |node|
             # Generate the conf for the node
-            connection, gateway, gateway_user = connection_info_for(node)
-            config_content << "# #{node} - #{connection} - #{@nodes_handler.get_description_of(node) || ''}\n"
-            config_content << "Host #{ssh_aliases_for(node).join(' ')}\n"
-            config_content << "  Hostname #{connection}\n"
-            config_content << "  ProxyCommand #{ssh_exec} -q -W %h:%p #{gateway_user}@#{gateway}\n" unless gateway.nil?
-            if @passwords.key?(node)
-              config_content << "  PreferredAuthentications password\n"
-              config_content << "  PubkeyAuthentication no\n"
+            begin
+              connection, gateway, gateway_user = connection_info_for(node)
+              config_content << "# #{node} - #{connection} - #{@nodes_handler.get_description_of(node) || ''}\n"
+              config_content << "Host #{ssh_aliases_for(node).join(' ')}\n"
+              config_content << "  Hostname #{connection}\n"
+              config_content << "  ProxyCommand #{ssh_exec} -q -W %h:%p #{gateway_user}@#{gateway}\n" unless gateway.nil?
+              if @passwords.key?(node)
+                config_content << "  PreferredAuthentications password\n"
+                config_content << "  PubkeyAuthentication no\n"
+              end
+            rescue NotConnectableError
+              config_content << "# #{node} - Not connectable using SSH - #{@nodes_handler.get_description_of(node) || ''}\n"
             end
             config_content << "\n"
           end
@@ -665,7 +673,7 @@ module HybridPlatformsConductor
             elsif @nodes_handler.get_hostname_of(node)
               @nodes_handler.get_hostname_of(node)
             else
-              raise "No connection possible to #{node}"
+              raise NotConnectableError, "No connection possible to #{node}"
             end
           gateway = @nodes_handler.get_gateway_of node
           gateway_user = @nodes_handler.get_gateway_user_of node

data/lib/hybrid_platforms_conductor/hpc_plugins/platform_handler/platform_handler_plugin.rb.sample

@@ -173,7 +173,7 @@ module HybridPlatformsConductor
         # * *local_environment* (Boolean): Are we deploying to a local environment?
         def package(services:, secrets:, local_environment:)
           # This method should take all actions to prepare the repository to be deployed on nodes later.
-          File.write('temporary_secrets_to_be_deployed.json', secrets)
+          File.write("#{@repository_path}/temporary_secrets_to_be_deployed.json", secrets.to_json)
           # Usually it is meant to package the deployment scripts.
           @cmd_runner.run_cmd "cd #{@repository_path} && ./scripts/package_in_debian_format.sh"
         end

data/lib/hybrid_platforms_conductor/services_handler.rb

@@ -12,14 +12,9 @@ module HybridPlatformsConductor
 
     class << self
 
-      # List of deployments that have been packaged.
-      # Each deployment has the following info:
-      # * *platform_name* (String): The platform name
-      # * *services* (Hash< String, Array<String> >): Services to be deployed, per node
-      # * *secrets* (Hash): Secrets for which this has been packaged
-      # * *local_environment* (Boolean): Has it been packaged for local environment?
+      # List of package IDs that have been packaged.
       # Make this at class level as several Deployer instances can be used in a multi-thread environmnent.
-      #   Array< Hash<Symbol, Object> >
+      #   Array<Object>
       attr_reader :packaged_deployments
 
     end
@@ -114,21 +109,22 @@ module HybridPlatformsConductor
     )
       platforms_for(services).each do |platform, platform_services|
         platform_name = platform.name
-        deployment_info = {
+        # Compute the package ID that is unique to this packaging, so that we don't mix it with others if needed.
+        package_id = {
           platform_name: platform_name,
-          services: platform_services,
-          secrets: secrets,
+          services: Hash[platform_services.map { |node, node_services| [node, node_services.sort] }].sort,
+          secrets: secrets.sort,
           local_environment: local_environment
         }
-        if ServicesHandler.packaged_deployments.include?(deployment_info)
-          log_debug "Platform #{platform_name} has already been packaged for this deployment. Won't package it another time."
+        if ServicesHandler.packaged_deployments.include?(package_id)
+          log_debug "Platform #{platform_name} has already been packaged for this deployment (package ID #{package_id}). Won't package it another time."
         else
           platform.package(
             services: platform_services,
             secrets: secrets,
             local_environment: local_environment
           )
-          ServicesHandler.packaged_deployments << deployment_info
+          ServicesHandler.packaged_deployments << package_id
         end
       end
     end

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '32.4.1'
+  VERSION = '32.4.2'
 
 end

data/spec/hybrid_platforms_conductor_test/api/actions_executor/connectors/ssh/global_helpers_spec.rb

@@ -153,6 +153,24 @@ describe HybridPlatformsConductor::ActionsExecutor do
         end
       end
 
+      it 'generates a simple config for several nodes even when some of them can\'t be connected' do
+        with_test_platform(nodes: {
+          'node1' => { meta: { host_ip: '192.168.42.1' } },
+          'node2' => { meta: {} },
+          'node3' => { meta: { host_ip: '192.168.42.3' } }
+        }) do
+          expect(ssh_config_for('node1')).to eq <<~EOS
+            Host hpc.node1
+              Hostname 192.168.42.1
+          EOS
+          expect(ssh_config_for('node2')).to eq "\n"
+          expect(ssh_config_for('node3')).to eq <<~EOS
+            Host hpc.node3
+              Hostname 192.168.42.3
+          EOS
+        end
+      end
+
       it 'selects nodes when generating the config' do
         with_test_platform(nodes: {
           'node1' => { meta: { host_ip: '192.168.42.1' } },
@@ -167,12 +185,6 @@ describe HybridPlatformsConductor::ActionsExecutor do
         end
       end
 
-      it 'fails if a node can\'t be connected to' do
-        with_test_platform(nodes: { 'node' => {} }) do
-          expect { ssh_config_for('node') }.to raise_error(/No connection possible to node/)
-        end
-      end
-
       it 'generates an alias if the node has a hostname' do
         with_test_platform(nodes: { 'node' => { meta: { host_ip: '192.168.42.42', hostname: 'my_hostname.my_domain' } } }) do
           expect(ssh_config_for('node')).to eq <<~EOS

data/spec/hybrid_platforms_conductor_test/helpers/platforms_handler_helpers.rb

@@ -58,7 +58,7 @@ module HybridPlatformsConductorTest
       #
       # Parameters::
       # * *content* (String): hpc_config.rb's content
-      # * Proc: Code called with the platforms.rb file created.
+      # * Proc: Code called with the hpc_config.rb file created.
       #   * Parameters::
       #     * *hybrid_platforms_dir* (String): The hybrid-platforms directory
       def with_platforms(content)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 32.4.1
+  version: 32.4.2
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: range_operators
@@ -281,20 +281,20 @@ description: Provides a complete toolset to help DevOps maintain, deploy, monito
 email:
 - muriel@x-aeon.com
 executables:
-- dump_nodes_json
+- topograph
 - test
+- free_veids
+- free_ips
+- nodes_to_deploy
 - last_deploys
 - check-node
-- setup
-- free_ips
-- ssh_config
-- deploy
+- run
 - report
-- free_veids
 - get_impacted_nodes
-- run
-- nodes_to_deploy
-- topograph
+- ssh_config
+- deploy
+- setup
+- dump_nodes_json
 extensions: []
 extra_rdoc_files: []
 files: