From 16fccbdadfc34845823e92d206a8a0714798f150 Mon Sep 17 00:00:00 2001 From: "arvind.patel@huawei.com" Date: Mon, 7 Dec 2020 15:10:47 +0530 Subject: [PATCH] Removed extra parameters Signed-off-by: arvind.patel@huawei.com Change-Id: I66730cf46e7eb26521611def2eceffaf649c3ae5 --- ocd/infra/playbooks/config.yml | 6 ------ ocd/infra/playbooks/roles/eg_mecm-meo/tasks/install.yml | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ocd/infra/playbooks/config.yml b/ocd/infra/playbooks/config.yml index 0e5de19..16d0991 100644 --- a/ocd/infra/playbooks/config.yml +++ b/ocd/infra/playbooks/config.yml @@ -55,12 +55,6 @@ mecm_mepm_postgresk8sPluginPassword: name: ########### Center config ########### -######### Mandatory ######### -mecm_meo_edgeRepoUserName: - name: -mecm_meo_edgeRepoPassword: - name: - ######### Optional ######### usermgmt_port: name: 30067 diff --git a/ocd/infra/playbooks/roles/eg_mecm-meo/tasks/install.yml b/ocd/infra/playbooks/roles/eg_mecm-meo/tasks/install.yml index e6c2fc7..ecbd950 100644 --- a/ocd/infra/playbooks/roles/eg_mecm-meo/tasks/install.yml +++ b/ocd/infra/playbooks/roles/eg_mecm-meo/tasks/install.yml @@ -50,7 +50,7 @@ - name: Create certificate edgegallery-mecm-secret with common pwd # yamllint disable rule:line-length - command: kubectl create secret generic edgegallery-mecm-secret --from-file=postgres_init.sql=/tmp/eg_mecm-meo/deploy/conf/keys/postgres_init.sql --from-literal=postgresPassword={{ vardata.common_pwd.name}} --from-literal=postgresApmPassword={{ vardata.common_pwd.name}} --from-literal=postgresAppoPassword={{ vardata.common_pwd.name}} --from-literal=postgresInventoryPassword={{ vardata.common_pwd.name}} --from-literal=edgeRepoUserName={{ vardata.mecm_meo_edgeRepoUserName.name}} --from-literal=edgeRepoPassword={{ vardata.mecm_meo_edgeRepoPassword.name}} + command: kubectl create secret generic edgegallery-mecm-secret --from-file=postgres_init.sql=/tmp/eg_mecm-meo/deploy/conf/keys/postgres_init.sql --from-literal=postgresPassword={{ vardata.common_pwd.name}} --from-literal=postgresApmPassword={{ vardata.common_pwd.name}} --from-literal=postgresAppoPassword={{ vardata.common_pwd.name}} --from-literal=postgresInventoryPassword={{ vardata.common_pwd.name}} --from-literal=edgeRepoUserName=admin --from-literal=edgeRepoPassword={{ vardata.common_pwd.name}} # yamllint disable rule:line-length args: chdir: /tmp/eg_mecm-meo/deploy/ @@ -58,7 +58,7 @@ - name: Generates certificate edgegallery-mecm-secret # yamllint disable rule:line-length - command: kubectl create secret generic edgegallery-mecm-secret --from-file=postgres_init.sql=/tmp/eg_mecm-meo/deploy/conf/keys/postgres_init.sql --from-literal=postgresPassword={{ vardata.mecm_meo_postgresPassword.name}} --from-literal=postgresApmPassword={{ vardata.mecm_meo_postgresApmPassword.name}} --from-literal=postgresAppoPassword={{ vardata.mecm_meo_postgresAppoPassword.name}} --from-literal=postgresInventoryPassword={{ vardata.mecm_meo_postgresInventoryPassword.name}} --from-literal=edgeRepoUserName={{ vardata.mecm_meo_edgeRepoUserName.name}} --from-literal=edgeRepoPassword={{ vardata.mecm_meo_edgeRepoPassword.name}} + command: kubectl create secret generic edgegallery-mecm-secret --from-file=postgres_init.sql=/tmp/eg_mecm-meo/deploy/conf/keys/postgres_init.sql --from-literal=postgresPassword={{ vardata.mecm_meo_postgresPassword.name}} --from-literal=postgresApmPassword={{ vardata.mecm_meo_postgresApmPassword.name}} --from-literal=postgresAppoPassword={{ vardata.mecm_meo_postgresAppoPassword.name}} --from-literal=postgresInventoryPassword={{ vardata.mecm_meo_postgresInventoryPassword.name}} --from-literal=edgeRepoUserName=admin --from-literal=edgeRepoPassword={{ vardata.common_pwd.name}} # yamllint disable rule:line-length args: chdir: /tmp/eg_mecm-meo/deploy/ -- 2.16.6