Skip to content

Commit dd6fcc0

Browse files
committed
Use theforeman upstream cloud_connector role
1 parent cb363b9 commit dd6fcc0

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

app/services/foreman_rh_cloud/cloud_connector.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ def install
1313
composer = nil
1414

1515
input = {
16-
:satellite_cloud_connector_user => service_user.login,
17-
:satellite_cloud_connector_password => token_value,
16+
:cloud_connector_user => service_user.login,
17+
:cloud_connector_password => token_value,
1818
}
1919

2020
if (http_proxy = ForemanRhCloud.proxy_setting(logger: Foreman::Logging.logger('app')))
21-
input[:satellite_cloud_connector_http_proxy] = http_proxy
21+
input[:cloud_connector_http_proxy] = http_proxy
2222
end
2323

2424
Taxonomy.as_taxonomy(target_host.organization, target_host.location) do

app/views/job_templates/cloud_connector.erb

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
name: Configure Cloud Connector
33
snippet: false
44
template_inputs:
5-
- name: satellite_cloud_connector_user
5+
- name: cloud_connector_user
66
required: true
77
input_type: user
88
advanced: false
99
value_type: plain
1010
hidden_value: false
11-
- name: satellite_cloud_connector_password
11+
- name: cloud_connector_password
1212
required: true
1313
input_type: user
1414
advanced: false
1515
value_type: plain
1616
hidden_value: true
17-
- name: satellite_cloud_connector_http_proxy
17+
- name: cloud_connector_http_proxy
1818
required: false
1919
input_type: user
2020
advanced: true
@@ -32,6 +32,9 @@ feature: ansible_configure_cloud_connector
3232
- hosts: all
3333
become: true
3434
vars:
35-
satellite_cloud_connector_url: "<%= foreman_server_url %>"
35+
foreman_cloud_connector_url: "<%= foreman_server_url %>"
36+
foreman_cloud_connector_user: "<%= cloud_connector_user %>"
37+
foreman_cloud_connector_password: "<%= cloud_connector_password %>"
38+
foreman_cloud_connector_http_proxy: "<%= cloud_connector_http_proxy %>"
3639
roles:
37-
- redhat.satellite_operations.cloud_connector
40+
- theforeman.operations.cloud_connector

0 commit comments

Comments
 (0)