DEV-1042 last qa session for pmci process

- bugfix initialize-stage with update_deployment missing docker-compose.yml update - added env variables for - management-hostname - keycloak-hostname - kibana-hostname
3 years ago · 706b14491b
parent 3feaeedbe2
commit 706b14491b
25 changed files with 296 additions and 153 deletions
--- a/group_vars/all/management.yml
+++ b/group_vars/all/management.yml
@ -14,6 +14,13 @@ management_configurations:
  - backup
  - provisioning # legacy

+connect_workflow_env:
+  - "stage:{{ stage }}"
+  - "managementHostname:{{ shared_service_host_management }}"
+  - "kibanaHostname:{{ shared_service_hostname_kibana }}"
+  - "keycloakHostname:{{ shared_service_hostname_keycloak }}"
+  - "smardigoUserToken:{{ smardigo_auth_token_value }}"
+
 connect_connection_teams_url: "{{ netgo_msteams_hook_cd }}"
 connect_connection_awx_url: "{{ shared_service_kube_url_awx }}/"
 connect_connection_harbor_url: "{{ shared_service_url_harbor }}/v2/"
--- a/roles/connect/tasks/main.yml
+++ b/roles/connect/tasks/main.yml
@ -56,6 +56,8 @@
    current_owner: "{{ docker_owner }}"
    current_group: "{{ docker_group }}"
    current_docker: "{{ connect_docker }}"
+  tags:
+    - update_deployment

 - name: "Deploy service templates for {{ connect_id }}"
  include_role:
@ -67,6 +69,8 @@
    current_destination: "{{ connect_id }}"
    current_owner: "{{ docker_owner }}"
    current_group: "{{ docker_group }}"
+  tags:
+    - update_deployment

 - name: "Deploy certificate templates for {{ connect_id }}"
  include_role:
--- a/roles/connect/vars/main.yml
+++ b/roles/connect/vars/main.yml
@ -86,7 +86,7 @@ connect_environment: [
  "ELASTIC_MESSAGE_INDEX: \"{{ connect_elastic_message_index | default('message') }}\"",
  "ELASTIC_ANALYSIS_INDEX: \"{{ connect_elastic_analysis_index | default('analysis') }}\"",

-  "WORKFLOW_ENV: \"{{ connect_workflow_env | default('') }}\"",
+  "WORKFLOW_ENV: \"{{ (connect_workflow_env | default([])) | join(';') }}\"",

  "CONFIG_DELETE_SCOPE_ENABLED: \"{{ connect_config_delete_scope_enabled }}\"",
  "CONFIG_LOCAL_IMPORT_ENABLED: \"{{ connect_config_local_import_enabled }}\"",
--- a/roles/management/tasks/main.yaml
+++ b/roles/management/tasks/main.yaml
@ -30,7 +30,6 @@
    cluster_name: "{{ management_oidc_client_id }}"
    connect_oidc_client_secret: "{{ management_oidc_client_secret }}"
    connect_postgres_database: "{{ stage_database_management_connect_name }}"
-    connect_workflow_env: "baseUrl:{{ connect_base_url }};stage:{{ stage }};smardigoUserToken:{{ smardigo_auth_token_value }}"
    connect_config_delete_scope_enabled: true
    connect_datasource_action_enabled: true
    connect_element_template_enabled: true
--- a/smardigo/pmci/datasource/whitelabel-docker-image-tags.json
+++ b/smardigo/pmci/datasource/whitelabel-docker-image-tags.json
@ -1,16 +1,18 @@
 {
-  "name" : "whitelabel-docker-image-tags",
-  "restApi" : true,
-  "configKey" : "whitelabel-docker-image-tags",
-  "payloadType" : "POST_PROCESSING",
-  "config" : [ {
-      "name" : "datasource_key",
-      "type" : "STRING",
-      "value" : "whitelabel-docker-image-tags-plain"
+  "name": "whitelabel-docker-image-tags",
+  "restApi": true,
+  "configKey": "whitelabel-docker-image-tags",
+  "payloadType": "POST_PROCESSING",
+  "config": [
+    {
+      "name": "datasource_key",
+      "type": "STRING",
+      "value": "whitelabel-docker-image-tags-plain"
    },
    {
-      "name" : "groovy_script",
-      "type" : "STRING",
-      "value" : "def result = []\ndata.each{values ->\n  values.tags.each{ value ->\n    result.add([value: value, label: value])\n  }\n}\nresult"
-    } ]
+      "name": "groovy_script",
+      "type": "STRING",
+      "value": "def result = []\ndata.each{values ->\n  values.tags.each{ value -> {\n      def name = value;\n      if (!name.contains(\"SNAPSHOT\")) {\n          result.add([value: value, label: value])\n      }\n    }\n  }\n}\nresult"
+    }
+  ]
 }
--- a/smardigo/pmci/filter/service-change.json
+++ b/smardigo/pmci/filter/service-change.json
@ -5,7 +5,7 @@
  "dossiers" : [ {
    "configKey" : "vorgang",
    "currentUserConfig" : [ [ {
-      "key" : "data.filterTenantId",
+      "key" : "filterTenantId",
      "operation" : "in",
      "value" : "${currentUserAttributes.tenantIds}"
    } ] ],
--- a/smardigo/pmci/filter/service-create.json
+++ b/smardigo/pmci/filter/service-create.json
@ -5,7 +5,7 @@
  "dossiers" : [ {
    "configKey" : "vorgang",
    "currentUserConfig" : [ [ {
-      "key" : "data.filterTenantId",
+      "key" : "filterTenantId",
      "operation" : "in",
      "value" : "${currentUserAttributes.tenantIds}"
    } ] ],
--- a/smardigo/pmci/filter/service-delete.json
+++ b/smardigo/pmci/filter/service-delete.json
@ -5,7 +5,7 @@
  "dossiers" : [ {
    "configKey" : "vorgang",
    "currentUserConfig" : [ [ {
-      "key" : "data.filterTenantId",
+      "key" : "filterTenantId",
      "operation" : "in",
      "value" : "${currentUserAttributes.tenantIds}"
    } ] ],
--- a/smardigo/pmci/filter/service-replay-setup.json
+++ b/smardigo/pmci/filter/service-replay-setup.json
@ -5,7 +5,7 @@
  "dossiers" : [ {
    "configKey" : "vorgang",
    "currentUserConfig" : [ [ {
-      "key" : "data.filterTenantId",
+      "key" : "filterTenantId",
      "operation" : "in",
      "value" : "${currentUserAttributes.tenantIds}"
    } ] ],
--- a/smardigo/pmci/filter/service-search.json
+++ b/smardigo/pmci/filter/service-search.json
@ -5,7 +5,7 @@
  "dossiers" : [ {
    "configKey" : "vorgang",
    "currentUserConfig" : [ [ {
-      "key" : "data.filterTenantId",
+      "key" : "filterTenantId",
      "operation" : "in",
      "value" : "${currentUserAttributes.tenantIds}"
    } ] ],
--- a/smardigo/pmci/form/confirm-delete-service.json
+++ b/smardigo/pmci/form/confirm-delete-service.json
@ -0,0 +1,37 @@
+{
+  "display" : "form",
+  "configKey" : "confirm-delete-service",
+  "name" : "confirm-delete-service",
+  "components" : [ {
+    "label" : "HTML",
+    "className" : "",
+    "attrs" : [ {
+      "attr" : "",
+      "value" : ""
+    } ],
+    "content" : "<div class=\"card text-white bg-danger\">\n  <div class=\"card-body\">\n    <h5 class=\"card-title\">Sind Sie sich sicher, dass die Instanz gelöscht werden soll?</h5>\n    <p class=\"card-text\">Diese Aktion kann nicht Rückgängig gemacht werden. Hierdurch werden alle Daten gelöscht.</p>\n  </div>\n</div>",
+    "refreshOnChange" : false,
+    "mask" : false,
+    "tableView" : true,
+    "alwaysEnabled" : false,
+    "type" : "htmlelement",
+    "input" : false,
+    "key" : "html",
+    "validate" : {
+      "customMessage" : "",
+      "json" : ""
+    },
+    "conditional" : {
+      "show" : "",
+      "when" : "",
+      "json" : ""
+    },
+    "tabs" : null,
+    "encrypted" : false,
+    "properties" : { },
+    "tags" : null,
+    "customConditional" : "",
+    "logic" : [ ],
+    "reorder" : false
+  } ]
+}
--- a/smardigo/pmci/form/confirm-delete-tenant.json
+++ b/smardigo/pmci/form/confirm-delete-tenant.json
@ -1,4 +1,7 @@
 {
+  "display" : "form",
+  "configKey" : "confirm-delete-tenant",
+  "name" : "confirm-delete-tenant",
  "components" : [ {
    "label" : "HTML",
    "className" : "",
@ -6,7 +9,7 @@
      "attr" : "",
      "value" : ""
    } ],
-    "content" : "<h3>Sind Sie sich sicher, dass der Mandant gelöscht werden soll?</h3>",
+    "content" : "<div class=\"card text-white bg-danger\">\n  <div class=\"card-body\">\n    <h5 class=\"card-title\">Sind Sie sich sicher, dass der Mandant gelöscht werden soll?</h5>\n    <p class=\"card-text\">Diese Aktion kann nicht Rückgängig gemacht werden. Hierdurch werden alle Daten gelöscht.</p>\n  </div>\n</div>",
    "refreshOnChange" : false,
    "mask" : false,
    "tableView" : true,
@ -30,8 +33,5 @@
    "customConditional" : "",
    "logic" : [ ],
    "reorder" : false
-  } ],
-  "display" : "form",
-  "configKey" : "confirm-delete-tenant",
-  "name" : "confirm-delete-tenant"
+  } ]
 }
--- a/smardigo/pmci/mail-template/service-created.html
+++ b/smardigo/pmci/mail-template/service-created.html
@ -44,7 +44,7 @@
            <td>Kibana</td>
            <td th:text="${ service.cluster.stage } + '-' + ${ tenant.key }">some-username</td>
            <td th:text="${ service.cluster.stage } + '-' + ${ tenant.key }">some-password</td>
-            <td th:text="'https://' + ${ service.cluster.stage } + '-elastic-stack-kibana-01-kibana.smardigo.digital/s/' + ${ service.cluster.stage } + '-' + ${ tenant.key } + '/app/home#/'">some-link</td>
+            <td th:text="'https://' + ${ kibanaHostname } + '/s/' + ${ service.cluster.stage } + '-' + ${ tenant.key } + '/app/home#/'">some-link</td>
           </tr>
        </table>
        <p></p>
--- a/smardigo/pmci/mail-template/tenant-created.html
+++ b/smardigo/pmci/mail-template/tenant-created.html
@ -40,7 +40,7 @@
            <td>Keycloak</td>
            <td th:text="${ keycloak_admin.username }">some-username</td>
            <td th:text="${ keycloak_admin.password }">some-password</td>
-            <td th:text="'https://' + ${ stage } + '-keycloak-01.smardigo.digital/auth/admin/' + ${ tenant.key } + '/console'">some-link</td>
+            <td th:text="'https://' + ${ keycloakHostname } + '/auth/admin/' + ${ tenant.key } + '/console'">some-link</td>
           </tr>
        </table>
        <p></p>
--- a/smardigo/pmci/process-variable-declaration/service-change.json
+++ b/smardigo/pmci/process-variable-declaration/service-change.json
@ -26,11 +26,21 @@
      "classification" : "PRIVATE",
      "label" : "jobs"
    },
+    "keycloakHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
+    "kibanaHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
    "maintenance_topic" : {
      "type" : "string",
-      "classification" : "PRIVATE",
-      "searchable" : true,
-      "label" : "Topic"
+      "classification" : "PRIVATE"
+    },
+    "managementHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
    },
    "process_definition_key" : {
      "type" : "string",
--- a/smardigo/pmci/process-variable-declaration/service-create.json
+++ b/smardigo/pmci/process-variable-declaration/service-create.json
@ -40,6 +40,18 @@
      "classification" : "PRIVATE",
      "label" : "jobs"
    },
+    "keycloakHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
+    "kibanaHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
+    "managementHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
    "process_definition_key" : {
      "type" : "string",
      "classification" : "PRIVATE",
--- a/smardigo/pmci/process-variable-declaration/service-delete.json
+++ b/smardigo/pmci/process-variable-declaration/service-delete.json
@ -26,6 +26,18 @@
      "classification" : "PRIVATE",
      "label" : "jobs"
    },
+    "keycloakHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
+    "kibanaHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
+    "managementHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
    "process_definition_key" : {
      "type" : "string",
      "classification" : "PRIVATE",
--- a/smardigo/pmci/process-variable-declaration/service-replay-setup.json
+++ b/smardigo/pmci/process-variable-declaration/service-replay-setup.json
@ -40,6 +40,18 @@
      "classification" : "PRIVATE",
      "label" : "jobs"
    },
+    "keycloakHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
+    "kibanaHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
+    "managementHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
    "process_definition_key" : {
      "type" : "string",
      "classification" : "PRIVATE",
--- a/smardigo/pmci/process-variable-declaration/service-setup.json
+++ b/smardigo/pmci/process-variable-declaration/service-setup.json
@ -45,6 +45,18 @@
      "classification" : "PRIVATE",
      "label" : "jobs"
    },
+    "keycloakHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
+    "kibanaHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
+    "managementHostname" : {
+      "type" : "string",
+      "classification" : "PRIVATE"
+    },
    "progress_current" : {
      "type" : "integer",
      "classification" : "PRIVATE",
--- a/smardigo/pmci/process/service-change.bpmn
+++ b/smardigo/pmci/process/service-change.bpmn
@ -120,13 +120,16 @@
    <bpmn2:serviceTask id="Activity_0fcgws2" name="Create initial variables" camunda:delegateExpression="${dataEntity.read(&#39;tenant&#39;, &#39;tenant&#39;, service.tenant_id)}">
      <bpmn2:extensionElements>
        <camunda:inputOutput>
+          <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
+          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="kibanaHostname">${envKibanaHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="keycloakHostname">${envKeycloakHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
          <camunda:outputParameter name="progress_current">${0}</camunda:outputParameter>
          <camunda:outputParameter name="progress_max">${1}</camunda:outputParameter>
          <camunda:outputParameter name="jobs">
            <camunda:list />
          </camunda:outputParameter>
-          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
-          <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
        </camunda:inputOutput>
      </bpmn2:extensionElements>
      <bpmn2:incoming>Flow_0v9fn99</bpmn2:incoming>
--- a/smardigo/pmci/process/service-create.bpmn
+++ b/smardigo/pmci/process/service-create.bpmn
@ -44,6 +44,11 @@
              <camunda:entry key="stage">${envStage}</camunda:entry>
            </camunda:map>
          </camunda:inputParameter>
+          <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
+          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="kibanaHostname">${envKibanaHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="keycloakHostname">${envKeycloakHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
          <camunda:outputParameter name="service">
            <camunda:map>
              <camunda:entry key="connect_features">${in_connect_features}</camunda:entry>
@ -51,8 +56,6 @@
              <camunda:entry key="tenant_id">${tenant.id}</camunda:entry>
            </camunda:map>
          </camunda:outputParameter>
-          <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
-          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
          <camunda:outputParameter name="jobs">
            <camunda:list />
          </camunda:outputParameter>
@ -144,7 +147,7 @@
    <bpmn2:sequenceFlow id="Flow_08cfi9d" sourceRef="Activity_1jikb5s" targetRef="Event_0t44etc" />
    <bpmn2:sequenceFlow id="Flow_0a94ghp" sourceRef="Event_18eyoec" targetRef="Event_1x2mcoc" />
    <bpmn2:sequenceFlow id="Flow_0o7a7fg" sourceRef="Event_14qss0g" targetRef="Event_09hkg8k" />
-    <bpmn2:sequenceFlow id="Flow_03gesid" sourceRef="Event_0t44etc" targetRef="Event_09hkg8k" />
+    <bpmn2:sequenceFlow id="Flow_03gesid" sourceRef="Event_0t44etc" targetRef="Event_1leujnd" />
    <bpmn2:sequenceFlow id="Flow_0xsem7d" sourceRef="Event_02yqig0" targetRef="Event_14qss0g" />
    <bpmn2:intermediateThrowEvent id="Event_0c4cpxx" name="cancel request">
      <bpmn2:incoming>Flow_13jykf9</bpmn2:incoming>
@ -246,21 +249,11 @@ service</camunda:script>
      <bpmn2:outgoing>Flow_08cfi9d</bpmn2:outgoing>
    </bpmn2:callActivity>
    <bpmn2:endEvent id="Event_09hkg8k">
-      <bpmn2:incoming>Flow_03gesid</bpmn2:incoming>
      <bpmn2:incoming>Flow_0o7a7fg</bpmn2:incoming>
      <bpmn2:incoming>Flow_1s9e7ku</bpmn2:incoming>
+      <bpmn2:incoming>Flow_02b97mw</bpmn2:incoming>
      <bpmn2:terminateEventDefinition id="TerminateEventDefinition_1mrhbgy" />
    </bpmn2:endEvent>
-    <bpmn2:intermediateThrowEvent id="Event_0t44etc" name="&#34;created&#34; (200)">
-      <bpmn2:extensionElements>
-        <camunda:inputOutput>
-          <camunda:outputParameter name="vorgang_status">${200}</camunda:outputParameter>
-          <camunda:outputParameter name="vorgang_status_text">created</camunda:outputParameter>
-        </camunda:inputOutput>
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>Flow_08cfi9d</bpmn2:incoming>
-      <bpmn2:outgoing>Flow_03gesid</bpmn2:outgoing>
-    </bpmn2:intermediateThrowEvent>
    <bpmn2:intermediateThrowEvent id="Event_14qss0g" name="&#34;canceled&#34; (400)">
      <bpmn2:extensionElements>
        <camunda:inputOutput>
@ -461,6 +454,27 @@ Variables.userId(authenticatedUserId)</camunda:script>
        <bpmn2:condition xsi:type="bpmn2:tFormalExpression">${vorgang_status == 401}</bpmn2:condition>
      </bpmn2:conditionalEventDefinition>
    </bpmn2:boundaryEvent>
+    <bpmn2:intermediateThrowEvent id="Event_0t44etc" name="&#34;created&#34; (200)">
+      <bpmn2:extensionElements>
+        <camunda:inputOutput>
+          <camunda:outputParameter name="vorgang_status">${200}</camunda:outputParameter>
+          <camunda:outputParameter name="vorgang_status_text">created</camunda:outputParameter>
+        </camunda:inputOutput>
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>Flow_08cfi9d</bpmn2:incoming>
+      <bpmn2:outgoing>Flow_03gesid</bpmn2:outgoing>
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:sequenceFlow id="Flow_02b97mw" sourceRef="Event_1leujnd" targetRef="Event_09hkg8k" />
+    <bpmn2:intermediateThrowEvent id="Event_1leujnd" name="&#34;creation completed&#34; (300)">
+      <bpmn2:extensionElements>
+        <camunda:inputOutput>
+          <camunda:outputParameter name="vorgang_status">${300}</camunda:outputParameter>
+          <camunda:outputParameter name="vorgang_status_text">creation completed</camunda:outputParameter>
+        </camunda:inputOutput>
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>Flow_03gesid</bpmn2:incoming>
+      <bpmn2:outgoing>Flow_02b97mw</bpmn2:outgoing>
+    </bpmn2:intermediateThrowEvent>
    <bpmn2:textAnnotation id="TextAnnotation_1tbztch">
      <bpmn2:text>Den Antrag überprüfen und freigeben oder ablehnen.</bpmn2:text>
    </bpmn2:textAnnotation>
@ -479,14 +493,6 @@ Variables.userId(authenticatedUserId)</camunda:script>
        <dc:Bounds x="160" y="30" width="4150" height="1430" />
        <bpmndi:BPMNLabel />
      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="TextAnnotation_1tbztch_di" bpmnElement="TextAnnotation_1tbztch">
-        <dc:Bounds x="2113" y="330" width="170" height="39" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="TextAnnotation_0y8bd6q_di" bpmnElement="TextAnnotation_0y8bd6q">
-        <dc:Bounds x="2347" y="330" width="100" height="39" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape id="Event_0icoemn_di" bpmnElement="Event_0icoemn">
        <dc:Bounds x="222" y="572" width="36" height="36" />
        <bpmndi:BPMNLabel>
@ -530,62 +536,6 @@ Variables.userId(authenticatedUserId)</camunda:script>
      <bpmndi:BPMNShape id="Gateway_05puic7_di" bpmnElement="Gateway_05puic7" isMarkerVisible="true">
        <dc:Bounds x="1373" y="565" width="50" height="50" />
      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_17ev5pq_di" bpmnElement="Gateway_17ev5pq">
-        <dc:Bounds x="1643" y="565" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1hogjnw" bpmnElement="Event_1i2icji" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
-        <dc:Bounds x="3242" y="442" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3295" y="453" width="72" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1e98lxl" bpmnElement="Activity_0esu9yv">
-        <dc:Bounds x="3240" y="550" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0zk6p0h_di" bpmnElement="Event_0zk6p0h" bioc:stroke="rgb(67, 160, 71)" bioc:fill="rgb(200, 230, 201)">
-        <dc:Bounds x="3400" y="572" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3377" y="541" width="86" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0siqn14" bpmnElement="Activity_1jikb5s" bioc:stroke="rgb(67, 160, 71)" bioc:fill="rgb(200, 230, 201)">
-        <dc:Bounds x="3518" y="550" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1cxco1l" bpmnElement="Event_09hkg8k">
-        <dc:Bounds x="3830" y="572" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1dcwmw6" bpmnElement="Event_0t44etc" bioc:stroke="rgb(67, 160, 71)" bioc:fill="rgb(200, 230, 201)">
-        <dc:Bounds x="3710" y="572" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3695" y="541" width="74" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_14qss0g_di" bpmnElement="Event_14qss0g" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
-        <dc:Bounds x="3833" y="475" width="30" height="30" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3879" y="476" width="81" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_02yqig0_di" bpmnElement="Event_02yqig0" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
-        <dc:Bounds x="3830" y="372" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3812" y="348" width="72" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0dhea4w" bpmnElement="Event_1x2mcoc" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
-        <dc:Bounds x="3833" y="675" width="30" height="30" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3876" y="676" width="87" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_14bi65e" bpmnElement="Event_18eyoec" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
-        <dc:Bounds x="3830" y="782" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3820" y="822" width="67" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape id="Event_0c4cpxx_di" bpmnElement="Event_0c4cpxx" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
        <dc:Bounds x="1380" y="292" width="36" height="36" />
        <bpmndi:BPMNLabel>
@ -601,20 +551,16 @@ Variables.userId(authenticatedUserId)</camunda:script>
      <bpmndi:BPMNShape id="Event_1x43j9q_di" bpmnElement="Event_1x43j9q">
        <dc:Bounds x="1148" y="892" width="36" height="36" />
      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1ndl5xy_di" bpmnElement="Activity_1ndl5xy" bioc:stroke="rgb(30, 136, 229)" bioc:fill="rgb(187, 222, 251)">
-        <dc:Bounds x="1618" y="270" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1ffsvy2_di" bpmnElement="Activity_1ffsvy2" bioc:stroke="rgb(67, 160, 71)" bioc:fill="rgb(200, 230, 201)">
-        <dc:Bounds x="1618" y="950" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1ssw092_di" bpmnElement="Event_1ssw092">
-        <dc:Bounds x="3042" y="972" width="36" height="36" />
+      <bpmndi:BPMNShape id="BPMNShape_1dcwmw6" bpmnElement="Event_0t44etc" bioc:stroke="rgb(67, 160, 71)" bioc:fill="rgb(200, 230, 201)">
+        <dc:Bounds x="3662" y="572" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3647" y="541" width="74" height="14" />
+        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_11vykvk" bpmnElement="Event_10jirbj" bioc:stroke="rgb(251, 140, 0)" bioc:fill="rgb(255, 224, 178)">
-        <dc:Bounds x="2672" y="972" width="36" height="36" />
+      <bpmndi:BPMNShape id="BPMNShape_0ns31a3" bpmnElement="Event_1leujnd" bioc:stroke="rgb(67, 160, 71)" bioc:fill="rgb(200, 230, 201)">
+        <dc:Bounds x="3752" y="572" width="36" height="36" />
        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2655" y="936" width="73" height="27" />
+          <dc:Bounds x="3732" y="541" width="84" height="27" />
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape id="Activity_1cxc616_di" bpmnElement="Activity_0phplbf" isExpanded="true">
@ -651,6 +597,56 @@ Variables.userId(authenticatedUserId)</camunda:script>
        <di:waypoint x="388" y="1340" />
        <di:waypoint x="460" y="1340" />
      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="Gateway_17ev5pq_di" bpmnElement="Gateway_17ev5pq">
+        <dc:Bounds x="1643" y="565" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1hogjnw" bpmnElement="Event_1i2icji" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
+        <dc:Bounds x="3242" y="442" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3295" y="453" width="72" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1e98lxl" bpmnElement="Activity_0esu9yv">
+        <dc:Bounds x="3240" y="550" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0zk6p0h_di" bpmnElement="Event_0zk6p0h" bioc:stroke="rgb(67, 160, 71)" bioc:fill="rgb(200, 230, 201)">
+        <dc:Bounds x="3400" y="572" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3377" y="541" width="86" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_0siqn14" bpmnElement="Activity_1jikb5s" bioc:stroke="rgb(67, 160, 71)" bioc:fill="rgb(200, 230, 201)">
+        <dc:Bounds x="3518" y="550" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1cxco1l" bpmnElement="Event_09hkg8k">
+        <dc:Bounds x="3830" y="572" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_14qss0g_di" bpmnElement="Event_14qss0g" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
+        <dc:Bounds x="3833" y="475" width="30" height="30" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3879" y="476" width="81" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_02yqig0_di" bpmnElement="Event_02yqig0" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
+        <dc:Bounds x="3830" y="372" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3812" y="348" width="72" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_0dhea4w" bpmnElement="Event_1x2mcoc" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
+        <dc:Bounds x="3833" y="675" width="30" height="30" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3876" y="676" width="87" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_14bi65e" bpmnElement="Event_18eyoec" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
+        <dc:Bounds x="3830" y="782" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3820" y="822" width="67" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape id="Activity_1wq2muu_di" bpmnElement="Activity_1wq2muu" isExpanded="true">
        <dc:Bounds x="1788" y="410" width="1320" height="360" />
      </bpmndi:BPMNShape>
@ -756,6 +752,22 @@ Variables.userId(authenticatedUserId)</camunda:script>
          <dc:Bounds x="2602" y="603" width="15" height="14" />
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="Activity_1ndl5xy_di" bpmnElement="Activity_1ndl5xy" bioc:stroke="rgb(30, 136, 229)" bioc:fill="rgb(187, 222, 251)">
+        <dc:Bounds x="1618" y="270" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1ffsvy2_di" bpmnElement="Activity_1ffsvy2" bioc:stroke="rgb(67, 160, 71)" bioc:fill="rgb(200, 230, 201)">
+        <dc:Bounds x="1618" y="950" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1ssw092_di" bpmnElement="Event_1ssw092">
+        <dc:Bounds x="3042" y="972" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_11vykvk" bpmnElement="Event_10jirbj" bioc:stroke="rgb(251, 140, 0)" bioc:fill="rgb(255, 224, 178)">
+        <dc:Bounds x="2672" y="972" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2655" y="936" width="73" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape id="Activity_17cc1q7_di" bpmnElement="Activity_17cc1q7" isExpanded="true">
        <dc:Bounds x="2248" y="860" width="390" height="270" />
      </bpmndi:BPMNShape>
@ -779,27 +791,24 @@ Variables.userId(authenticatedUserId)</camunda:script>
        <di:waypoint x="2458" y="990" />
        <di:waypoint x="2540" y="990" />
      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Association_10777n0_di" bpmnElement="Association_10777n0">
-        <di:waypoint x="2192" y="550" />
-        <di:waypoint x="2163" y="369" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Association_16987k8_di" bpmnElement="Association_16987k8">
-        <di:waypoint x="2398" y="550" />
-        <di:waypoint x="2398" y="369" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="Event_0twmkxv_di" bpmnElement="Event_0asnmja">
-        <dc:Bounds x="1090" y="752" width="36" height="36" />
+      <bpmndi:BPMNShape id="TextAnnotation_1tbztch_di" bpmnElement="TextAnnotation_1tbztch">
+        <dc:Bounds x="2113" y="330" width="170" height="39" />
+        <bpmndi:BPMNLabel />
      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0ey0lwh" bpmnElement="Event_1hfwre0" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
-        <dc:Bounds x="3042" y="752" width="36" height="36" />
+      <bpmndi:BPMNShape id="TextAnnotation_0y8bd6q_di" bpmnElement="TextAnnotation_0y8bd6q">
+        <dc:Bounds x="2347" y="330" width="100" height="39" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0ajy0i6_di" bpmnElement="Event_0gr7z4p" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
+        <dc:Bounds x="2620" y="1082" width="36" height="36" />
        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3074" y="780" width="76" height="40" />
+          <dc:Bounds x="2653" y="1043" width="78" height="53" />
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1tsnfyx_di" bpmnElement="Event_15pk7sz" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
-        <dc:Bounds x="3090" y="442" width="36" height="36" />
+      <bpmndi:BPMNShape id="Event_0036vnv_di" bpmnElement="Event_0036vnv" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
+        <dc:Bounds x="2620" y="882" width="36" height="36" />
        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3121" y="470" width="78" height="53" />
+          <dc:Bounds x="2654" y="850" width="76" height="40" />
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape id="Event_007p32d_di" bpmnElement="Event_007p32d" bioc:stroke="#fb8c00" bioc:fill="#ffe0b2" color:background-color="#ffe0b2" color:border-color="#fb8c00">
@ -808,18 +817,21 @@ Variables.userId(authenticatedUserId)</camunda:script>
          <dc:Bounds x="3122" y="530" width="76" height="53" />
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0036vnv_di" bpmnElement="Event_0036vnv" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
-        <dc:Bounds x="2620" y="882" width="36" height="36" />
+      <bpmndi:BPMNShape id="Event_1tsnfyx_di" bpmnElement="Event_15pk7sz" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
+        <dc:Bounds x="3090" y="442" width="36" height="36" />
        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2654" y="850" width="76" height="40" />
+          <dc:Bounds x="3121" y="470" width="78" height="53" />
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0ajy0i6_di" bpmnElement="Event_0gr7z4p" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
-        <dc:Bounds x="2620" y="1082" width="36" height="36" />
+      <bpmndi:BPMNShape id="BPMNShape_0ey0lwh" bpmnElement="Event_1hfwre0" bioc:stroke="#e53935" bioc:fill="#ffcdd2" color:background-color="#ffcdd2" color:border-color="#e53935">
+        <dc:Bounds x="3042" y="752" width="36" height="36" />
        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2653" y="1043" width="78" height="53" />
+          <dc:Bounds x="3074" y="780" width="76" height="40" />
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0twmkxv_di" bpmnElement="Event_0asnmja">
+        <dc:Bounds x="1090" y="752" width="36" height="36" />
+      </bpmndi:BPMNShape>
      <bpmndi:BPMNEdge id="Flow_1rtcnw8_di" bpmnElement="Flow_1rtcnw8">
        <di:waypoint x="258" y="590" />
        <di:waypoint x="360" y="590" />
@ -932,7 +944,7 @@ Variables.userId(authenticatedUserId)</camunda:script>
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge id="Flow_08cfi9d_di" bpmnElement="Flow_08cfi9d">
        <di:waypoint x="3618" y="590" />
-        <di:waypoint x="3710" y="590" />
+        <di:waypoint x="3662" y="590" />
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge id="Flow_0a94ghp_di" bpmnElement="Flow_0a94ghp">
        <di:waypoint x="3848" y="782" />
@ -943,8 +955,8 @@ Variables.userId(authenticatedUserId)</camunda:script>
        <di:waypoint x="3848" y="572" />
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge id="Flow_03gesid_di" bpmnElement="Flow_03gesid">
-        <di:waypoint x="3746" y="590" />
-        <di:waypoint x="3830" y="590" />
+        <di:waypoint x="3698" y="590" />
+        <di:waypoint x="3752" y="590" />
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge id="Flow_0xsem7d_di" bpmnElement="Flow_0xsem7d">
        <di:waypoint x="3848" y="408" />
@ -980,6 +992,18 @@ Variables.userId(authenticatedUserId)</camunda:script>
        <di:waypoint x="3340" y="590" />
        <di:waypoint x="3400" y="590" />
      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Association_10777n0_di" bpmnElement="Association_10777n0">
+        <di:waypoint x="2192" y="550" />
+        <di:waypoint x="2163" y="369" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Association_16987k8_di" bpmnElement="Association_16987k8">
+        <di:waypoint x="2398" y="550" />
+        <di:waypoint x="2398" y="369" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_02b97mw_di" bpmnElement="Flow_02b97mw">
+        <di:waypoint x="3788" y="590" />
+        <di:waypoint x="3830" y="590" />
+      </bpmndi:BPMNEdge>
    </bpmndi:BPMNPlane>
  </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
--- a/smardigo/pmci/process/service-delete.bpmn
+++ b/smardigo/pmci/process/service-delete.bpmn
@ -60,13 +60,16 @@
    <bpmn2:serviceTask id="Activity_0l7e61k" name="Create initial variables" camunda:delegateExpression="${dataEntity.read(&#39;tenant&#39;, &#39;tenant&#39;, service.tenant_id)}">
      <bpmn2:extensionElements>
        <camunda:inputOutput>
+          <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
+          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="kibanaHostname">${envKibanaHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="keycloakHostname">${envKeycloakHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
          <camunda:outputParameter name="progress_current">${0}</camunda:outputParameter>
          <camunda:outputParameter name="progress_max">${1}</camunda:outputParameter>
          <camunda:outputParameter name="jobs">
            <camunda:list />
          </camunda:outputParameter>
-          <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
-          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
        </camunda:inputOutput>
      </bpmn2:extensionElements>
      <bpmn2:incoming>Flow_0v9fn99</bpmn2:incoming>
@ -132,7 +135,7 @@
      <bpmn2:outgoing>Flow_0a1iw3h</bpmn2:outgoing>
      <bpmn2:outgoing>Flow_029ur97</bpmn2:outgoing>
    </bpmn2:exclusiveGateway>
-    <bpmn2:userTask id="Activity_1ani0wi" name="Löschen bestätigen " camunda:formKey="confirm-delete-tenant" camunda:candidateGroups="user">
+    <bpmn2:userTask id="Activity_1ani0wi" name="Löschen bestätigen " camunda:formKey="confirm-delete-service" camunda:candidateGroups="user">
      <bpmn2:incoming>Flow_029ur97</bpmn2:incoming>
      <bpmn2:outgoing>Flow_0xb2q5c</bpmn2:outgoing>
    </bpmn2:userTask>
--- a/smardigo/pmci/process/service-replay-setup.bpmn
+++ b/smardigo/pmci/process/service-replay-setup.bpmn
@ -31,14 +31,17 @@
    <bpmn2:task id="Activity_0e0vefu" name="Create initial variables">
      <bpmn2:extensionElements>
        <camunda:inputOutput>
+          <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
+          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="kibanaHostname">${envKibanaHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="keycloakHostname">${envKeycloakHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
          <camunda:inputParameter name="in_tenant">
            <camunda:map>
              <camunda:entry key="id">${service.tenant_id}</camunda:entry>
              <camunda:entry key="key">${service.tenant_key}</camunda:entry>
            </camunda:map>
          </camunda:inputParameter>
-          <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
-          <camunda:outputParameter name="simulation">${false}</camunda:outputParameter>
          <camunda:outputParameter name="jobs">
            <camunda:list />
          </camunda:outputParameter>
--- a/smardigo/pmci/process/service-setup.bpmn
+++ b/smardigo/pmci/process/service-setup.bpmn
@ -23,6 +23,9 @@
            </camunda:map>
          </camunda:inputParameter>
          <camunda:outputParameter name="stage">${envStage}</camunda:outputParameter>
+          <camunda:outputParameter name="managementHostname">${envManagementHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="kibanaHostname">${envKibanaHostname}</camunda:outputParameter>
+          <camunda:outputParameter name="keycloakHostname">${envKeycloakHostname}</camunda:outputParameter>
          <camunda:outputParameter name="jobs">
            <camunda:list />
          </camunda:outputParameter>
--- a/smardigo/pmci/script/create-teams-message.groovy
+++ b/smardigo/pmci/script/create-teams-message.groovy
@ -1,5 +1,5 @@
-def smardigoUrl = "https://" + envBaseUrl + "/api/redirect/process/" + contextScopeId + "/dossier/" + process_definition_key + "/" + execution.getProcessInstanceId()
-def smardigoMessageUrl = "https://" + envBaseUrl + "/api/v1/scopes/" + contextScopeId + "/processes/" + execution.getProcessInstanceId() + "/messages"
+def smardigoUrl = "https://" + envManagementHostname + "/api/redirect/process/" + contextScopeId + "/dossier/" + process_definition_key + "/" + execution.getProcessInstanceId()
+def smardigoMessageUrl = "https://" + envManagementHostname + "/api/v1/scopes/" + contextScopeId + "/processes/" + execution.getProcessInstanceId() + "/messages"

 def message = [:]
 message["@type"] = "MessageCard"