X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ocd%2Finfra%2Fplaybooks%2Froles%2Feg_mecm-mepm%2Ftasks%2Finstall.yml;h=a84f9e0157caa23aa06a01f5dd7b5bf05dc985e5;hb=389ebc9019ef47a42414a750d4700129659b3ae7;hp=37084b3121091d17d8f1b88dbf6f03328edb9153;hpb=32b3d8699b040d34d64c3f5a6097eeb9b214234a;p=ealt-edge.git

diff --git a/ocd/infra/playbooks/roles/eg_mecm-mepm/tasks/install.yml b/ocd/infra/playbooks/roles/eg_mecm-mepm/tasks/install.yml
index 37084b3..a84f9e0 100644
--- a/ocd/infra/playbooks/roles/eg_mecm-mepm/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/eg_mecm-mepm/tasks/install.yml
@@ -28,21 +28,21 @@
 
 - name: Generates certificate one eg_mecm-mepm
   # yamllint disable rule:line-length
-  command: kubectl create secret generic mecm-mepm-jwt-public-secret --from-file=publicKey=/tmp/.mep_tmp_cer/mepserver_encryptedtls.key
+  command: kubectl create secret generic mecm-mepm-jwt-public-secret --from-file=publicKey=/tmp/.mep_tmp_cer/server_encryptedtls.key
   # yamllint disable rule:line-length
   args:
     chdir: /tmp/.mep_tmp_cer/
 
 - name: Generates certificate one eg_mecm-mepm
   # yamllint disable rule:line-length
-  command: kubectl create secret generic mecm-mepm-ssl-secret --from-file=server_tls.key=/tmp/.mep_tmp_cer/mepserver_tls.key --from-file=server_tls.crt=/tmp/.mep_tmp_cer/mepserver_tls.crt --from-file=ca.crt=/tmp/.mep_tmp_cer/ca.crt
+  command: kubectl create secret generic mecm-mepm-ssl-secret --from-file=server_tls.key=/tmp/.mep_tmp_cer/server_tls.key --from-file=server_tls.crt=/tmp/.mep_tmp_cer/server_tls.crt --from-file=ca.crt=/tmp/.mep_tmp_cer/ca.crt
   # yamllint disable rule:line-length
   args:
     chdir: /tmp/.mep_tmp_cer/
 
 - name: Generates certificate one eg_mecm-mepm
   # yamllint disable rule:line-length
-  command: kubectl create secret generic edgegallery-mepm-secret --from-file=postgres_init.sql=/tmp/eg_mecm-mepm/deploy/conf/keys/postgres_init.sql --from-literal=postgresPassword={{ vardata.firstvar.name}} --from-literal=postgresLcmCntlrPassword={{ vardata.firstvar.name}} --from-literal=postgresk8sPluginPassword={{ vardata.firstvar.name}}
+  command: kubectl create secret generic edgegallery-mepm-secret --from-file=postgres_init.sql=/tmp/eg_mecm-mepm/deploy/conf/keys/postgres_init.sql --from-literal=postgresPassword={{ vardata.mepmpostgrespass.name}} --from-literal=postgresLcmCntlrPassword={{ vardata.mepmpostgreslcmpass.name}} --from-literal=postgresk8sPluginPassword={{ vardata.mepmpostgresk8spluginpass.name}}
   # yamllint disable rule:line-length
   args:
     chdir: /tmp/.mep_tmp_cer/
@@ -54,7 +54,4 @@
 
 - name: Repo pulling for mecm-mepm
   # yamllint disable rule:line-length
-  command: helm install mecm-mepm-edgegallery edgegallery/mecm-mepm --set jwt.publicKeySecretName=mecm-mepm-jwt-public-secret --set mepm.secretName=edgegallery-mepm-secret --set ssl.secretName=mecm-mepm-ssl-secret
-  # yamllint disable rule:line-length
-  args:
-    chdir: /tmp/eg_mecm-mepm/deploy/
+  command: helm install --wait mecm-mepm-edgegallery edgegallery/mecm-mepm --set jwt.publicKeySecretName=mecm-mepm-jwt-public-secret --set mepm.secretName=edgegallery-mepm-secret --set ssl.secretName=mecm-mepm-ssl-secret --set images.lcmcontroller.tag={{ vardata.mepmlcmcontrollerimagetag.name}} --set images.k8splugin.tag={{ vardata.mepmk8spluginimagetag.name}} --set images.postgres.tag={{ vardata.mepmpostgresimagetag.name}}