X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ocd%2Finfra%2Fplaybooks%2Froles%2Feg_user-mgmt%2Ftasks%2Finstall.yml;h=2d128eed7336717bcfa4b4ab0feeff0467cdcf9b;hb=5a96855385ed2fe197daea2d3f128d7fbd534998;hp=24d17b488ac43e058ce71e59ad5bae291d6df754;hpb=ed739a54d1a066eb35a08a3268c64037dd6e5807;p=ealt-edge.git

diff --git a/ocd/infra/playbooks/roles/eg_user-mgmt/tasks/install.yml b/ocd/infra/playbooks/roles/eg_user-mgmt/tasks/install.yml
index 24d17b4..2d128ee 100644
--- a/ocd/infra/playbooks/roles/eg_user-mgmt/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/eg_user-mgmt/tasks/install.yml
@@ -16,26 +16,17 @@
 
 ---
 
-- name: Doing deployment setup eg_user-mgm for edge gallery
-  copy:
-    src: deploy
-    dest: /tmp/eg_user-mgmt/
-
-- name: Import vars
-# yamllint disable rule:line-length
+- name: Import config file
   include_vars:
-    file: ../../../config.yml
-    name: vardata
-# yamllint disable rule:line-length
+      file: ../../../config.yml
+      name: vardata
 
 - name: Generating certificates for usermanagment
-# yamllint disable rule:line-length
-  command: kubectl create secret generic user-mgmt-jwt-secret --from-file=publicKey=/tmp/.mep_tmp_cer/mepserver_encryptedtls.key --from-file=encryptedPrivateKey=/tmp/eg_user-mgmt/deploy/conf/keys/encrypted_rsa_private_key.pem --from-literal=encryptPassword={{ vardata.firstvar.name}}
-# yamllint disable rule:line-length
-  args:
-    chdir: /tmp/.mep_tmp_cer/
+  # yamllint disable rule:line-length
+  command: kubectl create secret generic user-mgmt-jwt-secret --from-file=publicKey=/tmp/ssl-eg-keys-certs/rsa_public_key.pem --from-file=encryptedPrivateKey=/tmp/ssl-eg-keys-certs/encrypted_rsa_private_key.pem --from-literal=encryptPassword={{ vardata.user_mgmt_encryptpass.name}}
+  # yamllint disable rule:line-length
 
-- name: Pull helm chart eg_user-mgm
-# yamllint disable rule:line-length
-  command: helm install user-mgmt-edgegallery edgegallery/usermgmt --set global.oauth2.clients.appstore.clientUrl=https://{{ vardata.authServer.name}}:30091,global.oauth2.clients.developer.clientUrl=https://{{ vardata.authServer.name}}:30092,global.oauth2.clients.mecm.clientUrl=https://{{ vardata.authServer.name}}:30093, --set jwt.secretName=user-mgmt-jwt-secret --set global.ssl.enabled=true --set global.ssl.secretName=edgegallery-ssl-secret
-# yamllint disable rule:line-length
+- name: Install user-mgmt
+  # yamllint disable rule:line-length
+  command: helm install --wait user-mgmt-edgegallery edgegallery/usermgmt --set global.oauth2.clients.appstore.clientUrl=https://{{ vardata.user_mgmt_oauth_appstore_client_ip.name}}:{{vardata.user_mgmt_oauth_appstore_client_port.name}},global.oauth2.clients.developer.clientUrl=https://{{ vardata.user_mgmt_oauth_developer_client_ip.name}}:{{vardata.user_mgmt_oauth_developer_client_port.name}},global.oauth2.clients.mecm.clientUrl=https://{{ vardata.user_mgmt_oauth_mecm_client_ip.name}}:{{vardata.user_mgmt_oauth_mecm_client_port.name}}, --set jwt.secretName=user-mgmt-jwt-secret --set images.usermgmt.tag={{ vardata.user_mgmt_image_tag.name}} --set global.ssl.enabled=true --set global.ssl.secretName=edgegallery-ssl-secret
+  # yamllint disable rule:line-length