Removed extra parameters

Signed-off-by: arvindpatel <arvind.patel@huawei.com>
Change-Id: I8a63c8b06232c020bba368e30dd1701a60487d72

diff --git a/ocd/infra/playbooks/config.yml b/ocd/infra/playbooks/config.yml
index a91c99e..859805e 100644 (file)
--- a/ocd/infra/playbooks/config.yml
+++ b/ocd/infra/playbooks/config.yml
@@ -13,110 +13,42 @@
 # limitations under the License.
 ---
 
-swrusr:
-  name:
-swrpass:
-  name:
-cert_validity_in_days:
-  name: 365
-mecm_meo_db_password:
-  name:
-mecm_mepm_db_password:
-  name:
-dockerusr:
-  name:
-dockerpass:
-  name:
-secret_keystorepass:
-  name:
-secret_cert_pass:
+######### Mandatory parameters #########
+
+eg_image_tag:
   name:
 private_repo_ip:
   name:
-mep_pg_admin_pwd:
-  name:
-mep_kong_pg_pwd:
-  name:
-mep_cert_pwd:
-  name:
-system_interfaceeth1:
-  name:
-system_interfaceeth2:
-  name:
-mep_ip_addr_macvlan_eg_mep1:
-  name:
-mep_ip_addr_mm5_eg_mm5:
-  name:
-mep_image_tag:
-  name:
-mep_mepauth_image_tag:
-  name:
-mep_dns_image_tag:
-  name:
-generate_cert_pass:
-  name:
-mecm_mepm_postgresPassword:
-  name:
-mecm_mepm_postgresLcmCntlrPassword:
-  name:
-mecm_mepm_postgresk8sPluginPassword:
-  name:
-mecm_mepm_lcmcontroller_image_tag:
-  name:
-mecm_mepm_k8splugin_image_tag:
+secret_pwd:
   name:
-mecm_mepm_postgres_image_tag:
+db_password:
   name:
-user_mgmt_encryptpass:
-  name:
-user_mgmt_oauth_appstore_client_ip:
-  name:
-user_mgmt_oauth_developer_client_ip:
-  name:
-user_mgmt_oauth_mecm_client_ip:
-  name:
-user_mgmt_image_tag:
-  name:
-mecm_meo_keystorePassword:
-  name:
-mecm_meo_truststorePassword:
-  name:
-mecm_meo_postgresPassword:
-  name:
-mecm_meo_postgresApmPassword:
+
+########## Edge config #############
+
+postgres_image_tag:
   name:
-mecm_meo_postgresAppoPassword:
+edge_management_interface:
   name:
-mecm_meo_postgresInventoryPassword:
+edge_dataplane_interface:
   name:
+eg-mp1-address:
+  name: 200.1.1.2/24
+eg-mm5-address:
+  name: 100.1.1.2/24
+
+########### Center config ###########
+
 mecm_meo_edgeRepoUserName:
   name:
 mecm_meo_edgeRepoPassword:
   name:
-mecm_meo_image_tag:
-  name:
-mecm_meo_appo_image_tag:
-  name:
-mecm_meo_apm_image_tag:
-  name:
-mecm_meo_postgres_tag:
-  name:
 mecm_fe_centernodeip:
   name:
-mecm_fe_image_tag:
-  name:
 appstore_centernodeip:
   name:
-appstore_fe_image_tag:
-  name:
-appstore_be_image_tag:
-  name:
 developer_centernodeip:
   name:
-developer_fe_image_tag:
-  name:
-developer_be_image_tag:
-  name:
 developer_centernode_port:
   name: 30067
 mecm_fe_centernodeport:
@@ -127,3 +59,8 @@ user_mgmt_oauth_developer_client_port:
   name: 30092
 user_mgmt_oauth_mecm_client_port:
   name: 30093
+
+############ Certificate validity#######
+
+cert_validity_in_days:
+  name: 365

diff --git a/ocd/infra/playbooks/roles/eg_appstore/tasks/install.yml b/ocd/infra/playbooks/roles/eg_appstore/tasks/install.yml
index 3d981fa..be7900d 100644 (file)
--- a/ocd/infra/playbooks/roles/eg_appstore/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/eg_appstore/tasks/install.yml
@@ -23,4 +23,4 @@
 
 - name: Helm install appstore
   # yamllint disable rule:line-length
-  command: helm install --wait appstore-edgegallery edgegallery/appstore --set global.oauth2.authServerAddress=https://{{vardata.appstore_centernodeip.name}}:30067 --set images.appstoreFe.tag={{vardata.appstore_fe_image_tag.name}} --set images.appstoreBe.tag={{vardata.appstore_be_image_tag.name}} --set global.ssl.enabled=true --set global.ssl.secretName=edgegallery-ssl-secret
+  command: helm install --wait appstore-edgegallery edgegallery/appstore --set global.oauth2.authServerAddress=https://{{vardata.appstore_centernodeip.name}}:30067 --set images.appstoreFe.tag={{vardata.eg_image_tag.name}} --set images.appstoreBe.tag={{vardata.eg_image_tag.name}} --set global.ssl.enabled=true --set global.ssl.secretName=edgegallery-ssl-secret

diff --git a/ocd/infra/playbooks/roles/eg_certs/tasks/main.yml b/ocd/infra/playbooks/roles/eg_certs/tasks/main.yml
index 02f073c..0ddc8f4 100644 (file)
--- a/ocd/infra/playbooks/roles/eg_certs/tasks/main.yml
+++ b/ocd/infra/playbooks/roles/eg_certs/tasks/main.yml
@@ -17,7 +17,9 @@
 ---
 # tasks file for eg_certs
 - include: "install.yml"
+  static: false
   when: operation == 'install'
 
 - include: "uninstall.yml"
+  static: false
   when: operation == 'uninstall'

diff --git a/ocd/infra/playbooks/roles/eg_developer/tasks/install.yml b/ocd/infra/playbooks/roles/eg_developer/tasks/install.yml
index f72ab08..278385c 100644 (file)
--- a/ocd/infra/playbooks/roles/eg_developer/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/eg_developer/tasks/install.yml
@@ -23,4 +23,4 @@
 
 - name: Developer chart installing
   # yamllint disable rule:line-length
-  command: helm install --wait developer-edgegallery edgegallery/developer --set global.oauth2.authServerAddress=https://{{vardata.developer_centernodeip.name}}:{{ vardata.developer_centernode_port.name}} --set images.developerFe.tag={{vardata.developer_fe_image_tag.name}} --set images.developerBe.tag={{vardata.developer_be_image_tag.name}} --set global.ssl.enabled=true --set global.ssl.secretName=edgegallery-ssl-secret
+  command: helm install --wait developer-edgegallery edgegallery/developer --set global.oauth2.authServerAddress=https://{{vardata.developer_centernodeip.name}}:{{ vardata.developer_centernode_port.name}} --set images.developerFe.tag={{vardata.eg_image_tag.name}} --set images.developerBe.tag={{vardata.eg_image_tag.name}} --set global.ssl.enabled=true --set global.ssl.secretName=edgegallery-ssl-secret

diff --git a/ocd/infra/playbooks/roles/eg_mecm-fe/tasks/install.yml b/ocd/infra/playbooks/roles/eg_mecm-fe/tasks/install.yml
index 6dbe665..206fd96 100644 (file)
--- a/ocd/infra/playbooks/roles/eg_mecm-fe/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/eg_mecm-fe/tasks/install.yml
@@ -23,4 +23,4 @@
 
 - name: Install mecm-fe
   # yamllint disable rule:line-length
-  command: helm install --wait mecm-fe-edgegallery edgegallery/mecm-fe --set global.oauth2.authServerAddress=https://{{vardata.mecm_fe_centernodeip.name}}:{{vardata.mecm_fe_centernodeport.name}} --set images.mecmFe.tag={{vardata.mecm_fe_image_tag.name}} --set global.ssl.enabled=true --set global.ssl.secretName=edgegallery-ssl-secret
+  command: helm install --wait mecm-fe-edgegallery edgegallery/mecm-fe --set global.oauth2.authServerAddress=https://{{vardata.mecm_fe_centernodeip.name}}:{{vardata.mecm_fe_centernodeport.name}} --set images.mecmFe.tag={{vardata.eg_image_tag.name}} --set global.ssl.enabled=true --set global.ssl.secretName=edgegallery-ssl-secret

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 523f07d..5ebc98a 100644 (file)
--- a/ocd/infra/playbooks/roles/eg_mecm-meo/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/eg_mecm-meo/tasks/install.yml
@@ -30,16 +30,16 @@
   replace:
     path: /tmp/eg_mecm-meo/deploy/conf/keys/postgres_init.sql
     regexp: 'PASSWORD_VALUE'
-    replace: "{{ vardata.mecm_meo_db_password.name }}"
+    replace: "{{ vardata.db_password.name }}"
 
 - name: Generates certificate mecm-ssl-secret
   # yamllint disable rule:line-length
-  command: kubectl create secret generic mecm-ssl-secret --from-file=keystore.p12=/tmp/ssl-eg-keys-certs/keystore.p12 --from-file=keystore.jks=/tmp/ssl-eg-keys-certs/keystore.jks --from-literal=keystorePassword={{ vardata.mecm_meo_keystorePassword.name}} --from-literal=keystoreType=PKCS12 --from-literal=keyAlias=edgegallery --from-literal=truststorePassword={{ vardata.mecm_meo_truststorePassword.name}}
+  command: kubectl create secret generic mecm-ssl-secret --from-file=keystore.p12=/tmp/ssl-eg-keys-certs/keystore.p12 --from-file=keystore.jks=/tmp/ssl-eg-keys-certs/keystore.jks --from-literal=keystorePassword={{ vardata.secret_pwd.name}} --from-literal=keystoreType=PKCS12 --from-literal=keyAlias=edgegallery --from-literal=truststorePassword={{ vardata.secret_pwd.name}}
   # yamllint disable rule:line-length
 
 - 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.secret_pwd.name}} --from-literal=postgresApmPassword={{ vardata.secret_pwd.name}} --from-literal=postgresAppoPassword={{ vardata.secret_pwd.name}} --from-literal=postgresInventoryPassword={{ vardata.secret_pwd.name}} --from-literal=edgeRepoUserName={{ vardata.mecm_meo_edgeRepoUserName.name}}  --from-literal=edgeRepoPassword={{ vardata.mecm_meo_edgeRepoPassword.name}}
   # yamllint disable rule:line-length
   args:
     chdir: /tmp/eg_mecm-meo/deploy/
@@ -50,5 +50,5 @@
 
 - name: Helm install
   # yamllint disable rule:line-length
-  command: helm install --wait mecm-meo-edgegallery edgegallery/mecm-meo --set ssl.secretName=mecm-ssl-secret --set mecm.secretName=edgegallery-mecm-secret --set images.inventory.tag={{ vardata.mecm_meo_image_tag.name}} --set images.appo.tag={{ vardata.mecm_meo_appo_image_tag.name}} --set images.apm.tag={{ vardata.mecm_meo_apm_image_tag.name}} --set images.postgres.tag={{ vardata.mecm_meo_postgres_tag.name}} --set mecm.docker.fsgroup=result.stdout
+  command: helm install --wait mecm-meo-edgegallery edgegallery/mecm-meo --set ssl.secretName=mecm-ssl-secret --set mecm.secretName=edgegallery-mecm-secret --set images.inventory.tag={{ vardata.eg_image_tag.name}} --set images.appo.tag={{ vardata.eg_image_tag.name}} --set images.apm.tag={{ vardata.eg_image_tag.name}} --set images.postgres.tag={{ vardata.postgres_image_tag.name}} --set mecm.docker.fsgroup=result.stdout
   # yamllint disable rule:line-length

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 2ad97c0..4e01876 100644 (file)
--- a/ocd/infra/playbooks/roles/eg_mecm-mepm/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/eg_mecm-mepm/tasks/install.yml
@@ -30,7 +30,7 @@
   replace:
     path: /tmp/eg_mecm-mepm/deploy/conf/keys/postgres_init.sql
     regexp: 'PASSWORD_VALUE'
-    replace: "{{ vardata.mecm_mepm_db_password.name }}"
+    replace: "{{ vardata.db_password.name }}"
 
 - name: Create mecm-mepm-ssl-secret secret
   # yamllint disable rule:line-length
@@ -48,7 +48,7 @@
 
 - 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.mecm_mepm_postgresPassword.name}} --from-literal=postgresLcmCntlrPassword={{ vardata.mecm_mepm_postgresLcmCntlrPassword.name}} --from-literal=postgresk8sPluginPassword={{ vardata.mecm_mepm_postgresk8sPluginPassword.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.db_password.name}} --from-literal=postgresLcmCntlrPassword={{ vardata.db_password.name}} --from-literal=postgresk8sPluginPassword={{ vardata.db_password.name}}
   # yamllint disable rule:line-length
 
 - name: Create mepm service account
@@ -58,5 +58,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.mecm_mepm_lcmcontroller_image_tag.name}} --set images.k8splugin.tag={{ vardata.mecm_mepm_k8splugin_image_tag.name}} --set images.postgres.tag={{ vardata.mecm_mepm_postgres_image_tag.name}}
+  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}}
   # yamllint disable rule:line-length

diff --git a/ocd/infra/playbooks/roles/eg_mecm-mepm/tasks/main.yml b/ocd/infra/playbooks/roles/eg_mecm-mepm/tasks/main.yml
index 39ca99a..7faf1bd 100644 (file)
--- a/ocd/infra/playbooks/roles/eg_mecm-mepm/tasks/main.yml
+++ b/ocd/infra/playbooks/roles/eg_mecm-mepm/tasks/main.yml
@@ -18,7 +18,9 @@
 
 # tasks file for eg_mecm-mepm
 - include: "install.yml"
+  static: false
   when: operation == 'install'
 
 - include: "uninstall.yml"
+  static: false
   when: operation == 'uninstall'

diff --git a/ocd/infra/playbooks/roles/eg_mep/tasks/install.yml b/ocd/infra/playbooks/roles/eg_mep/tasks/install.yml
index 8733101..324427c 100644 (file)
--- a/ocd/infra/playbooks/roles/eg_mep/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/eg_mep/tasks/install.yml
@@ -61,7 +61,7 @@
 
 - name: Openssl rsa mep tls
   # yamllint disable rule:line-length
-  command: openssl rsa -in mepserver_tls.key -aes256 -passout pass:{{ vardata.generate_cert_pass.name}} -out mepserver_encryptedtls.key
+  command: openssl rsa -in mepserver_tls.key -aes256 -passout pass:{{ vardata.secret_pwd.name}} -out mepserver_encryptedtls.key
   # yamllint disable rule:line-length
   args:
     chdir: /tmp/.mep_tmp_cer/
@@ -92,7 +92,7 @@
 
 - name: Openssl rsa in jwt
   # yamllint disable rule:line-length
-  command: openssl rsa -in jwt_privatekey -aes256 -passout pass:{{ vardata.generate_cert_pass.name}} -out jwt_encrypted_privatekey
+  command: openssl rsa -in jwt_privatekey -aes256 -passout pass:{{ vardata.secret_pwd.name}} -out jwt_encrypted_privatekey
   # yamllint disable rule:line-length
   args:
     chdir: /tmp/.mep_tmp_cer/
@@ -104,7 +104,7 @@
 
 - name: Create generic pg secret
   # yamllint disable rule:line-length
-  command: kubectl -n mep create secret generic pg-secret --from-literal=pg_admin_pwd={{ vardata.mep_pg_admin_pwd.name}} --from-literal=kong_pg_pwd={{ vardata.mep_kong_pg_pwd.name}}
+  command: kubectl -n mep create secret generic pg-secret --from-literal=pg_admin_pwd={{ vardata.secret_pwd.name}} --from-literal=kong_pg_pwd={{ vardata.secret_pwd.name}}
            --from-file=server.key=/tmp/.mep_tmp_cer/mepserver_tls.key --from-file=server.crt=/tmp/.mep_tmp_cer/mepserver_tls.crt
   # yamllint disable rule:line-length
   args:
@@ -112,7 +112,7 @@
 
 - name: Create mep generic for mep ssl
   # yamllint disable rule:line-length
-  command: kubectl -n mep create secret generic mep-ssl --from-literal=cert_pwd={{ vardata.mep_cert_pwd.name}} --from-file=server.cer=/tmp/.mep_tmp_cer/mepserver_tls.crt
+  command: kubectl -n mep create secret generic mep-ssl --from-literal=cert_pwd={{ vardata.secret_pwd.name}} --from-file=server.cer=/tmp/.mep_tmp_cer/mepserver_tls.crt
            --from-file=server_key.pem=/tmp/.mep_tmp_cer/mepserver_encryptedtls.key --from-file=trust.cer=/tmp/.mep_tmp_cer/ca.crt
   # yamllint disable rule:line-length
   args:
@@ -186,14 +186,14 @@
 
 - name: Link eg mep macvlan
   # yamllint disable rule:line-length
-  command: ip link add eg-mp1 link {{ vardata.system_interfaceeth1.name}} type macvlan mode bridge
+  command: ip link add eg-mp1 link {{ vardata.edge_management_interface.name}} type macvlan mode bridge
   args:
     chdir: /tmp/eg_mep/deploy/
   ignore_errors: yes
   no_log: True
 
 - name: Link eg mep macvlan
-  command: ip addr add {{ vardata.mep_ip_addr_macvlan_eg_mep1.name}} dev eg-mp1
+  command: ip addr add {{ vardata.eg-mp1-address.name}} dev eg-mp1
   args:
     chdir: /tmp/eg_mep/deploy/
   ignore_errors: yes
@@ -208,14 +208,14 @@
 
 - name: Link eg eg mm5 with eth1
   # yamllint disable rule:line-length
-  command: ip link add eg-mm5 link {{ vardata.system_interfaceeth2.name}} type macvlan mode bridge
+  command: ip link add eg-mm5 link {{ vardata.edge_dataplane_interface.name}} type macvlan mode bridge
   args:
     chdir: /tmp/eg_mep/deploy/
   ignore_errors: yes
   no_log: True
 
 - name: Link eg eg mm5 ip addr
-  command: ip addr add {{ vardata.mep_ip_addr_mm5_eg_mm5.name}} dev eg-mm5
+  command: ip addr add {{ vardata.eg-mm5-address.name}} dev eg-mm5
   args:
     chdir: /tmp/eg_mep/deploy/
   ignore_errors: yes
@@ -233,5 +233,5 @@
 
 - name: Edge gallery mep installation pull chart and image
   # yamllint disable rule:line-length
-  command: helm install mep-edgegallery edgegallery/mep --set networkIsolation.phyInterface.mp1={{ vardata.system_interfaceeth1.name}} --set networkIsolation.phyInterface.mm5={{ vardata.system_interfaceeth2.name}} --set images.mep.tag={{ vardata.mep_image_tag.name}} --set images.mepauth.tag={{ vardata.mep_mepauth_image_tag.name}} --set images.dns.tag={{ vardata.mep_dns_image_tag.name}} --set ssl.secretName=mep-ssl
+  command: helm install mep-edgegallery edgegallery/mep --set networkIsolation.phyInterface.mp1={{ vardata.edge_management_interface.name}} --set networkIsolation.phyInterface.mm5={{ vardata.edge_dataplane_interface.name}} --set images.mep.tag={{ vardata.eg_image_tag.name}} --set images.mepauth.tag={{ vardata.eg_image_tag.name}} --set images.dns.tag={{ vardata.eg_image_tag.name}} --set ssl.secretName=mep-ssl
   # yamllint disable rule:line-length

diff --git a/ocd/infra/playbooks/roles/eg_secret/tasks/install.yml b/ocd/infra/playbooks/roles/eg_secret/tasks/install.yml
index 53892cd..2e43df8 100644 (file)
--- a/ocd/infra/playbooks/roles/eg_secret/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/eg_secret/tasks/install.yml
@@ -23,5 +23,5 @@
 
 - name: Generate secret
   # yamllint disable rule:line-length
-  command: kubectl create secret generic edgegallery-ssl-secret --from-file=keystore.p12=/tmp/ssl-eg-keys-certs/keystore.p12 --from-literal=keystorePassword={{ vardata.secret_keystorepass.name}} --from-literal=keystoreType=PKCS12 --from-literal=keyAlias=edgegallery --from-file=trust.cer=/tmp/ssl-eg-keys-certs/ca.crt --from-file=server.cer=/tmp/ssl-eg-keys-certs/tls.crt --from-file=server_key.pem=/tmp/ssl-eg-keys-certs/encryptedtls.key --from-literal=cert_pwd={{ vardata.secret_cert_pass.name}}
+  command: kubectl create secret generic edgegallery-ssl-secret --from-file=keystore.p12=/tmp/ssl-eg-keys-certs/keystore.p12 --from-literal=keystorePassword={{ vardata.secret_pwd.name}} --from-literal=keystoreType=PKCS12 --from-literal=keyAlias=edgegallery --from-file=trust.cer=/tmp/ssl-eg-keys-certs/ca.crt --from-file=server.cer=/tmp/ssl-eg-keys-certs/tls.crt --from-file=server_key.pem=/tmp/ssl-eg-keys-certs/encryptedtls.key --from-literal=cert_pwd={{ vardata.secret_pwd.name}}
   # yamllint disable rule:line-length

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 2d128ee..dec9d25 100644 (file)
--- a/ocd/infra/playbooks/roles/eg_user-mgmt/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/eg_user-mgmt/tasks/install.yml
@@ -23,10 +23,10 @@
 
 - name: Generating certificates for usermanagment
   # 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}}
+  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.secret_pwd.name}}
   # 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
+  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.eg_image_tag.name}} --set global.ssl.enabled=true --set global.ssl.secretName=edgegallery-ssl-secret
   # yamllint disable rule:line-length

diff --git a/ocd/infra/playbooks/roles/service_center/tasks/install.yml b/ocd/infra/playbooks/roles/service_center/tasks/install.yml
index 1bdcec1..5517e5a 100644 (file)
--- a/ocd/infra/playbooks/roles/service_center/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/service_center/tasks/install.yml
@@ -26,13 +26,6 @@
     file: ../../../config.yml
     name: vardata
 
-- name: Setting pull image path
-  # yamllint disable rule:line-length
-  command: kubectl create secret docker-registry swrregcred --docker-server=https://swr.ap-southeast-1.myhuaweicloud.com/v2/ --docker-username={{ vardata.swrusr.name}} --docker-password={{ vardata.swrpass.name}}
-  # yamllint disable rule:line-length
-  args:
-    chdir: /tmp/service_center/deploy/
-
 - name: Pull helm chart service center
   # yamllint disable rule:line-length
   command: helm install service-center-edgegallery edgegallery/servicecenter --set global.ssl.enabled=true --set global.ssl.secretName=edgegallery-ssl-secret