From dd6fcc0597ba8b5783b0d4f800ca01df93456339 Mon Sep 17 00:00:00 2001
From: Bernhard Suttner <suttner@atix.de>
Date: Tue, 17 Sep 2024 15:56:06 +0200
Subject: [PATCH] Use theforeman upstream cloud_connector role

---
 app/services/foreman_rh_cloud/cloud_connector.rb |  6 +++---
 app/views/job_templates/cloud_connector.erb      | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/services/foreman_rh_cloud/cloud_connector.rb b/app/services/foreman_rh_cloud/cloud_connector.rb
index 49fe8852..895c0971 100644
--- a/app/services/foreman_rh_cloud/cloud_connector.rb
+++ b/app/services/foreman_rh_cloud/cloud_connector.rb
@@ -13,12 +13,12 @@ def install
       composer = nil
 
       input = {
-        :satellite_cloud_connector_user => service_user.login,
-        :satellite_cloud_connector_password => token_value,
+        :cloud_connector_user => service_user.login,
+        :cloud_connector_password => token_value,
       }
 
       if (http_proxy = ForemanRhCloud.proxy_setting(logger: Foreman::Logging.logger('app')))
-        input[:satellite_cloud_connector_http_proxy] = http_proxy
+        input[:cloud_connector_http_proxy] = http_proxy
       end
 
       Taxonomy.as_taxonomy(target_host.organization, target_host.location) do
diff --git a/app/views/job_templates/cloud_connector.erb b/app/views/job_templates/cloud_connector.erb
index 65d74f24..ddb16dc4 100644
--- a/app/views/job_templates/cloud_connector.erb
+++ b/app/views/job_templates/cloud_connector.erb
@@ -2,19 +2,19 @@
 name: Configure Cloud Connector
 snippet: false
 template_inputs:
-- name: satellite_cloud_connector_user
+- name: cloud_connector_user
   required: true
   input_type: user
   advanced: false
   value_type: plain
   hidden_value: false
-- name: satellite_cloud_connector_password
+- name: cloud_connector_password
   required: true
   input_type: user
   advanced: false
   value_type: plain
   hidden_value: true
-- name: satellite_cloud_connector_http_proxy
+- name: cloud_connector_http_proxy
   required: false
   input_type: user
   advanced: true
@@ -32,6 +32,9 @@ feature: ansible_configure_cloud_connector
 - hosts: all
   become: true
   vars:
-    satellite_cloud_connector_url: "<%= foreman_server_url %>"
+    foreman_cloud_connector_url: "<%= foreman_server_url %>"
+    foreman_cloud_connector_user: "<%= cloud_connector_user %>"
+    foreman_cloud_connector_password: "<%= cloud_connector_password %>"
+    foreman_cloud_connector_http_proxy: "<%= cloud_connector_http_proxy %>"
   roles:
-    - redhat.satellite_operations.cloud_connector
+    - theforeman.operations.cloud_connector