Development: Rename broker to registry in firewall

examples/multi-node-production-icl/playbooks/artemis-cluster-broker.yml

@@ -6,21 +6,9 @@
   roles:
     - role: ls1intum.artemis.broker
 
-    - role: ls1intum.artemis.proxy
-      vars:
-        proxy_forward_ssh: false
-        proxy_generate_dh_param: "{{ broker.proxy.generate_dh_param }}"
-        servers:
-          - name: "_"
-            ssl_certificate_path: "{{ broker.proxy.ssl_certificate_path }}"
-            ssl_certificate_key_path:  "{{ broker.proxy.ssl_certificate_key_path }}"
-            default_server: true
-        proxy_target_port: 8761
-
     - role: ls1intum.artemis.firewall
       tags: firewall
       vars:
-        firewall_hostgroup: broker
         # Management Networks - used to allow SSH / HTTP access to Hosts and services
         management_network_ipv4: "{{ firewall_management_network_ipv4 }}"
         management_network_ipv6: "{{ firewall_management_network_ipv6 }}"

examples/multi-node-production-icl/playbooks/artemis-cluster-registry.yml

@@ -21,7 +21,7 @@
     - role: ls1intum.artemis.firewall
       tags: firewall
       vars:
-        firewall_hostgroup: broker
+        firewall_hostgroup: registry
         # Management Networks - used to allow SSH / HTTP access to Hosts and services
         management_network_ipv4: "{{ firewall_management_network_ipv4 }}"
         management_network_ipv6: "{{ firewall_management_network_ipv6 }}"

roles/firewall/README.md

@@ -23,16 +23,16 @@ monitoring_host_ipv6: "2a09:80c0:89:1::32"
 You have to configure a special varaible to select the firewall rule set which is applied:
 
 ```
-firewall_hostgroup:  # Can be 'broker', 'nodes', 'proxy' or left blank for default rules
+firewall_hostgroup:  # Can be 'registry', 'nodes', 'proxy' or left blank for default rules
 ```
 
 ## Example usage:
 
-Example playbook for a broker:
+Example playbook for a registry:
 
 ```
     - role: ls1intum.artemis.firewall
       tags: firewall
       vars:
-        firewall_hostgroup: broker
+        firewall_hostgroup: registry
 ```

roles/firewall/defaults/main.yml

@@ -1,6 +1,6 @@
 wireguard_port: 51820
 
-firewall_hostgroup:  # Can be 'broker', 'nodes', 'proxy' or left blank for default rules
+firewall_hostgroup:  # Can be 'registry', 'nodes', 'proxy' or left blank for default rules
 
 # Management Networks - used to allow SSH / HTTP access to Hosts and services
 management_network_ipv4: "172.24.152.0/24"

roles/firewall/tasks/deprecations.yml

@@ -0,0 +1,9 @@
+- name: Display deprecation notice
+  debug:
+    msg: "DEPRECATION NOTICE: Please use 'firewall_hostgroup: registry' instead of 'firewall_hostgroup: broker'."
+  when: firewall_hostgroup == 'broker'
+
+- name: Set default values for deprecated variables
+  set_fact:
+    firewall_hostgroup: "registry"
+  when: firewall_hostgroup == 'broker'

roles/firewall/tasks/main.yml

@@ -1,3 +1,5 @@
+- include_tasks: deprecations.yml
+
 - name: Install iptables-persistent
   become: true
   apt: