bugfix: added configuration for qa admin users

group_vars/keycloak/plain.yml

@@ -18,8 +18,8 @@ keycloak: {
       display_name: 'docker',
       users: [
         {
-          "username": "docker-admin",
+          "username": "{{ docker_admin_username }}",
-          "password": "docker-admin",
+          "password": "{{ docker_admin_password }}",
           "email": "{{ docker_admin_email }}",
         }
       ],
@@ -63,8 +63,8 @@ keycloak: {
       display_name: '{{ smardigo_management_oidc_realm }}',
       users: [
         {
-          "username": "connect-admin",
+          "username": "{{ management_admin_username }}",
-          "password": "connect-admin",
+          "password": "{{ management_admin_password }}",
           "email": "{{ connect_admin_email }}",
         }
       ],

group_vars/stage_dev/plain.yml

@@ -116,8 +116,17 @@ webdav_jwt_secret: "5646aee6dadc4c19b15f4b65f1e6549f"
 iam_jwt_enabled: true
 iam_jwt_secret: "456ae14462d049d3be76439ef379c7c6"
 
-#awx_admin_username: "< see vault >"
+keycloak_admin_username: "keycloak-admin"
-#awx_admin_password: "< see vault >"
+keycloak_admin_password: "keycloak-admin"
+
+awx_admin_username: "awx-admin"
+awx_admin_password: "awx-admin"
+
+docker_admin_username: "docker-admin"
+docker_admin_password: "docker-admin"
+
+management_admin_username: "management-admin"
+management_admin_password: "management-admin"
 
 #harbor_admin_username: "< see vault >"
 #harbor_admin_password: "< see vault >"

group_vars/stage_qa/plain.yml

@@ -164,8 +164,17 @@ webdav_jwt_secret: "5646aee6dadc4c19b15f4b65f1e6549f"
 iam_jwt_enabled: true
 iam_jwt_secret: "456ae14462d049d3be76439ef379c7c6"
 
-#awx_admin_username: "< see vault >"
+keycloak_admin_username: "keycloak-admin"
-#awx_admin_password: "< see vault >"
+keycloak_admin_password: "{{ keycloak_admin_password_vault }}"
+
+awx_admin_username: "awx-admin"
+awx_admin_password: "{{ awx_admin_password_vault }}"
+
+docker_admin_username: "docker-admin"
+docker_admin_password: "{{ docker_admin_password_vault }}"
+
+management_admin_username: "management-admin"
+management_admin_password: "{{ management_admin_password_vault }}"
 
 #harbor_admin_username: "< see vault >"
 #harbor_admin_password: "< see vault >"

group_vars/stage_qa/vault.yml

@@ -1,54 +1,60 @@
 $ANSIBLE_VAULT;1.1;AES256
-63643334643863613366386363363366363964323236303463366232306234616430653434633137
+66616437623664303332306665396239646431366535333062623735643766663730346264383733
-6366643532363464326236656330656532653739306665310a623363303665376266313363646165
+3237613834636161633039393361663562633636383738340a663437666333386634356563376463
-39623538656539346531653634393365306532376535633138626633313332613363336235373536
+31646339323736626338343933316665323734393835326466303361656363653636336130383864
-3536643266393137660a356364393039356236346462313638333134613732346539656634313031
+3436303930623164310a316562386464393933356338323435353837313534336337383131363336
-65646237623764363034353064366534383030386236616332336638366631633837323236393662
+39613732646661346332363530333264303733643433353832376162646135636663326263613330
-31333538616339373463643530333133613434303135346264393366343530666432353435366430
+39653862313738383463633139623435366635306532623635306561323336313439343431626533
-30376235376663303866613135646538613836373366663865623336386435326662356264366232
+35623962326562333436613636623330666531666465393664313938366436366261343031346436
-39383532356165353363313837616333313564383636363666633337643162383663633832353162
+37303837326539336233323834343034623761336563383134343638333033393335663830306130
-33623835343361366337333534366539613636336161333031366538313333666564306130333034
+65656138623763343733396234356335386437656161656635363362633661646439393365653136
-31376138393866653264393732343266346631303465616637373134323632353634353632353533
+38386233386163323466323862393833376561646634333733663036333066333861363764616231
-36313534353936666230363363616335646638336661373239326566313766343634373338613736
+34643561653565663430336136353136373864366533326163653733623965666336353337646565
-64333466373235373366386334363236363039623639656366623735306265363933306137323437
+66643335386264666665626239393438373031393839333138643861383033373636643863323162
-34623930336464373139383666663538393730356532363637386330643133366163616365646161
+37353734366461666233313338653631643761336430373363393630363230386339316636333237
-65396438306432323935633231343039643338396531343564626330376539653836326133333736
+62346638326162326633353866366535373534656535633638366566353732396262666637623037
-31616262366437613739646332376361313733343130383539323534343430663934363863626462
+38353733646530616266313031343536373633313936333862633136656530636531343133623837
-36643361626138633062343339333731613662383831613834366132666134656239326338353532
+31333562653366393034393831373736626536356231396265313335306561343463383537313031
-31363633623363386533303261376631316432613137666330653237656266346135356539353465
+62376535313033613135643665616565303961643935653737623331643130623737366264383864
-66623835666133353936613432643262616130366266633738663137623031316561366235393735
+31663831386230633132393061363131323737356534636239623533363162323831353030643233
-30323034316337663863373839666130373333393337383433666166616435333262633932656534
+61306530356662333339613134336564626465646562653863376638356165613839616363643935
-35376130306135333830323330303962366663383039613831323832623932656433383861386635
+62386339376663333863663164346438383261396666343133656438623033636165613635613964
-32363662363535613761336133303266323164656437613935343766616437323331343461303734
+30663765313036373735616363303131306635623333333231353231353134353433623737313331
-36623461366232326135393265376130646436333461663430663431643738663765646163613262
+39333266306435653737313431623939663363316363623461326538323538633431633935303163
-30376139396533636231343866626232313632653931663539643363646539643136626133363831
+62346561376437363161393632646632376331393035353263336131656461346434303135303032
-66353461303564633266656265363034313761333137346630643435313865303638316465653264
+33393632306332643161356164633232653566393661313438323235306131333465633664623930
-35383634333561333461363537303137366565303135383466643632653331363039333134626366
+38666365613063643637383466336534373863653566663232613062333964613032343733386235
-62363765383439306665326165636333623133626661366133353130353665666339626631333531
+31396232353861393036653338636636626335636461323965656230623636333934373764373934
-34653339396238636634623839313439333261646363623135646438306136656432336433383265
+37613930373838383633643934333034663365393765323432373133343663633033356464613632
-66353061633962303231636632393562316435363162313264393633393064373731333936653262
+34346361646533316536613262336265336331613961626163633562316265353334313064303161
-64633366643332386364323662363763616131386631303132346536636237326562663231333934
+30323133376661653930623061636562653864616563356137326565303532353262343331323463
-65323139336439396163333138363432306366303038313739383532353032383432363361326238
+38623666303335663531333463643139623065636166373337326662636466636433393632663837
-62396164326437626237356537353836393733313430613163663631356263306637626137326365
+32303961393866616165633630303032303732323131393736303538643631613239633637343166
-38303839326431653061623433383837383761316262626363383139363339363430636136636337
+38393330376163303665303364633234636433363964666362653966353666633633653562353630
-66653831656233323764373361626462303465616138343264613630363239373538393533336631
+65343831666266663263623336626637616338373662336336616562363237316131626461666362
-30303435363639383332656133346634353861393534613232636632343862303239313936373331
+33306135366130386131313335373235303365303138323432646538613936363363336634376432
-30376533363236626438613265643436376265373137643934316464663732366232366438623031
+61313838373539373264333161393062333466363262316338393436616434376634643034326136
-65383834623165353961323933366361613062643931616135663533333562336131636366353538
+38383735613835653339616530613466313661333332656334616466343163343535393838353738
-65396439636530316530303738383438653465636530326232313033393165326132653530383962
+65326466663131636131363131326635643336313839623437366331356536653134626330383937
-61336136303031353438666531366336323630643564363663333839643435666661303566653263
+64656666313137643732303235333365363135626238643762363538303135643135663662353635
-38303337643565373033373762373836616438356262386363313438663966393164646230613637
+30353732366135636139346664646463663064633462613761653334633136643837316462346463
-36613963326131646264306261663739646166636262633162663038333763336533303266346562
+35353539313131306461636331616436663564303761376532386333616265353230353237633137
-63303338306530346232313033646362386331623564333061383163323736613962663835333732
+37613638613538313235333635373339656463643635666136626163643732663531623436346631
-32663935393665386337663439363735333164333164383939633632366531363435656137383164
+35613762613063336534646439666231356136666261326639376132663766633533653833323737
-33383730316363643636386266353031303334356439343738323061643264663339666238353866
+64303730656435316261393331316436363365663861376666313537653733356332643164303437
-33396237323966636365376339373639633766643531613464353334363833623564646238303263
+61383935613665643533643639663633303962616536373262646633656361313935613763333934
-34396662643533656137633931396461333165393762316631343162613230373033656339386539
+63363832653534386562333831646163323362383332346533343033336665633939653063636165
-34396163323637303737336135373637343438616265326536373039613866343766363838633630
+66336130336430646436393938623533373031343030663063303438633065333065623636396463
-63313036643765396662653335366639306464376431373166643162336533663463393235396532
+38343731383439613235643139343961616331333434636565343866326435393430353662643130
-39653239613063333265383638633631613463336331343963353832636566356562386565646533
+64633138626233626635303838306363663735663637393566336564336661383034343039366164
-30303237653161653734663662383764666532663033323433383530636437323830656266376364
+61633562383163386561386663303762386334643638396263386539633061393537313634623234
-31353236633761666165616561366630656231663831646633356136343030633161303366623835
+35626437323664663262616431323366663338626534646230333363643832363861353362666265
-37373034616234323038386464643762373437356133363938656538313932346361363839636365
+31643337613432653461363364636136346538373261326464623433376231666162356162353434
-64663265376362666436626563626438343938363239366564623233396461376462613261363534
+33633165323966396538346563646461363333323637313263666630333732393433356361616232
-36386336326132636666383630626233666561643036303766393962623533323463
+34333939616630613231623963383037613666653465643337323866656165303961646136656663
+33656364363039323663623164316665636165666433323131653736323034333535653565313365
+65323930386635366635633930383633313139333965386339303038623639316332613161616232
+34633235663463366236396564373764613835386435623634346137333865656133663964653765
+33313363663135666337303637376535393335386539313437343963636463353064343965336430
+39643136643131623964386562306165376433353861373238653635663263343538303263313366
+663939336361356534643762373833336530

roles/connect-realm/defaults/main.yml

@@ -1,9 +1,9 @@
 ---
 
-# configuration for the connect realm
+# TODO inject by management portal
 connect_realm_admin_username: "connect-realm-admin"
 connect_realm_admin_password: "connect-realm-admin"
-
+# TODO inject by management portal
 connect_client_admin_username: "connect-admin"
 connect_client_admin_password: "connect-admin"
 

roles/connect/defaults/main.yml

@@ -3,6 +3,7 @@
 connect_image_name: "{{ shared_service_docker_registry_hostname }}/smardigo/connect-whitelabel-app"
 connect_image_version: 'latest'
 
+# TODO inject by management portal
 connect_admin_username: "connect-admin"
 connect_admin_password: "connect-admin"
 

roles/keycloak/defaults/main.yml

@@ -5,8 +5,3 @@ service_port_keycloak_external: "8110"
 
 keycloak_version: "12.0.4.2"
 keycloak_image: "{{ shared_service_docker_registry_hostname }}/smardigo/keycloak"
-
-keycloak_admin_username: "keycloak-admin"
-keycloak_admin_password: "keycloak-admin"
-
-

smardigo/provisioning/process/simple-connect.bpmn

@@ -192,7 +192,7 @@ Variables.userId(authenticatedUserId)</camunda:script>
           <camunda:outputParameter name="progress_max">${1}</camunda:outputParameter>
           <camunda:outputParameter name="cluster">
             <camunda:map>
-              <camunda:entry key="stage">dev</camunda:entry>
+              <camunda:entry key="stage">${envStage}</camunda:entry>
               <camunda:entry key="name" />
               <camunda:entry key="size">${1}</camunda:entry>
               <camunda:entry key="service">connect</camunda:entry>

smardigo/provisioning/script/create-teams-message.groovy

@@ -35,7 +35,7 @@ if (vorgang_status < 30) {
   approveInSmardigo["target"] = smardigoMessageUrl
   approveInSmardigo["body"] = "{\"message\":\"process-approved-" + contextProcessId + "\"}"
   approveInSmardigo["headers"] = [
-    [name:"Smardigo-User-Token",value:"eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..rCRO1cVFgkyZ45D5cJNK5g.fc6JVOo5ja5sqe-0PQTfJGOivJ6tyiD-rwgY6rXJ3-U.tOgqgJ2zTjB3_M9BGtvVjQ"]
+    [name:"Smardigo-User-Token",value:envSmardigoUserToken]
   ]
   potentialAction.add(approveInSmardigo)
 }