From d527b57832eb58dd7c6b5d679d9456b02ea2ffc0 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Mon, 30 Aug 2021 10:30:05 +0200 Subject: [PATCH] DEV-173: review/regression/cleanup: connect + wordpress --- .../provisioning/process/simple-connect.bpmn | 834 +++++++++--------- .../provisioning/script/ansible-start.groovy | 1 + 2 files changed, 425 insertions(+), 410 deletions(-) diff --git a/smardigo/provisioning/process/simple-connect.bpmn b/smardigo/provisioning/process/simple-connect.bpmn index 74df453..7ca8131 100644 --- a/smardigo/provisioning/process/simple-connect.bpmn +++ b/smardigo/provisioning/process/simple-connect.bpmn @@ -4,6 +4,7 @@ + @@ -221,175 +222,14 @@ Variables.userId(authenticatedUserId) Flow_13jykf9 - - - - - Flow_0cxiaxt - - + - - - - - - ${section} - - - - - Flow_0lrfzsu - Flow_1jfvhvl - - - - - - - Neuer Antrag für ${tenant.name} - ${cluster.stage}-${tenant.key}-${cluster.name} for ${cluster.service} - https://img.welt.de/img/vermischtes/bilder-des-tages/mobile207066931/1242503207-ci102l-w1024/Coronavirus-USA.jpg - - - - - Flow_1qghkm9 - Flow_0lrfzsu - - - - - - - MessageCard - http://schema.org/extensions - 0076D7 - Neuer Antrag für ${tenant.name} - ${sections} - - - - - Flow_1jfvhvl - Flow_0cxiaxt - - - - - ${60} - Service wird gelöscht - - - Flow_090j3ro - Flow_0yckijr - - - Flow_0yckijr - Flow_0fyo5ev - Flow_0e66mfk - - - - - - import de.tolina.connect.common.variable.Variables -def authenticatedUserId = users.currentUserId() -Variables.userId(authenticatedUserId) - - - - Flow_0fyo5ev - Flow_1pwn0n9 - - - - - ${70} - Service gelöscht - - - Flow_1pwn0n9 - Flow_13do7kt - - - Flow_13do7kt - - - - - - - - - - - - Service abreissen für ${tenant.name} - ${cluster.stage}-${tenant.key}-${cluster.name} for ${cluster.service} - https://img.welt.de/img/vermischtes/bilder-des-tages/mobile207066931/1242503207-ci102l-w1024/Coronavirus-USA.jpg - - - - - Flow_0e66mfk - Flow_0embcwh - - - - - - - ${section} - - - - - Flow_0embcwh - Flow_0011ju8 - - - - - - - MessageCard - http://schema.org/extensions - 0076D7 - Neuer Antrag für ${tenant.name} - ${sections} - - - - - Flow_0011ju8 - Flow_1ecxnbj - - - Flow_1ecxnbj - - - - - - - - - import de.tolina.connect.common.variable.Variables -def authenticatedUserId = users.currentUserId() -Variables.userId(authenticatedUserId) - - - - Flow_15fkmn4 - Flow_090j3ro - @@ -397,22 +237,12 @@ Variables.userId(authenticatedUserId) - ${5} + ${progress_current + 1} Flow_1f0iyrk Flow_11k5c1y - - - - ${50} - Service gestartet - - - Flow_11k5c1y - Flow_15fkmn4 - @@ -420,7 +250,7 @@ Variables.userId(authenticatedUserId) - ${2} + ${progress_current + 1} Flow_11ki58f @@ -433,7 +263,7 @@ Variables.userId(authenticatedUserId) - ${3} + ${progress_current + 1} Flow_1eku1o4 @@ -446,14 +276,14 @@ Variables.userId(authenticatedUserId) - ${4} + ${progress_current + 1} Flow_0pvr263 Flow_1f0iyrk - + @@ -526,7 +356,7 @@ Variables.userId(authenticatedUserId) ${1} - ${5} + ${6} Flow_0bzl5jh @@ -567,33 +397,172 @@ Variables.userId(authenticatedUserId) Flow_17gszoo Flow_1lt30rz - + - - [cluster.service] + execution.getVariable('connect-features') - + + [cluster.service] + execution.getVariable('connect-features') + + + + Flow_1w2pl97 + Flow_0l51s9z + + + Flow_0l51s9z + Flow_1myfmc6 + Flow_1onhxkb + + + Flow_0yckijr + Flow_0fyo5ev + Flow_0e66mfk + + + + + + import de.tolina.connect.common.variable.Variables +def authenticatedUserId = users.currentUserId() +Variables.userId(authenticatedUserId) + + + + Flow_0fyo5ev + Flow_1pwn0n9 + + + + + ${70} + Service gelöscht + + + Flow_1pwn0n9 + Flow_13do7kt + + + Flow_13do7kt + + + + + + + + + + + + + + + Service abreissen für ${tenant.name} + ${cluster.stage}-${tenant.key}-${cluster.name} for ${cluster.service} + https://img.welt.de/img/vermischtes/bilder-des-tages/mobile207066931/1242503207-ci102l-w1024/Coronavirus-USA.jpg + + + + + Flow_0e66mfk + Flow_0embcwh + + + + + + + ${section} + + + + + Flow_0embcwh + Flow_0011ju8 + + + + + + + MessageCard + http://schema.org/extensions + 0076D7 + Neuer Antrag für ${tenant.name} + ${sections} + + + + + Flow_0011ju8 + Flow_1ecxnbj + + + Flow_1ecxnbj + + + + + + import de.tolina.connect.common.variable.Variables +def authenticatedUserId = users.currentUserId() +Variables.userId(authenticatedUserId) + + + + Flow_15fkmn4 + Flow_090j3ro + + + + + ${60} + Service wird gelöscht + + + Flow_090j3ro + Flow_0yckijr + + + + + + + + + + + Flow_1qghkm9 + Flow_121fu5x + + + Flow_121fu5x + + + + + ${50} + Service gestartet + + + Flow_1u7vy0j + Flow_15fkmn4 + + + + + + + + + ${progress_current + 1} + - Flow_1w2pl97 - Flow_0l51s9z - - - Flow_0l51s9z - Flow_1myfmc6 - Flow_1onhxkb - - - Service wieder abreissen - -- Server  -- Domain -- Keycloak (Data/Config) -- ElasticSearch Index (Data/Config) -- Monitoring/Alerting -- Database - - + Flow_11k5c1y + Flow_1u7vy0j + + Shared Service Server bei Hetzner erstellen @@ -672,6 +641,17 @@ Keycloak Realm mit Administrator Account + + Service wieder abreissen + +- Server  +- Domain +- Keycloak (Data/Config) +- ElasticSearch Index (Data/Config) +- Monitoring/Alerting +- Database + + @@ -682,10 +662,6 @@ Keycloak Realm mit Administrator Account - - - - Flow_1ow8whd @@ -693,51 +669,27 @@ Keycloak Realm mit Administrator Account Flow_1ow8whd Flow_0qfq760 - + - - - - Neue Aufgabe - ${smardigoManagementAction} - https://img.welt.de/img/vermischtes/bilder-des-tages/mobile207066931/1242503207-ci102l-w1024/Coronavirus-USA.jpg - - - + + + + Flow_0qfq760 - Flow_1j21m5x - - + Flow_11nxxg5 + + - - - ${section} - + + datasources.query('awx-job-templates').processScope(contextScopeId, contextProcessId).parameters([name:smardigoManagementAction]).list()[0]['id']; - Flow_1j21m5x - Flow_1d97y1d + Flow_11nxxg5 + Flow_1cnt5hf - - - - - - MessageCard - http://schema.org/extensions - 0076D7 - Neue Aufgabe: ${comment} - ${sections} - - - - - Flow_1d97y1d - Flow_0wtazyf - @@ -755,6 +707,7 @@ Keycloak Realm mit Administrator Account ${tenant.name} ${tenant.key} ${cluster_services} + database-backup-filename @@ -788,30 +741,118 @@ Keycloak Realm mit Administrator Account Flow_1ju13h8 + + + + + + - - - + + + + + Flow_1nu8qqa + + - - datasources.query('awx-job-templates').processScope(contextScopeId, contextProcessId).parameters([name:smardigoManagementAction]).list()[0]['id']; + + + ${activityTitle} + ${activitySubtitle} + https://img.welt.de/img/vermischtes/bilder-des-tages/mobile207066931/1242503207-ci102l-w1024/Coronavirus-USA.jpg + - Flow_0wtazyf - Flow_1cnt5hf + Flow_1nu8qqa + Flow_1f6k0y9 - - + + + + + + ${section} + + + + + Flow_1f6k0y9 + Flow_0vyypeb + + + + + + + MessageCard + http://schema.org/extensions + 0076D7 + Neue Aufgabe: ${comment} + ${sections} + + + + + Flow_0vyypeb + Flow_127qqnb + + + Flow_127qqnb + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -838,57 +879,25 @@ Keycloak Realm mit Administrator Account - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + @@ -918,18 +927,6 @@ Keycloak Realm mit Administrator Account - - - - - - - - - - - - @@ -947,8 +944,8 @@ Keycloak Realm mit Administrator Account - - + + @@ -1177,63 +1174,9 @@ Keycloak Realm mit Administrator Account - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1288,8 +1231,56 @@ Keycloak Realm mit Administrator Account - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1315,13 +1306,12 @@ Keycloak Realm mit Administrator Account + + + - - - - @@ -1354,48 +1344,44 @@ Keycloak Realm mit Administrator Account + + + + - + - - - - - - - - - - - - - - - - - - + + - - + + + + + + - - - + + + - + - - - + + + - - - + + + + + + + @@ -1403,35 +1389,63 @@ Keycloak Realm mit Administrator Account - - + + - - - - - + + - + - + - + - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/smardigo/provisioning/script/ansible-start.groovy b/smardigo/provisioning/script/ansible-start.groovy index 9c88097..d63d991 100644 --- a/smardigo/provisioning/script/ansible-start.groovy +++ b/smardigo/provisioning/script/ansible-start.groovy @@ -9,6 +9,7 @@ def env = [ stage: cluster.stage, current_realm_name: tenant.key, current_realm_display_name: tenant.name, + uploaded_file: execution.getVariable('database-backup-filename'), tenant_id: tenant.key ]