From: khemendra kumar Date: Fri, 11 Feb 2022 01:55:53 +0000 (+0530) Subject: update EdgeGallery version 1.5 X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=883943648d86ce7665de0b4c90c76e3b62da2e30;p=eliot.git update EdgeGallery version 1.5 Signed-off-by: khemendra kumar Change-Id: Iae2484e6ad9d00c9699c3e89aa7fb1e3335b93f7 --- diff --git a/blueprints/iotgateway/playbooks/default-var.yml b/blueprints/iotgateway/playbooks/default-var.yml index baf793f..36f8c72 100644 --- a/blueprints/iotgateway/playbooks/default-var.yml +++ b/blueprints/iotgateway/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,12 +63,6 @@ LAB_PORT: 30096 HEALTHCHECK_PORT: 32759 HEALTHCHECK_M_PORT: 32757 -# Set the Passwords for developer OpenStack Ubuntu VM -developerVMImagePassword: 123456 - -# certPassword is used for generating SSL keys -certPassword: te9Fmv%qaq - # used for signature SIGNATURE_SECRET_NAME: edgegallery-signature-secret @@ -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/blueprints/iotgateway/playbooks/password-var.yml b/blueprints/iotgateway/playbooks/password-var.yml index 35311db..01a0cb7 100644 --- a/blueprints/iotgateway/playbooks/password-var.yml +++ b/blueprints/iotgateway/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/blueprints/iotgateway/playbooks/roles/egallery-all-aiomode/tasks/install.yml b/blueprints/iotgateway/playbooks/roles/egallery-all-aiomode/tasks/install.yml index 96d5a9b..4a52c4e 100644 --- a/blueprints/iotgateway/playbooks/roles/egallery-all-aiomode/tasks/install.yml +++ b/blueprints/iotgateway/playbooks/roles/egallery-all-aiomode/tasks/install.yml @@ -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/blueprints/iotgateway/playbooks/roles/egallery-tar/tasks/install.yml b/blueprints/iotgateway/playbooks/roles/egallery-tar/tasks/install.yml index 2329137..bfb6966 100644 --- a/blueprints/iotgateway/playbooks/roles/egallery-tar/tasks/install.yml +++ b/blueprints/iotgateway/playbooks/roles/egallery-tar/tasks/install.yml @@ -12,51 +12,51 @@ # See the License for the specific language governing permissions and # limitations under the License. ---- - - name: Create directory to download EG-TAR command: mkdir -p /tmp/eg_download/deploy args: chdir: "{{playbook_dir}}" ignore_errors: yes -- name: Download 1.1 edgegallery x86 +- name: Download 1.5.0 edgegallery x86 # yamllint disable rule:line-length - command: wget https://edgegallery.obs.cn-east-3.myhuaweicloud.com/releases/v1.3.2/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 inventory file for muno - command: cp hosts-muno /tmp/eg_download/deploy/EdgeGallery-v1.3.2-all-x86/install +- name: Set var.yml to eg path + # yamllint disable rule:line-length + command: cp var.yml /tmp/eg_download/deploy/EdgeGallery-v1.5.0-all-x86/install + # yamllint disable rule:line-length args: chdir: "{{playbook_dir}}" when: ansible_architecture == 'x86_64' -- name: Set var.yml to eg path +- name: Set default-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 default-var.yml /tmp/eg_download/deploy/EdgeGallery-v1.5.0-all-x86/install # yamllint disable rule:line-length args: chdir: "{{playbook_dir}}" when: ansible_architecture == 'x86_64' -- name: Set default-var.yml to eg path +- name: Set password-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 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/blueprints/iotgateway/playbooks/var.yml b/blueprints/iotgateway/playbooks/var.yml index c4ea708..92d94ab 100644 --- a/blueprints/iotgateway/playbooks/var.yml +++ b/blueprints/iotgateway/playbooks/var.yml @@ -21,11 +21,14 @@ NETWORK_INTERFACE: ens.* # 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