foreman_ansible_director 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad5a385698810d3de3c2a7807d683ef2deacc5e12d3ec40d340ca2b3ce13b512
-  data.tar.gz: 396708fd055a23d192e4355d08fe5a76396869d8ec36785c4951cc9572268e13
+  metadata.gz: 9bfa5c13b50ecdad46dceeb00e2691c16c586e8060094b5fe21eb1b19ae0eb60
+  data.tar.gz: 12749d98c77fe7008baf803bdfcc627b428f82f1192da8f904602611dbbac9f6
 SHA512:
-  metadata.gz: de0b152a577bfc6cd2f45bb43ee16d456fbd15146510fe6429158cf05a2bad4d6ed1f963131e12e27fd74524bafacb85fb2737ab2c3886be277632889d827ead
-  data.tar.gz: 28b6076faaae3c7b027cfe31528d5ea650e88cd0bd682a93d7feca85ae7660a976e628c3d5aac0334fde8dc6b420911873249d9716f2d3fab3e20424e1ec606b
+  metadata.gz: 8650021501539c07fc71f21cacaea22dae5abe0066b209354b9ae68b8bc2d802c7ea5440c55df65b3d53f5b218b67bcbdb7d88c9699cd6c2219bd46749c69e17
+  data.tar.gz: 5537935a1c0f62ca5a3465b7fc998bb713e8dd22a2fdfa193b5db14a6e1176367112268124f2bb879d139bd8740706e44d620347c60e40e251c6386975130efb

data/app/controllers/foreman_ansible_director/api/v2/ansible_content_controller.rb

@@ -59,10 +59,12 @@ module ForemanAnsibleDirector
           resolved = ::ForemanAnsibleDirector::AnsibleContent::AnsibleContentHelpers.resolve_import_payload(
             params[:units]
           )
-          @bulk_create_task = ForemanTasks.sync_task(
+          @bulk_create_task = ::ForemanAnsibleDirector::ActionService.trigger(
             ::ForemanAnsibleDirector::Actions::AnsibleContentUnit::Bulk::Import,
-            resolved_content_units: resolved,
-            organization_id: @organization.id
+            task_args: {
+              resolved_content_units: resolved,
+              organization_id: @organization.id,
+            }
           )
         end
 
@@ -122,9 +124,22 @@ module ForemanAnsibleDirector
           resolved = ::ForemanAnsibleDirector::AnsibleContent::AnsibleContentHelpers.resolve_destroy_payload(
             destroy_params
           )
-          @bulk_destroy_task =
-            ForemanTasks.sync_task(::ForemanAnsibleDirector::Actions::AnsibleContentUnit::Bulk::Destroy,
-              resolved_content_units: resolved)
+          @bulk_destroy_task = ::ForemanAnsibleDirector::ActionService.trigger(
+            ::ForemanAnsibleDirector::Actions::AnsibleContentUnit::Bulk::Destroy,
+            task_args: {
+              resolved_content_units: resolved,
+            }
+          )
+        end
+
+        # region ApiDoc: POST /api/v2/ansible_director/ansible_content/consistency_check
+        api :POST, '/v2/ansible_director/ansible_content/consistency_check',
+          N_('Run a consistency check to clean up the database after a failed content import.')
+        # endregion
+        def consistency_check
+          @consistency_check = ::ForemanAnsibleDirector::ActionService.trigger(
+            ::ForemanAnsibleDirector::Actions::ConsistencyCheck::Perform
+          )
         end
 
         def model_of_controller

data/app/controllers/foreman_ansible_director/api/v2/ansible_director_api_controller.rb

@@ -7,6 +7,19 @@ module ForemanAnsibleDirector
         include ::Api::Version2
         include ::Foreman::Controller::AutoCompleteSearch
 
+        include ::ForemanAnsibleDirector::RequestCtx::RequestContextHelper
+
+        around_action :attach_request_ctx
+
+        def attach_request_ctx
+          ::ForemanAnsibleDirector::RequestCtx::RequestContext.with_context(
+            ::ForemanAnsibleDirector::RequestCtx::RequestContext.new(request.request_id)
+          ) do
+            @ctx = ctx
+            yield
+          end
+        end
+
         def find_organization
           @organization = Organization.current || find_optional_organization
           if @organization.nil?

data/app/controllers/foreman_ansible_director/api/v2/ansible_variable_overrides_controller.rb

@@ -193,6 +193,10 @@ module ForemanAnsibleDirector
             }
           )
         end
+
+        def controller_permission
+          'ansible_director_variable_overrides'
+        end
       end
     end
   end

data/app/controllers/foreman_ansible_director/api/v2/ansible_variables_controller.rb

@@ -78,6 +78,10 @@ module ForemanAnsibleDirector
         def resource_class
           ::ForemanAnsibleDirector::AnsibleVariable
         end
+
+        def controller_permission
+          'ansible_director_variables'
+        end
       end
     end
   end

data/app/controllers/foreman_ansible_director/api/v2/assignments_controller.rb

@@ -8,24 +8,30 @@ module ForemanAnsibleDirector
 
         resource_description { resource_id 'AD Ansible Content Assignments' }
 
-        # region ApiDoc: GET /api/v2/ansible_director/assignments
-        api :GET, '/v2/ansible_director/assignments', N_('List resolved Ansible content assignments for a target')
+        # region ApiDoc: GET /api/v2/ansible_director/assignments/:target/:target_id
+        api :GET, '/v2/ansible_director/assignments/:target/:target_id',
+          N_('List Ansible content assignments for a target')
         # TRANSLATORS: ApiDoc, do not translate!
         description <<~DESC
-          Retrieve all Ansible content units *resolved* for a given target (host or hostgroup).
-          This includes content inherited through the assignment hierarchy or direct assignments.
+          Retrieve all Ansible content units for a given target (host or hostgroup).
+          This includes content inherited through the assignment hierarchy and direct assignments.
+          If resolve is true, the server will try to map the assignment to an actual content unit available to target.
         DESC
         param :target,
-          %w[HOST HOSTGROUP],
+          %w[host hostgroup],
           desc: N_('Type of the target entity.'),
           required: true
         param :target_id,
           :number,
           desc: N_('ID of the target entity.'),
           required: true
+        param :resolve,
+          :boolean,
+          desc: N_('Resolve content units for assignments.'),
+          required: false
         # TRANSLATORS: ApiDoc, do not translate!
         example <<~EXAMPLE
-          GET /api/v2/ansible_director/assignments?target=HOST&target_id=123
+          GET /api/v2/ansible_director/assignments/host/1
         EXAMPLE
         # endregion
         def assignments
@@ -34,130 +40,65 @@ module ForemanAnsibleDirector
             target_id: params[:target_id]
           )
           # TODO: Null check target
-          @assignments = target.resolved_ansible_content
-        end
-
-        # region ApiDoc: POST /api/v2/ansible_director/assignments
-        api :POST, '/v2/ansible_director/assignments', N_('Assign Ansible content to a target')
-        # TRANSLATORS: ApiDoc, do not translate!
-        description <<~DESC
-          Assign Ansible content from a source (e.g., a lifecycle environment) to a target.
-        DESC
-        param :assignment, Hash, desc: N_('Assignment definition'), required: true do
-          param :source, Hash, desc: N_('Source (provider of content)'), required: true do
-            param :type,
-              %w[ACR],
-              desc: N_('Type of source. Currently, only Ansible collection roles (ACR) are supported as sources.'),
-              example: 'ACR',
-              required: true
-            param :id,
-              :number,
-              desc: N_('ID of the source entity.'),
-              example: 5,
-              required: true
-          end
-          param :target, Hash, desc: N_('Target (receiver of content)'), required: true do
-            param :type,
-              %w[HOST HOSTGROUP],
-              desc: N_('Type of target. Both hosts (HOST) and hostgroups (HOSTGROUP) are supported as targets.'),
-              example: 'HOST',
-              required: true
-            param :id,
-              :number,
-              desc: N_('ID of the target entity.'),
-              example: 6,
-              required: true
-          end
-        end
-        # TRANSLATORS: ApiDoc, do not translate!
-        example <<~EXAMPLE
-          {
-            "assignment": {
-              "source": {
-                "type": "ACR",
-                "id": 109
-              },
-              "target": {
-                "type": "HOST",
-                "id": 1
-              }
-            }
-          }
-        EXAMPLE
-        # endregion
-        def assign
-          assignment = assignment_params
-
-          source = ::ForemanAnsibleDirector::AssignmentService.find_target(
-            target_type: assignment[:source][:type],
-            target_id: assignment[:source][:id]
-          )
-
-          target = ::ForemanAnsibleDirector::AssignmentService.find_target(
-            target_type: assignment[:target][:type],
-            target_id: assignment[:target][:id]
-          )
-
-          ::ForemanAnsibleDirector::AssignmentService.create_assignment(
-            consumable: source,
-            assignable: target
+          @assignments, @resolved_assignments, @hierarchy = ::ForemanAnsibleDirector::AssignmentService.assignments_for(
+            target: target,
+            resolve: ::Foreman::Cast.to_bool(params[:resolve])
           )
         end
 
-        # region ApiDoc: POST /api/v2/ansible_director/assignments/bulk
-        api :POST, '/v2/ansible_director/assignments/bulk', N_('Bulk assign Ansible content')
+        # region ApiDoc: POST /api/v2/ansible_director/assignments/:target/:target_id
+        api :POST, '/v2/ansible_director/assignments/:target/:target_id', N_('Assign Ansible content.')
         # TRANSLATORS: ApiDoc, do not translate!
         description <<~DESC
-          Bulk-assign Ansible content from a source (e.g., a lifecycle environment) to targets.
-          Equivalent to calling `/assign` multiple times.
+          Create Ansible content assignments for a target.
+          An assignment represents an Ansible role or Ansible collection role.
+          The version of this role is determined dynamically.
         DESC
-        param :assignments, Array, desc: N_('Array of assignment objects'), required: true do
-          param :source, Hash, desc: N_('Source (provider of content)'), required: true do
-            param :type,
-              %w[ACR],
-              desc: N_('Type of source. Currently, only Ansible collection roles (ACR) are supported as sources.'),
-              example: 'ACR',
-              required: true
-            param :id,
-              :number,
-              desc: N_('ID of the source entity.'),
-              example: 5,
-              required: true
-          end
-          param :target, Hash, desc: N_('Target (receiver of content)'), required: true do
-            param :type,
-              %w[HOST HOSTGROUP],
-              desc: N_('Type of target. Both hosts (HOST) and hostgroups (HOSTGROUP) are supported as targets.'),
-              example: 'HOST',
-              required: true
-            param :id,
-              :number,
-              desc: N_('ID of the target entity.'),
-              example: 6,
-              required: true
-          end
+        param :assignments, Array, desc: N_('Array of assignment objects.'), required: true do
+          param :assignable_type,
+            %w[ForemanAnsibleDirector::AnsibleCollectionRole ForemanAnsibleDirector::AnsibleRole],
+            desc: N_('Type of the Ansible content unit.'),
+            required: true
+          param :assignable_namespace,
+            String,
+            desc: N_('Namespace of the Ansible content unit.'),
+            required: true
+          param :assignable_name,
+            String,
+            desc: N_('Name of the Ansible content unit.'),
+            required: true
+          param :assignable_role_name,
+            String,
+            desc: <<~DESC,
+              Only required if assignable_type = "ForemanAnsibleDirector::AnsibleCollectionRole".
+              An identifier of a role in the supplied collection.
+              $assignable_namespace.$assignable_name.$assignable_role_name must form a fully qualified role name.
+            DESC
+            required: false
         end
         # TRANSLATORS: ApiDoc, do not translate!
         example <<~EXAMPLE
           {
             "assignments": [
               {
-                "source": {
-                  "type": "ACR",
-                  "id": 109
-                },
-                "target": {
-                  "type": "HOST",
-                  "id": 1
-                }
+                "assignable_type": "ForemanAnsibleDirector::AnsibleCollectionRole",
+                "assignable_namespace": "manala",
+                "assignable_name": "roles",
+                "assignable_role_name": "motd"
               }
             ]
           }
         EXAMPLE
         # endregion
-        def assign_bulk
+        def assign
+          target = ::ForemanAnsibleDirector::AssignmentService.find_target(
+            target_type: params[:target],
+            target_id: params[:target_id]
+          )
+
           assignments = bulk_assignment_params
           ::ForemanAnsibleDirector::AssignmentService.create_bulk_assignments(
+            target: target,
             assignments: assignments
           )
         end
@@ -194,10 +135,7 @@ module ForemanAnsibleDirector
           return [] if params[:assignments].empty?
 
           params.require(:assignments).map do |assignment|
-            assignment.permit(
-              source: %i[type id],
-              target: %i[type id]
-            )
+            assignment.permit(:assignable_type, :assignable_namespace, :assignable_name, :assignable_role_name)
           end
         end
       end

data/app/controllers/foreman_ansible_director/api/v2/execution_environments_controller.rb

@@ -6,7 +6,7 @@ module ForemanAnsibleDirector
       class ExecutionEnvironmentsController < AnsibleDirectorApiController
         include ::Api::Version2
 
-        before_action :find_resource, only: %i[update destroy]
+        before_action :find_resource, only: %i[show update destroy]
         before_action :find_organization, only: %i[create]
 
         resource_description { resource_id 'AD Ansible Execution Environments' }
@@ -20,6 +20,13 @@ module ForemanAnsibleDirector
           @execution_environments = resource_scope_for_index
         end
 
+        # region ApiDoc: GET /api/v2/ansible_director/execution_environments/:id
+        api :GET, '/v2/ansible_director/execution_environments/:id', N_('Show details of an execution environment')
+        param :id, :number, desc: N_('Execution Environment identifier.'), required: true
+        # endregion
+        def show
+        end
+
         # region ApiDoc: POST /api/v2/ansible_director/execution_environments
         api :POST, '/v2/ansible_director/execution_environments', N_('Create an Execution Environment')
         param :organization_id, :number, desc: N_('Organization identifier'), required: true

data/app/controllers/foreman_ansible_director/api/v2/lifecycle_environment_paths_controller.rb

@@ -105,7 +105,7 @@ module ForemanAnsibleDirector
         # TRANSLATORS: ApiDoc, do not translate!
         description <<~DESC
           Promote content between environments in a lifecycle path.
-          If the 'ad_lce_path_force_incremental' setting is false, 'target_environment' must be the immediate successor to 'source_environment'.
+          If the 'ansible_director_lce_path_force_incremental' setting is false, 'target_environment' must be the immediate successor to 'source_environment'.
         DESC
         param :promote, Hash, desc: N_('Promotion parameters'), required: true do
           param :source_environment_id,

data/app/controllers/foreman_ansible_director/api/v2/lifecycle_environments_controller.rb

@@ -219,19 +219,22 @@ module ForemanAnsibleDirector
           required: true
         param :target_id,
           :number,
-          desc: N_('ID of the target entity.'),
+          desc: N_('ID of the target entity. Special values are "none" and "inherit".'),
           required: true
         # TRANSLATORS: ApiDoc, do not translate!
         example <<~EXAMPLE
           {
-            "target_type": "HOST",
+            "target_type": "host",
             "target_id": 7
           }
         EXAMPLE
         # endregion
         def assign
-          if params[:id] == 'library'
-            ::ForemanAnsibleDirector::LifecycleEnvironmentService.assign_library @target
+          case params[:id]
+          when 'none'
+            ::ForemanAnsibleDirector::LifecycleEnvironmentService.assign_none(target: @target)
+          when 'inherit'
+            ::ForemanAnsibleDirector::LifecycleEnvironmentService.assign_inherit(target: @target)
           else
             lce = ::ForemanAnsibleDirector::LifecycleEnvironment.find_by(id: params[:id])
             ::ForemanAnsibleDirector::LifecycleEnvironmentService.assign(

data/app/controllers/foreman_ansible_director/api/v2/status_controller.rb

@@ -13,15 +13,6 @@ module ForemanAnsibleDirector
             execution_environments: ::ForemanAnsibleDirector::ExecutionEnvironment.count,
           }
         end
-
-        def context
-          @context = {
-            settings: {
-              ad_default_galaxy_url: Setting[:ad_default_galaxy_url],
-              ad_default_ansible_core_version: Setting[:ad_default_ansible_core_version],
-            },
-          }
-        end
       end
     end
   end

data/app/lib/foreman_ansible_director/abstract/content_resolution_node.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ForemanAnsibleDirector
+  module Abstract
+    module ContentResolutionNode
+      def cr_immediate_predecessor
+        raise NotImplementedError
+      end
+
+      def cr_content_assignments
+        raise NotImplementedError
+      end
+
+      def cr_name
+        raise NotImplementedError
+      end
+
+      def cr_content_source
+        raise NotImplementedError
+      end
+
+      def cr_content_source_state
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/app/lib/foreman_ansible_director/abstract/content_source.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module ForemanAnsibleDirector
+  module Abstract
+    module ContentSource
+      def cs_content_unit_versions
+        raise NotImplementedError
+      end
+
+      def cs_name
+        raise NotImplementedError
+      end
+
+      def cs_execution_environment
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/bulk/destroy.rb

@@ -5,22 +5,26 @@ module ForemanAnsibleDirector
     module AnsibleContentUnit
       module Bulk
         class Destroy < ::ForemanAnsibleDirector::Actions::Base::AnsibleDirectorAction
+          include Dynflow::Action::V2::WithSubPlans
+
           input_format do
-            param :resolved_content_units, type: Array
+            param :resolved_content_units, type: Hash
             param :organization_id, type: Integer
           end
 
-          def plan(args)
-            concurrence do
-              args[:resolved_content_units].each do |unit_id, instruction|
-                complete = instruction.delete(:complete)
-                plan_action(::ForemanAnsibleDirector::Actions::AnsibleContentUnit::Destroy,
-                  unit_id: unit_id,
-                  unit_version_ids: instruction[:versions],
-                  complete: complete)
-              end
+          def create_sub_plans
+            input[:resolved_content_units].each do |unit_id, instruction|
+              complete = instruction.delete(:complete)
+              trigger(::ForemanAnsibleDirector::Actions::AnsibleContentUnit::Destroy,
+                unit_id: unit_id,
+                unit_version_ids: instruction[:versions],
+                complete: complete)
             end
           end
+
+          def total_count
+            input[:resolved_content_units].keys.length
+          end
         end
       end
     end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/bulk/import.rb

@@ -5,20 +5,31 @@ module ForemanAnsibleDirector
     module AnsibleContentUnit
       module Bulk
         class Import < ::ForemanAnsibleDirector::Actions::Base::AnsibleDirectorAction
+          include Dynflow::Action::V2::WithSubPlans
+
           input_format do
-            param :resolved_content_units, type: Array
+            param :resolved_content_units, type: Hash
             param :organization_id, type: Integer
           end
 
-          def plan(args)
-            concurrence do
-              args[:resolved_content_units].each do |unit|
-                plan_action(::ForemanAnsibleDirector::Actions::AnsibleContentUnit::Import,
-                  unit: unit,
-                  organization_id: args[:organization_id])
-              end
+          def create_sub_plans
+            input[:resolved_content_units].each do |unit|
+              trigger(::ForemanAnsibleDirector::Actions::AnsibleContentUnit::Import,
+                # Downstream actions expect SimpleAnsibleContentUnit objects, but input has already been serialized
+                unit: ::ForemanAnsibleDirector::AnsibleContent::SimpleAnsibleContentUnit.new(
+                  unit_type: unit[:unit_type].to_sym,
+                  unit_name: unit[:unit_name],
+                  unit_source_type: unit[:source_type].to_sym,
+                  unit_source: unit[:source],
+                  unit_versions: unit[:versions]
+                ),
+                organization_id: input[:organization_id])
             end
           end
+
+          def total_count
+            input[:resolved_content_units].size
+          end
         end
       end
     end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/import.rb

@@ -14,7 +14,7 @@ module ForemanAnsibleDirector
           organization_id = args[:organization_id]
           existing_unit = ::ForemanAnsibleDirector::ContentUnit.find_by(namespace: unit.unit_namespace,
             name: unit.unit_name)
-          op_type = operation_type existing_unit, unit
+          op_type = operation_type! existing_unit, unit
 
           case op_type
           when :import
@@ -42,42 +42,27 @@ module ForemanAnsibleDirector
             else
               raise NotImplementedError
             end
-          else
-            raise NotImplementedError
           end
         end
 
         private
 
-        # Helper method to decide the operation type:
-        # e = Unit exists; v = Unit.version exists; s = Force override
-        # | e | v | s | operation |
-        # | 0 | 0 | 0 | :import |
-        # | 0 | 0 | 1 | :import |
-        # | 0 | 1 | 0 | INVALID |
-        # | 0 | 1 | 1 | INVALID |
-        # | 1 | 0 | 0 | :update |
-        # | 1 | 0 | 1 | :update |
-        # | 1 | 1 | 0 | NOOP    |
-        # | 1 | 1 | 1 | :update |
-        # TODO: Unit test this
-        def operation_type(existing_unit, unit)
-          force_override = Setting[:ad_content_import_override]
-
+        # This function also mutates the versions array of unit to filter out existing units
+        def operation_type!(existing_unit, unit)
           return :import unless existing_unit
 
-          existing_unit_versions = existing_unit.content_unit_versions.select do |x|
-            unit.versions.include? x.version
-          end
+          existing_versions = existing_unit.content_unit_versions.map(&:version).map(&:to_s)
 
-          filtered_versions = existing_unit_versions.select do |x|
-            unit.source_type == x.source_type
-          end
+          unit.versions = unit.versions.map(&:to_s) - existing_versions
 
-          return :import if filtered_versions.empty?
-
-          return :noop if !existing_unit_versions.empty? && !force_override
-          :update
+          if unit.versions.empty?
+            :noop
+            # Also import if source_type = :galaxy and no galaxy version exists
+          elsif unit.source_type == :git || !(existing_unit.content_unit_versions.pluck(:source_type).include? 'galaxy')
+            :import
+          else
+            :update
+          end
         end
       end
     end

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/import_providers/galaxy/update_collection.rb

@@ -18,9 +18,19 @@ module ForemanAnsibleDirector
               organization_id = args[:organization_id]
 
               # For collections coming from Ansible Galaxy, we can reuse the existing Pulp objects
-              repository_href = existing_unit.content_unit_versions.first.pulp_repository_href
-              remote_href = existing_unit.content_unit_versions.first.pulp_remote_href
-              distribution_href = existing_unit.content_unit_versions.first.pulp_distribution_href
+              repository_href = existing_unit
+                                .content_unit_versions
+                                .where(source_type: 'galaxy')
+                                .first
+                                .pulp_repository_href
+              remote_href = existing_unit.content_unit_versions
+                                         .where(source_type: 'galaxy')
+                                         .first
+                                         .pulp_remote_href
+              distribution_href = existing_unit.content_unit_versions
+                                               .where(source_type: 'galaxy')
+                                               .first
+                                               .pulp_distribution_href
 
               sequence do
                 _remote_update_action = plan_action(

data/app/lib/foreman_ansible_director/actions/ansible_content_unit/index/index_static.rb

@@ -181,10 +181,18 @@ module ForemanAnsibleDirector
                 existing_unit_versions.include?(unit_version[:version])
               end
 
-              source = existing_unit.content_unit_versions.first.source
-              repository_href = existing_unit.content_unit_versions.first.pulp_repository_href
-              remote_href = existing_unit.content_unit_versions.first.pulp_remote_href
-              distribution_href = existing_unit.content_unit_versions.first.pulp_distribution_href
+              source = existing_unit.content_unit_versions
+                                    .where(source_type: 'galaxy')
+                                    .first.source
+              repository_href = existing_unit.content_unit_versions
+                                             .where(source_type: 'galaxy')
+                                             .first.pulp_repository_href
+              remote_href = existing_unit.content_unit_versions
+                                         .where(source_type: 'galaxy')
+                                         .first.pulp_remote_href
+              distribution_href = existing_unit.content_unit_versions
+                                               .where(source_type: 'galaxy')
+                                               .first.pulp_distribution_href
 
               new_unit_versions.each do |new_version|
                 collection_version = ::ForemanAnsibleDirector::ContentService.create_ansible_content_unit_version(
@@ -210,11 +218,11 @@ module ForemanAnsibleDirector
                   next if cr_variables.nil?
 
                   ActiveRecord::Base.transaction do
-                    cr_variables.each do |variable_name, variable_value|
+                    cr_variables.each do |variable_name, variable|
                       ::ForemanAnsibleDirector::VariableService.create_variable(
                         key: variable_name,
-                        type: 'yaml',
-                        default_value: variable_value,
+                        type: variable[:type],
+                        default_value: variable[:value],
                         owner: collection_role_record
                       )
                     end