enable-monitoring-with-cockpit

securesign · Dec 2, 2024 · 7f53c05 · 7f53c05
1 parent 61f3d8a
commit 7f53c05
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/roles/tas_single_node/defaults/main.yml b/roles/tas_single_node/defaults/main.yml
@@ -86,3 +86,12 @@ tas_single_node_client_server_image:
   "registry.redhat.io/rhtas/client-server-rhel9@sha256:9537329d0166b8d41ffd5f5d79c052fc27abe426a20cba5733c84030013c4e29"
 
 tas_single_node_podman: {}
+
+tas_single_node_cockpit:
+  enabled: false # install redhat.rhel_system_roles before enabling
+  cockpit_packages:
+    - cockpit-storaged
+    - cockpit-podman
+    - cockpit
+  cockpit_manage_firewall: true
+  cockpit_port: 9090
diff --git a/roles/tas_single_node/tasks/main.yml b/roles/tas_single_node/tasks/main.yml
@@ -9,6 +9,15 @@
   ansible.builtin.include_tasks: os.yml
   when: not tas_single_node_skip_os_install
 
+- name: Install Cockpit
+  ansible.builtin.include_role:
+    name: redhat.rhel_system_roles.cockpit
+  vars:
+    cockpit_packages: "{{ tas_single_node_cockpit.cockpit_packages }}"
+    cockpit_manage_firewall: "{{ tas_single_node_cockpit.cockpit_manage_firewall }}"
+    cockpit_port: "{{ tas_single_node_cockpit.cockpit_port }}"
+  when: tas_single_node_cockpit.enabled | bool
+
 - name: Create Certificates
   ansible.builtin.include_tasks: certificates.yml
 

diff --git a/roles/tas_single_node/tasks/os.yml b/roles/tas_single_node/tasks/os.yml
@@ -8,14 +8,6 @@
     name: "{{ tas_single_node_system_packages }}"
     state: latest
 
-- name: Install Cockpit
-  ansible.builtin.include_role:
-    name: cockpit
-  vars:
-    cockpit_packages: "{{ tas_single_node_cockpit.cockpit_packages }}"
-    cockpit_manage_firewall: "{{ tas_single_node_cockpit.cockpit_manage_firewall }}"
-  when: tas_single_node_cockpit.enabled | bool
-
 - name: Configure /etc/hosts DNS block
   ansible.builtin.blockinfile:
     dest: /etc/hosts

diff --git a/roles/tas_single_node/vars/main.yml b/roles/tas_single_node/vars/main.yml
@@ -6,12 +6,13 @@ tas_single_node_system_packages:
   - firewalld
 
 tas_single_node_cockpit:
-  enabled: false
+  enabled: false # install redhat.rhel_system_roles before enabling
   cockpit_packages:
     - cockpit-storaged
     - cockpit-podman
     - cockpit
   cockpit_manage_firewall: true
+  cockpit_port: 9090
 
 tas_single_node_rekor_signer_type: file # to be exposed to users later on
 tas_single_node_rekor_templates: