fix HAWTIO_ROLE[S] (on Artemis 2.39.0+)

Author: fraenki

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+* Add HAWTIO_ROLES to artemis profile (on 2.39.0 and later)
+
+### Removed
+* Remove HAWTIO_ROLE from artemis profile (on 2.39.0 and later)
+
 ## [v3.0.0] - 2025-08-12
 WARNING: This release may contain breaking changes (see below).
 

manifests/instance.pp

@@ -362,7 +362,6 @@
       File["instance ${name} bootstrap.xml"],
       File["instance ${name} jolokia-access.xml"],
       File["instance ${name} login.config"],
-      File_line["instance ${name} set HAWTIO_ROLE"],
       File_line["instance ${name} set JAVA_ARGS"],
     ]
     $_service_require_pre = [
@@ -371,7 +370,6 @@
       File["instance ${name} bootstrap.xml"],
       File["instance ${name} jolokia-access.xml"],
       File["instance ${name} login.config"],
-      File_line["instance ${name} set HAWTIO_ROLE"],
       File_line["instance ${name} set JAVA_ARGS"],
     ]
 
@@ -543,6 +541,45 @@
       }
     }
 
+    # Changes for Artemis 2.39.0 and later.
+    if (versioncmp($activemq::version, '2.39.0') >= 0) {
+      # Remove old HAWTIO role.
+      file_line { "instance ${name} remove HAWTIO_ROLE":
+        ensure            => 'absent',
+        path              => $artemis_profile,
+        match             => '^HAWTIO_ROLE=',
+        match_for_absence => true,
+        require           => [
+          Exec["create instance ${name}"]
+        ],
+      }
+      # Configure HAWTIO roles.
+      file_line { "instance ${name} set HAWTIO_ROLES":
+        ensure             => 'present',
+        path               => $artemis_profile,
+        line               => "HAWTIO_ROLES=\'${$activemq::hawtio_role}\'",
+        match              => '^HAWTIO_ROLES=',
+        after              => '^# Hawtio Properties',
+        append_on_no_match => true,
+        require            => [
+          Exec["create instance ${name}"]
+        ],
+      }
+    } else {
+      # Configure HAWTIO role (legacy).
+      file_line { "instance ${name} set HAWTIO_ROLE":
+        ensure             => 'present',
+        path               => $artemis_profile,
+        line               => "HAWTIO_ROLE=\'${$activemq::hawtio_role}\'",
+        match              => '^HAWTIO_ROLE=',
+        append_on_no_match => false,
+        require            => [
+          Exec["create instance ${name}"]
+        ],
+      }
+    }
+
+    # Changes for Artemis 2.42.0 and later.
     if (versioncmp($activemq::version, '2.42.0') >= 0) {
       # Remove obsolete variables from profile.
       file_line { "instance ${name} remove ARTEMIS_INSTANCE_URI":
@@ -574,18 +611,6 @@
       }
     }
 
-    # Configure HAWTIO role.
-    file_line { "instance ${name} set HAWTIO_ROLE":
-      ensure             => 'present',
-      path               => $artemis_profile,
-      line               => "HAWTIO_ROLE=\'${$activemq::hawtio_role}\'",
-      match              => '^HAWTIO_ROLE=',
-      append_on_no_match => false,
-      require            => [
-        Exec["create instance ${name}"]
-      ],
-    }
-
     # Configure ARTEMIS_HOME.
     file_line { "instance ${name} set ARTEMIS_HOME":
       ensure             => 'present',