From 55d03ee0cf53104344bba418feea143c908427ee Mon Sep 17 00:00:00 2001 From: khemendra kumar Date: Mon, 7 Feb 2022 10:49:25 +0530 Subject: [PATCH] update for EG 1.5 version Signed-off-by: khemendra kumar Change-Id: I62ab38e090ce0623c73af86e2bb78fccc3589683 --- ocd/infra/playbooks/default-var.yml | 29 ++++++++++++++-------- ocd/infra/playbooks/password-var.yml | 3 +++ .../roles/egallery-all-aiomode/tasks/install.yml | 4 +-- .../playbooks/roles/egallery-tar/tasks/install.yml | 14 +++++------ ocd/infra/playbooks/var.yml | 8 ++++-- 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/ocd/infra/playbooks/default-var.yml b/ocd/infra/playbooks/default-var.yml index 11d58dd..36f8c72 100644 --- a/ocd/infra/playbooks/default-var.yml +++ b/ocd/infra/playbooks/default-var.yml @@ -14,8 +14,8 @@ # limitations under the License. # The image tag here could only be latest, and helm tag could only be 1.1.0 -EG_IMAGE_TAG: v1.3.2 -HELM_TAG: 1.3.2 +EG_IMAGE_TAG: v1.5.0 +HELM_TAG: 1.5.0 # Mode for online or offline install, currently only support offline NETWORK_MODE: offline @@ -49,9 +49,10 @@ APPSTORE_HELM_RELEASE_NAME: appstore-edgegallery DEVELOPER_HELM_RELEASE_NAME: developer-edgegallery MECM_MEO_HELM_RELEASE_NAME: mecm-meo-edgegallery ATP_HELM_RELEASE_NAME: atp-edgegallery +THIRD_SYSTEM_HELM_RELEASE_NAME: thirdsystem-edgegallery EG_VIEW_HELM_RELEASE_NAME: eg-view-edgegallery -MEPM_PORT: 30097 +MEPM_PORT: 32152 APPSTORE_PORT: 30091 DEVELOPER_PORT: 30092 MECM_PORT: 30093 @@ -62,14 +63,8 @@ LAB_PORT: 30096 HEALTHCHECK_PORT: 32759 HEALTHCHECK_M_PORT: 32757 -# Set the Passwords for developer OpenStack Ubuntu VM -developerVMImagePassword: - -# certPassword is used for generating SSL keys -certPassword: - # used for signature -SIGNATURE_SECRET_NAME: +SIGNATURE_SECRET_NAME: edgegallery-signature-secret # If harbor is setup in a remote system, then mention the remote system IP as harbor IP #HarborIP: xxx.xxx.xxx.xxx @@ -88,3 +83,17 @@ EGUSER_UID: 166 EGGROUP_GID: 166 APPSTORE_PACKAGES: /edgegallery/appstore/packages FILE_SYSTEM_PACKAGES: /edgegallery/filesystem/images + +# External IAM Config +ENABLE_EXTERNAL_IAM: false +# If ENABLE_EXTERNAL_IAM is true, then the following need to be set +# EXTERNAL_IAM_ENDPOINT: https://xxx.xxx.xxx.xxx + +# Access by proxy for all frontend projects +# AUTH_SERVER_ADDRESS_CLIENT_ACCESS: https://xxx.xxx.xxx.xxx/xx/xx + +# EDGEGALLERY_CLIENT_ACCESS_URL: https://xxx.xxx.xxx.xxx/xx/xx +# APPSTORE_CLIENT_ACCESS_URL: https://xxx.xxx.xxx.xxx/xx/xx +# DEVELOPER_CLIENT_ACCESS_URL: https://xxx.xxx.xxx.xxx/xx/xx +# MECM_CLIENT_ACCESS_URL: https://xxx.xxx.xxx.xxx/xx/xx +# ATP_CLIENT_ACCESS_URL: https://xxx.xxx.xxx.xxx/xx/xx diff --git a/ocd/infra/playbooks/password-var.yml b/ocd/infra/playbooks/password-var.yml index 35311db..01a0cb7 100644 --- a/ocd/infra/playbooks/password-var.yml +++ b/ocd/infra/playbooks/password-var.yml @@ -24,3 +24,6 @@ oauth2ClientPassword: xxxxx # Redis Password used by user mgmt, no default value, must set by users here userMgmtRedisPassword: xxxxx + +# certPassword is used for generating SSL keys +certPassword: xxxxx diff --git a/ocd/infra/playbooks/roles/egallery-all-aiomode/tasks/install.yml b/ocd/infra/playbooks/roles/egallery-all-aiomode/tasks/install.yml index 5b78a20..e321ceb 100644 --- a/ocd/infra/playbooks/roles/egallery-all-aiomode/tasks/install.yml +++ b/ocd/infra/playbooks/roles/egallery-all-aiomode/tasks/install.yml @@ -19,7 +19,7 @@ # yamllint disable rule:line-length cmd: ansible-playbook --inventory hosts-aio -e "ansible_user=root" eg_all_aio_install.yml >> aio_log # yamllint disable rule:line-length - chdir: /tmp/eg_download/deploy/EdgeGallery-v1.3.2-all-x86/install + chdir: /tmp/eg_download/deploy/EdgeGallery-v1.5.0-all-x86/install when: ansible_architecture == 'aarch64' - name: Install edgegallery @@ -27,5 +27,5 @@ # yamllint disable rule:line-length cmd: ansible-playbook --inventory hosts-aio -e "ansible_user=root" eg_all_aio_install.yml >> aio_log # yamllint disable rule:line-length - chdir: /tmp/eg_download/deploy/EdgeGallery-v1.3.2-all-x86/install + chdir: /tmp/eg_download/deploy/EdgeGallery-v1.5.0-all-x86/install when: ansible_architecture == 'x86_64' diff --git a/ocd/infra/playbooks/roles/egallery-tar/tasks/install.yml b/ocd/infra/playbooks/roles/egallery-tar/tasks/install.yml index 25ee024..8a521e8 100644 --- a/ocd/infra/playbooks/roles/egallery-tar/tasks/install.yml +++ b/ocd/infra/playbooks/roles/egallery-tar/tasks/install.yml @@ -19,29 +19,29 @@ chdir: "{{playbook_dir}}" ignore_errors: yes -- name: Download 1.3.2 edgegallery x86 +- name: Download 1.5.0 edgegallery x86 # yamllint disable rule:line-length - command: wget http://edgegallery-v1.3.2.obs.cn-north-4.myhuaweicloud.com/x86/EdgeGallery-v1.3.2-all-x86.tar.gz + command: wget http://edgegallery-v1.5.0.obs.cn-north-4.myhuaweicloud.com/x86/EdgeGallery-v1.5.0-all-x86.tar.gz # yamllint disable rule:line-length args: chdir: /tmp/eg_download/deploy/ when: ansible_architecture == 'x86_64' - name: Untar Edgegallery offline tarbal file - command: tar -xvf EdgeGallery-v1.3.2-all-x86.tar.gz + command: tar -xvf EdgeGallery-v1.5.0-all-x86.tar.gz args: chdir: /tmp/eg_download/deploy/ when: ansible_architecture == 'x86_64' - name: Set inventory file for aio - command: cp hosts-aio /tmp/eg_download/deploy/EdgeGallery-v1.3.2-all-x86/install + command: cp hosts-aio /tmp/eg_download/deploy/EdgeGallery-v1.5.0-all-x86/install args: chdir: "{{playbook_dir}}" when: ansible_architecture == 'x86_64' - name: Set var.yml to eg path # yamllint disable rule:line-length - command: cp var.yml /tmp/eg_download/deploy/EdgeGallery-v1.3.2-all-x86/install + command: cp var.yml /tmp/eg_download/deploy/EdgeGallery-v1.5.0-all-x86/install # yamllint disable rule:line-length args: chdir: "{{playbook_dir}}" @@ -49,7 +49,7 @@ - name: Set default-var.yml to eg path # yamllint disable rule:line-length - command: cp default-var.yml /tmp/eg_download/deploy/EdgeGallery-v1.3.2-all-x86/install + command: cp default-var.yml /tmp/eg_download/deploy/EdgeGallery-v1.5.0-all-x86/install # yamllint disable rule:line-length args: chdir: "{{playbook_dir}}" @@ -57,7 +57,7 @@ - name: Set password-var.yml to eg path # yamllint disable rule:line-length - command: cp password-var.yml /tmp/eg_download/deploy/EdgeGallery-v1.3.2-all-x86/install + command: cp password-var.yml /tmp/eg_download/deploy/EdgeGallery-v1.5.0-all-x86/install # yamllint disable rule:line-length args: chdir: "{{playbook_dir}}" diff --git a/ocd/infra/playbooks/var.yml b/ocd/infra/playbooks/var.yml index bce616c..d15ee7d 100644 --- a/ocd/infra/playbooks/var.yml +++ b/ocd/infra/playbooks/var.yml @@ -1,3 +1,4 @@ +# # Copyright 2021 Huawei Technologies Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,18 +14,21 @@ # limitations under the License. # Set the regex name of the network interface for calico -NETWORK_INTERFACE: ens.* +NETWORK_INTERFACE: eth.* # Could be true or false # true: Deploy k8s NFS Server to keep the persistence of all pods' data # false: No need to keep the persistence of all pods' data ENABLE_PERSISTENCE: true +# One IP of the cluster master node +MASTER_IP: xxx.xxx.xxx.xxx + # ip for portals, will be set to private IP of master node default or reset it to be the public IP of master node here # PORTAL_IP: xxx.xxx.xxx.xxx # IP of the Controller master which is used for Edge to connect -# If you deploy Controller and Edge together in one cluster, then ther is no need to set this param +# If you deploy Controller and Edge together in one cluster, then there is no need to set this param # CONTROLLER_MASTER_IP: xxx.xxx.xxx.xxx # NIC name of master node -- 2.16.6