From e1bdca2d760ee3e2060e950c4dd23bdb3abefdac Mon Sep 17 00:00:00 2001 From: Fabien Dupont Date: Tue, 14 May 2019 15:11:34 -0400 Subject: [PATCH] Renaming osp_ca_bundle to openstack_tls_ca_certs --- app/models/conversion_host.rb | 4 ++-- app/models/conversion_host/configurations.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/conversion_host.rb b/app/models/conversion_host.rb index 44cf2f55a7ad..efab0aa8022a 100644 --- a/app/models/conversion_host.rb +++ b/app/models/conversion_host.rb @@ -202,7 +202,7 @@ def check_conversion_host_role(miq_task_id = nil) tag_resource_as('disabled') end - def enable_conversion_host_role(vmware_vddk_package_url = nil, vmware_ssh_private_key = nil, osp_ca_bundle = nil, miq_task_id = nil) + def enable_conversion_host_role(vmware_vddk_package_url = nil, vmware_ssh_private_key = nil, openstack_tls_ca_certs = nil, miq_task_id = nil) raise "vmware_vddk_package_url is mandatory if transformation method is vddk" if vddk_transport_supported && vmware_vddk_package_url.nil? raise "vmware_ssh_private_key is mandatory if transformation_method is ssh" if ssh_transport_supported && vmware_ssh_private_key.nil? playbook = "/usr/share/v2v-conversion-host-ansible/playbooks/conversion_host_enable.yml" @@ -211,7 +211,7 @@ def enable_conversion_host_role(vmware_vddk_package_url = nil, vmware_ssh_privat :v2v_transport_method => source_transport_method, :v2v_vddk_package_url => vmware_vddk_package_url, :v2v_ssh_private_key => vmware_ssh_private_key, - :v2v_ca_bundle => osp_ca_bundle || resource.ext_management_system.connection_configurations['default'].certificate_authority + :v2v_ca_bundle => openstack_tls_ca_certs || resource.ext_management_system.connection_configurations['default'].certificate_authority }.compact ansible_playbook(playbook, extra_vars, miq_task_id) ensure diff --git a/app/models/conversion_host/configurations.rb b/app/models/conversion_host/configurations.rb index aab7161824be..27109073418c 100644 --- a/app/models/conversion_host/configurations.rb +++ b/app/models/conversion_host/configurations.rb @@ -68,7 +68,7 @@ def enable(params, auth_user = nil) ssh_key = params.delete(:conversion_host_ssh_private_key) - osp_ca_bundle = params.delete(:osp_ca_bundle) + openstack_tls_ca_certs = params.delete(:openstack_tls_ca_certs) new(params).tap do |conversion_host| if ssh_key @@ -80,7 +80,7 @@ def enable(params, auth_user = nil) ) end - conversion_host.enable_conversion_host_role(vmware_vddk_package_url, vmware_ssh_private_key, osp_ca_bundle, miq_task_id) + conversion_host.enable_conversion_host_role(vmware_vddk_package_url, vmware_ssh_private_key, openstack_tls_ca_certs, miq_task_id) conversion_host.save! if miq_task_id