hybrid_platforms_conductor 32.17.0 → 33.0.2

data/lib/hybrid_platforms_conductor/hpc_plugins/platform_handler/serverless_chef/dsl_parser.rb

@@ -29,6 +29,10 @@ module HybridPlatformsConductor
             instance_eval(File.read(source))
           end
 
+          # Intercept all missing methods
+          #
+          # Parameters::
+          # * *method_name* (Symbol): The missing method being called
           def method_missing(method_name, *args, &block)
             sub_calls = []
             @calls << {
@@ -40,6 +44,15 @@ module HybridPlatformsConductor
             DslParser.new(sub_calls)
           end
 
+          # Make sure we register the methods we handle in method_missing
+          #
+          # Parameters::
+          # * *name* (Symbol): The missing method name
+          # * *include_private* (Boolean): Should we include private methods in the search?
+          def respond_to_missing?(_name, _include_private)
+            true
+          end
+
         end
 
       end

data/lib/hybrid_platforms_conductor/hpc_plugins/platform_handler/serverless_chef/recipes_tree_builder.rb

@@ -40,11 +40,14 @@ module HybridPlatformsConductor
                 add_recipe_in_tree(cookbook_dir, cookbook, recipe)
               end
             end
+            # Make sure we don't combine those 2 loops
+            # rubocop:disable Style/CombinableLoops
             @platform.deployable_services.each do |service|
-              @platform.policy_run_list(service).each do |(cookbook_dir, cookbook, recipe)|
+              @platform.policy_run_list(service).each do |(_cookbook_dir, cookbook, recipe)|
                 mark_recipe_used_by_policy(cookbook, recipe, service)
               end
             end
+            # rubocop:enable Style/CombinableLoops
             @recipes_tree
           end
 
@@ -58,25 +61,25 @@ module HybridPlatformsConductor
           # * *recipe* (Symbol): The recipe name
           def add_recipe_in_tree(cookbook_dir, cookbook, recipe)
             @recipes_tree[cookbook] = {} unless @recipes_tree.key?(cookbook)
-            unless @recipes_tree[cookbook].key?(recipe)
-              recipe_info =
-                if cookbook_dir.nil?
-                  # This recipe comes from an external cookbook, we won't get into it.
-                  {
-                    included_recipes: [],
-                    used_templates: [],
-                    used_files: [],
-                    used_cookbooks: []
-                  }
-                else
-                  recipe_usage(cookbook_dir, cookbook, recipe)
-                end
-              @recipes_tree[cookbook][recipe] = recipe_info.merge(
-                used_by_policies: []
-              )
-              recipe_info[:included_recipes].each do |(sub_cookbook_dir, sub_cookbook, sub_recipe)|
-                add_recipe_in_tree(sub_cookbook_dir, sub_cookbook, sub_recipe)
+            return if @recipes_tree[cookbook].key?(recipe)
+
+            recipe_info =
+              if cookbook_dir.nil?
+                # This recipe comes from an external cookbook, we won't get into it.
+                {
+                  included_recipes: [],
+                  used_templates: [],
+                  used_files: [],
+                  used_cookbooks: []
+                }
+              else
+                recipe_usage(cookbook_dir, cookbook, recipe)
               end
+            @recipes_tree[cookbook][recipe] = recipe_info.merge(
+              used_by_policies: []
+            )
+            recipe_info[:included_recipes].each do |(sub_cookbook_dir, sub_cookbook, sub_recipe)|
+              add_recipe_in_tree(sub_cookbook_dir, sub_cookbook, sub_recipe)
             end
           end
 
@@ -115,18 +118,18 @@ module HybridPlatformsConductor
             recipe_content.
               scan(/source\s+(["'])(.+?)\1/).
               each do |(_sub_grp, source)|
-                sources << source unless source =~ /^https?:\/\//
+                sources << source unless source =~ %r{^https?://}
               end
             erb_sources = sources.select { |source| File.extname(source).downcase == '.erb' }
             non_erb_sources = sources - erb_sources
             erb_sources.concat(recipe_content.scan(/template:?\s+(["'])(.+?)\1/).map { |(_sub_grp, source)| source })
             # Check for known resources and library methods
             used_cookbooks = []
-            known_resources.each do |cookbook, methods|
-              used_cookbooks << cookbook if methods.any? { |method_name| recipe_content.include?(method_name) }
+            known_resources.each do |itr_cookbook, methods|
+              used_cookbooks << itr_cookbook if methods.any? { |method_name| recipe_content.include?(method_name) }
             end
-            known_library_methods.each do |cookbook, methods|
-              used_cookbooks << cookbook if methods.any? { |method_name| recipe_content.include?(method_name) }
+            known_library_methods.each do |itr_cookbook, methods|
+              used_cookbooks << itr_cookbook if methods.any? { |method_name| recipe_content.include?(method_name) }
             end
             {
               included_recipes: used_recipes,
@@ -171,9 +174,9 @@ module HybridPlatformsConductor
               @known_library_methods = {}
               for_each_cookbook do |cookbook, cookbook_dir|
                 if File.exist?("#{cookbook_dir}/libraries")
-                  found_methods =  Dir.glob("#{cookbook_dir}/libraries/*.rb").
-                      map { |lib_file| File.read(lib_file).scan(/\bdef\s+(\w+)\b/).map { |(method_name)| method_name } }.
-                      flatten - INVALID_LIBRARY_METHODS
+                  found_methods = Dir.glob("#{cookbook_dir}/libraries/*.rb").
+                    map { |lib_file| File.read(lib_file).scan(/\bdef\s+(\w+)\b/).map { |(method_name)| method_name } }.
+                    flatten - INVALID_LIBRARY_METHODS
                   @known_library_methods[cookbook] = found_methods unless found_methods.empty?
                 end
               end
@@ -184,15 +187,13 @@ module HybridPlatformsConductor
           # Iterate over all cookbooks
           #
           # Parameters::
-          # * Proc: Code called for each cookbook:
+          # * *block* (Proc): Code called for each cookbook:
           #   * Parameters::
           #     * *cookbook* (Symbol): Cookbook name
           #     * *cookbook_dir* (String): Cookbook directory
-          def for_each_cookbook
+          def for_each_cookbook(&block)
             @platform.known_cookbook_paths.each do |cookbook_path|
-              cookbooks_in(cookbook_path).each do |cookbook, cookbook_dir|
-                yield cookbook, cookbook_dir
-              end
+              cookbooks_in(cookbook_path).each(&block)
             end
           end
 
@@ -203,7 +204,7 @@ module HybridPlatformsConductor
           # Result::
           # * Hash<Symbol, String>: List of cookbook directories, per cookbook name
           def cookbooks_in(cookbook_type)
-            Hash[Dir.glob("#{@platform.repository_path}/#{cookbook_type}/*").map { |dir| [File.basename(dir).to_sym, dir] }.sort]
+            Dir.glob("#{@platform.repository_path}/#{cookbook_type}/*").map { |dir| [File.basename(dir).to_sym, dir] }.sort.to_h
           end
 
           # Mark a recipe (and its included recipes) as used by a policy
@@ -213,11 +214,11 @@ module HybridPlatformsConductor
           # * *recipe* (Symbol): The recipe
           # * *used_by_policy* (String): The policy using this recipe
           def mark_recipe_used_by_policy(cookbook, recipe, used_by_policy)
-            unless @recipes_tree[cookbook][recipe][:used_by_policies].include?(used_by_policy)
-              @recipes_tree[cookbook][recipe][:used_by_policies] << used_by_policy
-              @recipes_tree[cookbook][recipe][:included_recipes].each do |(_sub_cookbook_dir, sub_cookbook, sub_recipe)|
-                mark_recipe_used_by_policy(sub_cookbook, sub_recipe, used_by_policy)
-              end
+            return if @recipes_tree[cookbook][recipe][:used_by_policies].include?(used_by_policy)
+
+            @recipes_tree[cookbook][recipe][:used_by_policies] << used_by_policy
+            @recipes_tree[cookbook][recipe][:included_recipes].each do |(_sub_cookbook_dir, sub_cookbook, sub_recipe)|
+              mark_recipe_used_by_policy(sub_cookbook, sub_recipe, used_by_policy)
             end
           end
 

data/lib/hybrid_platforms_conductor/hpc_plugins/platform_handler/yaml_inventory.rb

@@ -16,7 +16,7 @@ module HybridPlatformsConductor
         def init
           # This method is called when initializing a new instance of this platform handler, for a given repository.
           inv_file = "#{@repository_path}/inventory.yaml"
-          @inventory = File.exist?(inv_file) ? YAML.load(File.read(inv_file)) : {}
+          @inventory = File.exist?(inv_file) ? YAML.safe_load(File.read(inv_file)) : {}
         end
 
         # Get the list of known nodes.
@@ -89,12 +89,13 @@ module HybridPlatformsConductor
             # * *cmd_runner* (CmdRunner): CmdRunner to be used [default: CmdRunner.new]
             def initialize(
               platform_handler,
-              logger: Logger.new(STDOUT),
-              logger_stderr: Logger.new(STDERR),
+              logger: Logger.new($stdout),
+              logger_stderr: Logger.new($stderr),
               config: Config.new,
               nodes_handler: NodesHandler.new,
               cmd_runner: CmdRunner.new
             )
+              super
               init_loggers(logger, logger_stderr)
               @platform_handler = platform_handler
               @config = config
@@ -127,7 +128,7 @@ module HybridPlatformsConductor
         #     * *:changed*: The task has been changed
         #     * *:identical*: The task has not been changed
         #   * *diffs* (String): Differences, if any
-        def parse_deploy_output(stdout, stderr)
+        def parse_deploy_output(_stdout, _stderr)
           []
         end
 

data/lib/hybrid_platforms_conductor/hpc_plugins/provisioner/docker.rb

@@ -21,7 +21,7 @@ module HybridPlatformsConductor
             ::Docker.validate_version!
             docker_ok = true
           rescue
-            log_error "[ #{@node}/#{@environment} ] - Docker is not installed correctly. Please install it. Error: #{$!}"
+            log_error "[ #{@node}/#{@environment} ] - Docker is not installed correctly. Please install it. Error: #{$ERROR_INFO}"
           end
           docker_ok
         end
@@ -33,47 +33,45 @@ module HybridPlatformsConductor
           # Get the image name for this node
           image = @nodes_handler.get_image_of(@node).to_sym
           # Find if we have such an image registered
-          if @config.known_os_images.include?(image)
-            # Build the image if it does not exist
-            image_tag = "hpc_image_#{image}"
-            docker_image = nil
-            image_futex_file = "#{Dir.tmpdir}/hpc_docker_image_futexes/#{image_tag}"
-            FileUtils.mkdir_p File.dirname(image_futex_file)
-            Futex.new(image_futex_file).open do
-              docker_image = ::Docker::Image.all.find { |search_image| !search_image.info['RepoTags'].nil? && search_image.info['RepoTags'].include?("#{image_tag}:latest") }
-              unless docker_image
-                log_debug "[ #{@node}/#{@environment} ] - Creating Docker image #{image_tag}..."
-                Excon.defaults[:read_timeout] = 600
-                docker_image = ::Docker::Image.build_from_dir(@config.os_image_dir(image))
-                docker_image.tag repo: image_tag
-              end
-            end
-            container_name = "hpc_docker_container_#{@node}_#{@environment}"
-            container_futex_file = "#{Dir.tmpdir}/hpc_docker_container_futexes/#{image_tag}"
-            FileUtils.mkdir_p File.dirname(container_futex_file)
-            Futex.new(container_futex_file).open do
-              old_docker_container = ::Docker::Container.all(all: true).find { |container| container.info['Names'].include? "/#{container_name}" }
-              @container =
-                if old_docker_container
-                  old_docker_container
-                else
-                  log_debug "[ #{@node}/#{@environment} ] - Creating Docker container #{container_name}..."
-                  # We add the SYS_PTRACE capability as some images need to restart services (for example postfix) and those services need the rights to ls in /proc/{PID}/exe to check if a status is running. Without SYS_PTRACE such ls returns permission denied and the service can't be stopped (as init.d always returns it as stopped even when running).
-                  # We add the privileges as some containers need to install and configure the udev package, which needs RW access to /sys.
-                  # We add the bind to cgroup volume to be able to test systemd specifics (enabling/disabling services for example).
-                  ::Docker::Container.create(
-                    name: container_name,
-                    image: image_tag,
-                    CapAdd: 'SYS_PTRACE',
-                    Privileged: true,
-                    Binds: ['/sys/fs/cgroup:/sys/fs/cgroup:ro'],
-                    # Some playbooks need the hostname to be set to a correct FQDN
-                    Hostname: "#{@node}.testdomain"
-                  )
-                end
+          raise "[ #{@node}/#{@environment} ] - Unknown OS image #{image} defined for node #{@node}" unless @config.known_os_images.include?(image)
+
+          # Build the image if it does not exist
+          image_tag = "hpc_image_#{image}"
+          docker_image = nil
+          image_futex_file = "#{Dir.tmpdir}/hpc_docker_image_futexes/#{image_tag}"
+          FileUtils.mkdir_p File.dirname(image_futex_file)
+          Futex.new(image_futex_file).open do
+            docker_image = ::Docker::Image.all.find { |search_image| !search_image.info['RepoTags'].nil? && search_image.info['RepoTags'].include?("#{image_tag}:latest") }
+            unless docker_image
+              log_debug "[ #{@node}/#{@environment} ] - Creating Docker image #{image_tag}..."
+              Excon.defaults[:read_timeout] = 600
+              docker_image = ::Docker::Image.build_from_dir(@config.os_image_dir(image))
+              docker_image.tag repo: image_tag
             end
-          else
-            raise "[ #{@node}/#{@environment} ] - Unknown OS image #{image} defined for node #{@node}"
+          end
+          container_name = "hpc_docker_container_#{@node}_#{@environment}"
+          container_futex_file = "#{Dir.tmpdir}/hpc_docker_container_futexes/#{image_tag}"
+          FileUtils.mkdir_p File.dirname(container_futex_file)
+          Futex.new(container_futex_file).open do
+            old_docker_container = ::Docker::Container.all(all: true).find { |container| container.info['Names'].include? "/#{container_name}" }
+            @container =
+              if old_docker_container
+                old_docker_container
+              else
+                log_debug "[ #{@node}/#{@environment} ] - Creating Docker container #{container_name}..."
+                # We add the SYS_PTRACE capability as some images need to restart services (for example postfix) and those services need the rights to ls in /proc/{PID}/exe to check if a status is running. Without SYS_PTRACE such ls returns permission denied and the service can't be stopped (as init.d always returns it as stopped even when running).
+                # We add the privileges as some containers need to install and configure the udev package, which needs RW access to /sys.
+                # We add the bind to cgroup volume to be able to test systemd specifics (enabling/disabling services for example).
+                ::Docker::Container.create(
+                  name: container_name,
+                  image: image_tag,
+                  CapAdd: 'SYS_PTRACE',
+                  Privileged: true,
+                  Binds: ['/sys/fs/cgroup:/sys/fs/cgroup:ro'],
+                  # Some playbooks need the hostname to be set to a correct FQDN
+                  Hostname: "#{@node}.testdomain"
+                )
+              end
           end
         end
 
@@ -81,7 +79,7 @@ module HybridPlatformsConductor
         # Prerequisite: create has been called before
         # [API] - This method is mandatory
         def start
-          log_debug "[ #{@node}/#{@environment} ] - Start Docker Container #{@container.refresh!.info['Name'][1..-1]} ..."
+          log_debug "[ #{@node}/#{@environment} ] - Start Docker Container #{@container.refresh!.info['Name'][1..]} ..."
           @container.start
         end
 
@@ -89,7 +87,7 @@ module HybridPlatformsConductor
         # Prerequisite: create has been called before
         # [API] - This method is mandatory
         def stop
-          log_debug "[ #{@node}/#{@environment} ] - Stop Docker Container #{@container.refresh!.info['Name'][1..-1]} ..."
+          log_debug "[ #{@node}/#{@environment} ] - Stop Docker Container #{@container.refresh!.info['Name'][1..]} ..."
           @container.stop
         end
 
@@ -97,7 +95,7 @@ module HybridPlatformsConductor
         # Prerequisite: create has been called before
         # [API] - This method is mandatory
         def destroy
-          log_debug "[ #{@node}/#{@environment} ] - Destroy Docker Container #{@container.refresh!.info['Name'][1..-1]} ..."
+          log_debug "[ #{@node}/#{@environment} ] - Destroy Docker Container #{@container.refresh!.info['Name'][1..]} ..."
           @container.remove
           @container = nil
         end
@@ -119,7 +117,7 @@ module HybridPlatformsConductor
             begin
               @container.refresh!.info['State']['Status'].to_sym
             rescue
-              log_error "[ #{@node}/#{@environment} ] - Error while reading state of Docker container: #{$!}"
+              log_error "[ #{@node}/#{@environment} ] - Error while reading state of Docker container: #{$ERROR_INFO}"
               :error
             end
           end

data/lib/hybrid_platforms_conductor/hpc_plugins/provisioner/podman.rb

@@ -17,25 +17,23 @@ module HybridPlatformsConductor
           # Get the image name for this node
           image = @nodes_handler.get_image_of(@node).to_sym
           # Find if we have such an image registered
-          if @config.known_os_images.include?(image)
-            # Build the image if it does not exist
-            image_tag = "hpc_image_#{image}"
-            image_futex_file = "#{Dir.tmpdir}/hpc_podman_image_futexes/#{image_tag}"
-            FileUtils.mkdir_p File.dirname(image_futex_file)
-            Futex.new(image_futex_file).open do
-              @cmd_runner.run_cmd "cd #{@config.os_image_dir(image)} && #{podman_cmd} build --tag #{image_tag} --security-opt seccomp=/usr/share/containers/seccomp.json --cgroup-manager=cgroupfs ."
-            end
-            container_name = "hpc_container_#{@node}_#{@environment}"
-            container_futex_file = "#{Dir.tmpdir}/hpc_podman_container_futexes/#{image_tag}"
-            FileUtils.mkdir_p File.dirname(container_futex_file)
-            Futex.new(container_futex_file).open do
-              _exit_status, stdout, _stderr = @cmd_runner.run_cmd "#{podman_cmd} container list --all | grep #{container_name}", expected_code: [0, 1]
-              existing_container = !stdout.strip.empty?
-              @cmd_runner.run_cmd "#{podman_cmd} container create --name #{container_name} #{image_tag}" unless existing_container
-              @container = container_name
-            end
-          else
-            raise "[ #{@node}/#{@environment} ] - Unknown OS image #{image} defined for node #{@node}"
+          raise "[ #{@node}/#{@environment} ] - Unknown OS image #{image} defined for node #{@node}" unless @config.known_os_images.include?(image)
+
+          # Build the image if it does not exist
+          image_tag = "hpc_image_#{image}"
+          image_futex_file = "#{Dir.tmpdir}/hpc_podman_image_futexes/#{image_tag}"
+          FileUtils.mkdir_p File.dirname(image_futex_file)
+          Futex.new(image_futex_file).open do
+            @cmd_runner.run_cmd "cd #{@config.os_image_dir(image)} && #{podman_cmd} build --tag #{image_tag} --security-opt seccomp=/usr/share/containers/seccomp.json --cgroup-manager=cgroupfs ."
+          end
+          container_name = "hpc_container_#{@node}_#{@environment}"
+          container_futex_file = "#{Dir.tmpdir}/hpc_podman_container_futexes/#{image_tag}"
+          FileUtils.mkdir_p File.dirname(container_futex_file)
+          Futex.new(container_futex_file).open do
+            _exit_status, stdout, _stderr = @cmd_runner.run_cmd "#{podman_cmd} container list --all | grep #{container_name}", expected_code: [0, 1]
+            existing_container = !stdout.strip.empty?
+            @cmd_runner.run_cmd "#{podman_cmd} container create --name #{container_name} #{image_tag}" unless existing_container
+            @container = container_name
           end
         end
 
@@ -83,7 +81,7 @@ module HybridPlatformsConductor
               status = :created if status == :configured
               status
             rescue
-              log_warn "Error while reading state of Podman container #{@container}: #{$!}"
+              log_warn "Error while reading state of Podman container #{@container}: #{$ERROR_INFO}"
               :error
             end
           end

data/lib/hybrid_platforms_conductor/hpc_plugins/provisioner/proxmox.rb

@@ -8,6 +8,7 @@ module HybridPlatformsConductor
 
   module HpcPlugins
 
+    # Patch proxmox lib
     module Provisioner
 
       # Monkey patch some Proxmox methods
@@ -68,7 +69,9 @@ module HybridPlatformsConductor
         extend_config_dsl_with PlatformsDSLProxmox, :init_proxmox
 
         class << self
+
           attr_accessor :proxmox_waiter_files_mutex
+
         end
         @proxmox_waiter_files_mutex = Mutex.new
 
@@ -83,105 +86,100 @@ module HybridPlatformsConductor
           @lxc_details = nil
           with_proxmox do |proxmox|
             proxmox_get(proxmox, 'nodes').each do |node_info|
-              if proxmox_test_info[:test_config][:pve_nodes].include?(node_info['node']) && node_info['status'] == 'online'
-                proxmox_get(proxmox, "nodes/#{node_info['node']}/lxc").each do |lxc_info|
-                  vm_id = Integer(lxc_info['vmid'])
-                  if vm_id.between?(*proxmox_test_info[:test_config][:vm_ids_range])
-                    # Check if the description contains our ID
-                    lxc_config = proxmox_get(proxmox, "nodes/#{node_info['node']}/lxc/#{vm_id}/config")
-                    vm_description_lines = (lxc_config['description'] || '').split("\n")
-                    hpc_marker_idx = vm_description_lines.index('===== HPC info =====')
-                    unless hpc_marker_idx.nil?
-                      # Get the HPC info associated to this VM
-                      # Hash<Symbol,String>
-                      vm_hpc_info = Hash[vm_description_lines[hpc_marker_idx + 1..-1].map do |line|
-                        property, value = line.split(': ')
-                        [property.to_sym, value]
-                      end]
-                      if vm_hpc_info[:node] == @node && vm_hpc_info[:environment] == @environment
-                        # Found it
-                        # Get back the IP
-                        ip_found = nil
-                        lxc_config['net0'].split(',').each do |net_info|
-                          property, value = net_info.split('=')
-                          if property == 'ip'
-                            ip_found = value.split('/').first
-                            break
-                          end
-                        end
-                        raise "[ #{@node}/#{@environment} ] - Unable to get IP back from LXC container nodes/#{node_info['node']}/lxc/#{vm_id}/config" if ip_found.nil?
-                        @lxc_details = {
-                          pve_node: node_info['node'],
-                          vm_id: vm_id,
-                          vm_ip: ip_found
-                        }
-                        break
-                      end
-                    end
+              next unless proxmox_test_info[:test_config][:pve_nodes].include?(node_info['node']) && node_info['status'] == 'online'
+
+              proxmox_get(proxmox, "nodes/#{node_info['node']}/lxc").each do |lxc_info|
+                vm_id = Integer(lxc_info['vmid'])
+                next unless vm_id.between?(*proxmox_test_info[:test_config][:vm_ids_range])
+
+                # Check if the description contains our ID
+                lxc_config = proxmox_get(proxmox, "nodes/#{node_info['node']}/lxc/#{vm_id}/config")
+                vm_description_lines = (lxc_config['description'] || '').split("\n")
+                hpc_marker_idx = vm_description_lines.index('===== HPC info =====')
+                next if hpc_marker_idx.nil?
+
+                # Get the HPC info associated to this VM
+                # Hash<Symbol,String>
+                vm_hpc_info = vm_description_lines[hpc_marker_idx + 1..].map do |line|
+                  property, value = line.split(': ')
+                  [property.to_sym, value]
+                end.to_h
+                next unless vm_hpc_info[:node] == @node && vm_hpc_info[:environment] == @environment
+
+                # Found it
+                # Get back the IP
+                ip_found = nil
+                lxc_config['net0'].split(',').each do |net_info|
+                  property, value = net_info.split('=')
+                  if property == 'ip'
+                    ip_found = value.split('/').first
+                    break
                   end
                 end
-                break if @lxc_details
+                raise "[ #{@node}/#{@environment} ] - Unable to get IP back from LXC container nodes/#{node_info['node']}/lxc/#{vm_id}/config" if ip_found.nil?
+
+                @lxc_details = {
+                  pve_node: node_info['node'],
+                  vm_id: vm_id,
+                  vm_ip: ip_found
+                }
+                break
               end
+              break if @lxc_details
             end
           end
-          unless @lxc_details
-            # We couldn't find an existing LXC container for this node/environment.
-            # We have to create one.
-            # Get the image name for this node
-            image = @nodes_handler.get_image_of(@node).to_sym
-            # Find if we have such an image registered
-            if @config.known_os_images.include?(image)
-              proxmox_conf = "#{@config.os_image_dir(image)}/proxmox.json"
-              if File.exist?(proxmox_conf)
-                pve_template = JSON.parse(File.read(proxmox_conf)).dig 'template'
-                if pve_template
-                  # Query the inventory to know about minimum resources needed to deploy the node.
-                  # Provide default values if they are not part of the metadata.
-                  min_resources_to_deploy = {
-                    cpus: 2,
-                    ram_mb: 1024,
-                    disk_gb: 10
-                  }.merge(@nodes_handler.get_deploy_resources_min_of(@node) || {})
-                  # Create the Proxmox container from the sync node.
-                  vm_config = proxmox_test_info[:vm_config]
-                  # Hostname in Proxmox is capped at 65 chars.
-                  # Make sure we don't get over it, but still use a unique one.
-                  hostname = "#{@node}.#{@environment}.hpc-test.com"
-                  if hostname.size > MAX_PROXMOX_HOSTNAME_SIZE
-                    # Truncate it, but add a unique ID in it.
-                    # In the end the hostname looks like:
-                    # <truncated_node_environment>.<unique_id>.hpc-test.com
-                    hostname = "-#{Digest::MD5.hexdigest(hostname)[0..7]}.hpc-test.com"
-                    hostname = "#{@node}.#{@environment}"[0..MAX_PROXMOX_HOSTNAME_SIZE - hostname.size - 1] + hostname
-                  end
-                  @lxc_details = request_lxc_creation_for({
-                    ostemplate: pve_template,
-                    hostname: hostname.gsub('_', '-'),
-                    cores: min_resources_to_deploy[:cpus],
-                    cpulimit: min_resources_to_deploy[:cpus],
-                    memory: min_resources_to_deploy[:ram_mb],
-                    rootfs: "local-lvm:#{min_resources_to_deploy[:disk_gb]}",
-                    nameserver: vm_config[:vm_dns_servers].join(' '),
-                    searchdomain: vm_config[:vm_search_domain],
-                    net0: "name=eth0,bridge=vmbr0,gw=#{vm_config[:vm_gateway]}",
-                    password: 'root_pwd',
-                    description: <<~EOS
-                      ===== HPC info =====
-                      node: #{@node}
-                      environment: #{@environment}
-                      debug: #{log_debug? ? 'true' : 'false'}
-                    EOS
-                  })
-                else
-                  raise "[ #{@node}/#{@environment} ] - No template found in #{proxmox_conf}"
-                end
-              else
-                raise "[ #{@node}/#{@environment} ] - No Proxmox configuration found at #{proxmox_conf}"
-              end
-            else
-              raise "[ #{@node}/#{@environment} ] - Unknown OS image #{image} defined for node #{@node}"
-            end
+          return if @lxc_details
+
+          # We couldn't find an existing LXC container for this node/environment.
+          # We have to create one.
+          # Get the image name for this node
+          image = @nodes_handler.get_image_of(@node).to_sym
+          # Find if we have such an image registered
+          raise "[ #{@node}/#{@environment} ] - Unknown OS image #{image} defined for node #{@node}" unless @config.known_os_images.include?(image)
+
+          proxmox_conf = "#{@config.os_image_dir(image)}/proxmox.json"
+          raise "[ #{@node}/#{@environment} ] - No Proxmox configuration found at #{proxmox_conf}" unless File.exist?(proxmox_conf)
+
+          pve_template = JSON.parse(File.read(proxmox_conf))['template']
+          raise "[ #{@node}/#{@environment} ] - No template found in #{proxmox_conf}" unless pve_template
+
+          # Query the inventory to know about minimum resources needed to deploy the node.
+          # Provide default values if they are not part of the metadata.
+          min_resources_to_deploy = {
+            cpus: 2,
+            ram_mb: 1024,
+            disk_gb: 10
+          }.merge(@nodes_handler.get_deploy_resources_min_of(@node) || {})
+          # Create the Proxmox container from the sync node.
+          vm_config = proxmox_test_info[:vm_config]
+          # Hostname in Proxmox is capped at 65 chars.
+          # Make sure we don't get over it, but still use a unique one.
+          hostname = "#{@node}.#{@environment}.hpc-test.com"
+          if hostname.size > MAX_PROXMOX_HOSTNAME_SIZE
+            # Truncate it, but add a unique ID in it.
+            # In the end the hostname looks like:
+            # <truncated_node_environment>.<unique_id>.hpc-test.com
+            hostname = "-#{Digest::MD5.hexdigest(hostname)[0..7]}.hpc-test.com"
+            hostname = "#{@node}.#{@environment}"[0..MAX_PROXMOX_HOSTNAME_SIZE - hostname.size - 1] + hostname
           end
+          @lxc_details = request_lxc_creation_for(
+            ostemplate: pve_template,
+            hostname: hostname.gsub('_', '-'),
+            cores: min_resources_to_deploy[:cpus],
+            cpulimit: min_resources_to_deploy[:cpus],
+            memory: min_resources_to_deploy[:ram_mb],
+            rootfs: "local-lvm:#{min_resources_to_deploy[:disk_gb]}",
+            nameserver: vm_config[:vm_dns_servers].join(' '),
+            searchdomain: vm_config[:vm_search_domain],
+            net0: "name=eth0,bridge=vmbr0,gw=#{vm_config[:vm_gateway]}",
+            password: 'root_pwd',
+            description: <<~EO_DESCRIPTION
+              ===== HPC info =====
+              node: #{@node}
+              environment: #{@environment}
+              debug: #{log_debug? ? 'true' : 'false'}
+            EO_DESCRIPTION
+          )
         end
 
         # Start an instance
@@ -274,6 +272,7 @@ module HybridPlatformsConductor
         def with_proxmox
           url = proxmox_test_info[:api_url]
           raise 'No Proxmox server defined' if url.nil?
+
           Credentials.with_credentials_for(:proxmox, @logger, @logger_stderr, url: url) do |user, password|
             log_debug "[ #{@node}/#{@environment} ] - Connect to Proxmox #{url}"
             proxmox_logs = StringIO.new
@@ -313,9 +312,11 @@ module HybridPlatformsConductor
           idx_try = 0
           loop do
             response = proxmox.get(path)
-            break if !(response.is_a?(String)) || !(response =~ /^NOK: error code = 5\d\d$/)
+            break if !response.is_a?(String) || response !~ /^NOK: error code = 5\d\d$/
+
             log_warn "[ #{@node}/#{@environment} ] - Proxmox API call get #{path} returned error #{response} (attempt ##{idx_try}/#{proxmox_test_info[:api_max_retries]})"
             raise "[ #{@node}/#{@environment} ] - Proxmox API call get #{path} returns #{response} continuously (tried #{idx_try + 1} times)" if idx_try >= proxmox_test_info[:api_max_retries]
+
             idx_try += 1
             # We have to reauthenticate: error 500 raised by Proxmox are often due to token being invalidated wrongly
             proxmox.reauthenticate
@@ -336,23 +337,22 @@ module HybridPlatformsConductor
         def run_proxmox_task(proxmox, http_method, pve_node, sub_path, *args)
           task = nil
           idx_try = 0
-          while task.nil? do
+          while task.nil?
             task = proxmox.send(http_method, "nodes/#{pve_node}/#{sub_path}", *args)
-            if task =~ /^NOK: error code = 5\d\d$/
-              log_warn "[ #{@node}/#{@environment} ] - Proxmox API call #{http_method} nodes/#{pve_node}/#{sub_path} #{args} returned error #{task} (attempt ##{idx_try}/#{proxmox_test_info[:api_max_retries]})"
-              task = nil
-              break if idx_try >= proxmox_test_info[:api_max_retries]
-              idx_try += 1
-              # We have to reauthenticate: error 500 raised by Proxmox are often due to token being invalidated wrongly
-              proxmox.reauthenticate
-              sleep proxmox_test_info[:api_wait_between_retries_secs] + rand(5)
-            end
-          end
-          if task.nil?
-            raise "[ #{@node}/#{@environment} ] - Proxmox API call #{http_method} nodes/#{pve_node}/#{sub_path} #{args} is constantly failing. Giving up."
-          else
-            wait_for_proxmox_task(proxmox, pve_node, task)
+            next unless task =~ /^NOK: error code = 5\d\d$/
+
+            log_warn "[ #{@node}/#{@environment} ] - Proxmox API call #{http_method} nodes/#{pve_node}/#{sub_path} #{args} returned error #{task} (attempt ##{idx_try}/#{proxmox_test_info[:api_max_retries]})"
+            task = nil
+            break if idx_try >= proxmox_test_info[:api_max_retries]
+
+            idx_try += 1
+            # We have to reauthenticate: error 500 raised by Proxmox are often due to token being invalidated wrongly
+            proxmox.reauthenticate
+            sleep proxmox_test_info[:api_wait_between_retries_secs] + rand(5)
           end
+          raise "[ #{@node}/#{@environment} ] - Proxmox API call #{http_method} nodes/#{pve_node}/#{sub_path} #{args} is constantly failing. Giving up." if task.nil?
+
+          wait_for_proxmox_task(proxmox, pve_node, task)
         end
 
         # Wait for a given Proxmox task completion
@@ -363,18 +363,18 @@ module HybridPlatformsConductor
         # * *task* (String): The task ID
         def wait_for_proxmox_task(proxmox, pve_node, task)
           raise "Invalid task: #{task}" if task[0..3] == 'NOK:'
+
           status = nil
           loop do
             status = task_status(proxmox, pve_node, task)
             break unless status == 'running'
+
             log_debug "[ #{@node}/#{@environment} ] - Wait for Proxmox task #{task} to complete..."
             sleep 1
           end
-          if status.split(':').last == 'OK'
-            log_debug "[ #{@node}/#{@environment} ] - Proxmox task #{task} completed."
-          else
-            raise "[ #{@node}/#{@environment} ] - Proxmox task #{task} completed with status #{status}"
-          end
+          raise "[ #{@node}/#{@environment} ] - Proxmox task #{task} completed with status #{status}" unless status.split(':').last == 'OK'
+
+          log_debug "[ #{@node}/#{@environment} ] - Proxmox task #{task} completed."
         end
 
         # Get task status
@@ -402,13 +402,13 @@ module HybridPlatformsConductor
           config_file = "#{Dir.tmpdir}/config_#{file_id}.json"
           File.write(
             config_file,
-            (proxmox_test_info[:test_config].merge(
+            proxmox_test_info[:test_config].merge(
               proxmox_api_url: proxmox_test_info[:api_url],
               futex_file: '/tmp/hpc_proxmox_allocations.futex',
               logs_dir: '/tmp/hpc_proxmox_waiter_logs',
               api_max_retries: proxmox_test_info[:api_max_retries],
               api_wait_between_retries_secs: proxmox_test_info[:api_wait_between_retries_secs]
-            )).to_json
+            ).to_json
           )
           result = nil
           begin
@@ -447,7 +447,7 @@ module HybridPlatformsConductor
               )[proxmox_test_info[:sync_node]]
             end
             stdout_lines = stdout.split("\n")
-            result = JSON.parse(stdout_lines[stdout_lines.index('===== JSON =====') + 1..-1].join("\n")).transform_keys(&:to_sym)
+            result = JSON.parse(stdout_lines[stdout_lines.index('===== JSON =====') + 1..].join("\n")).transform_keys(&:to_sym)
             raise "[ #{@node}/#{@environment} ] - Error returned by #{cmd}: #{result[:error]}" if result.key?(:error)
           ensure
             File.unlink(config_file)
@@ -548,6 +548,7 @@ module HybridPlatformsConductor
         def proxmox_test_info
           @config.proxmox_servers.first
         end
+
       end
 
     end