X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ocd%2Finfra%2Fplaybooks%2Froles%2Feg_mecm-mepm%2Ftasks%2Finstall.yml;h=12a388c1b7f6744a84acb0754506555a3fd086d0;hb=3c1bb1c727ca416486ab96384557ee3d12acf1e9;hp=4e0187631f36aaaff960d60ad753a41575bf9d75;hpb=d0cbd03deaca80fcd86a9c08d513e226b263f9cb;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 4e01876..12a388c 100644
--- a/ocd/infra/playbooks/roles/eg_mecm-mepm/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/eg_mecm-mepm/tasks/install.yml
@@ -26,11 +26,15 @@
     file: ../../../config.yml
     name: vardata
 
+- name: Set a variable
+  ansible.builtin.set_fact:
+    comm_pwd: "{{ vardata.common_pwd.name }}"
+
 - name: Replacing password
   replace:
     path: /tmp/eg_mecm-mepm/deploy/conf/keys/postgres_init.sql
     regexp: 'PASSWORD_VALUE'
-    replace: "{{ vardata.db_password.name }}"
+    replace: "{{ vardata.common_pwd.name }}"
 
 - name: Create mecm-mepm-ssl-secret secret
   # yamllint disable rule:line-length
@@ -46,10 +50,17 @@
   args:
     chdir: /tmp/ssl-eg-keys-certs/
 
+- name: Create edgegallery-mepm-secret secret with common pwd
+  # 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.common_pwd.name}} --from-literal=postgresLcmCntlrPassword={{ vardata.common_pwd.name}} --from-literal=postgresk8sPluginPassword={{ vardata.common_pwd.name}}
+  # yamllint disable rule:line-length
+  when: comm_pwd != ""
+
 - name: Create edgegallery-mepm-secret secret
   # 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.db_password.name}} --from-literal=postgresLcmCntlrPassword={{ vardata.db_password.name}} --from-literal=postgresk8sPluginPassword={{ vardata.db_password.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.mecm_mepm_postgresPassword.name}} --from-literal=postgresLcmCntlrPassword={{ vardata.mecm_mepm_postgresLcmCntlrPassword.name}} --from-literal=postgresk8sPluginPassword={{ vardata.mecm_mepm_postgresk8sPluginPassword.name}}
   # yamllint disable rule:line-length
+  when: comm_pwd == ""
 
 - name: Create mepm service account
   command: kubectl apply -f /tmp/eg_mecm-mepm/deploy/conf/manifest/mepm/mepm-service-account.yaml
@@ -58,5 +69,5 @@
 
 - name: Install 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 --set images.lcmcontroller.tag={{ vardata.eg_image_tag.name}} --set images.k8splugin.tag={{ vardata.eg_image_tag.name}} --set images.postgres.tag={{ vardata.postgres_image_tag.name}}
+  command: helm install mecm-mepm-edgegaller 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.repository={{ vardata.private_repo_ip.name}}:{{ vardata.docker_registry_port.name}}/edgegallery/mecm-applcm --set images.k8splugin.repository={{ vardata.private_repo_ip.name}}:{{ vardata.docker_registry_port.name}}/edgegallery/mecm-applcm-k8splugin --set images.postgres.repository={{ vardata.private_repo_ip.name}}:{{ vardata.docker_registry_port.name}}/postgres --set images.lcmcontroller.tag={{ vardata.eg_image_tag.name}} --set images.k8splugin.tag={{ vardata.eg_image_tag.name}} --set images.postgres.tag=12.3 --set images.lcmcontroller.pullPolicy=IfNotPresent --set images.k8splugin.pullPolicy=IfNotPresent --set images.postgres.pullPolicy=IfNotPresent
   # yamllint disable rule:line-length