Merge pull request #23 from ehelms/update-to-v1.2.0

Update to v1.2.0

CHANGELOG.rst

@@ -5,6 +5,14 @@ redhat.satellite-operations Release Notes
 .. contents:: Topics
 
 
+v1.2.0
+======
+
+Minor Changes
+-------------
+
+- add HTTP proxy support for cloud connector
+
 v1.1.1
 ======
 

changelogs/changelog.yaml

@@ -24,14 +24,19 @@ releases:
     - installer-checkmode-fix.yml
     release_date: '2022-03-25'
   1.1.0:
-    release_date: '2022-04-25'
     changes:
       minor_changes:
       - cloud_connector - new role for installing Cloud Connector (https://github.com/theforeman/foreman-operations-collection/pull/85)
     fragments:
     - 85-fix-forwarder-url.yml
+    release_date: '2022-04-25'
   1.1.1:
     changes:
       bugfixes:
       - update FORWARDER_URL for cloud connector
     release_date: '2022-05-09'
+  1.2.0:
+    changes:
+      minor_changes:
+      - add HTTP proxy support for cloud connector
+    release_date: '2022-05-16'

galaxy.yml

@@ -11,7 +11,7 @@ authors:
   - "Kyle Williams <[email protected]>"
   - "Matthias Dellweg <[email protected]>"
   - "willtome <[email protected]>"
-version: "1.1.1"
+version: "1.2.0"
 license:
   - "GPL-3.0-or-later"
 tags:

roles/cloud_connector/README.md

@@ -12,6 +12,10 @@ Required:
 - `satellite_cloud_connector_user`: The username cloud connector will use to talk to Satellite API.
 - `satellite_cloud_connector_password`: The password cloud connector will use to talk to Satellite API.
 
+Optional:
+
+- `satellite_cloud_connector_http_proxy`: HTTP proxy for RHC to use
+
 Example Playbooks
 -----------------
 

roles/cloud_connector/handlers/main.yml

@@ -0,0 +1,6 @@
+---
+- name: Restart rhcd
+  ansible.builtin.service:
+    name: rhcd
+    state: restarted
+    daemon_reload: true

roles/cloud_connector/tasks/http_proxy.yml

@@ -0,0 +1,18 @@
+---
+- name: Create systemd drop-in directory
+  ansible.builtin.file:
+    state: directory
+    path: /etc/systemd/system/rhcd.service.d
+    owner: root
+    group: root
+    mode: 0755
+
+- name: Deploy HTTP proxy systemd drop-in file
+  ansible.builtin.template:
+    src: "proxy.conf.j2"
+    dest: /etc/systemd/system/rhcd.service.d/proxy.conf
+    owner: root
+    group: root
+    mode: 0640
+  notify:
+    - Restart rhcd

roles/cloud_connector/tasks/main.yml

@@ -58,5 +58,9 @@
   vars:
     client_id: "{{ cert_output.stdout.replace('subject= /CN=', '') }}"
 
+- name: Configure HTTP proxy
+  include: http_proxy.yml
+  when: satellite_cloud_connector_http_proxy is defined
+
 - name: Cleanup receptor
   include: cleanup_receptor.yml

roles/cloud_connector/templates/proxy.conf.j2

@@ -0,0 +1,3 @@
+[Service]
+Environment=HTTPS_PROXY={{ satellite_cloud_connector_http_proxy }}
+Environment=NO_PROXY={{ satellite_cloud_connector_url }}