EG version upgrade to 1.3

Signed-off-by: khemendra kumar <khemendra.kumar@huawei.com>
Change-Id: I1ebd9f14c13e52234b351030a6462599c6d36871

diff --git a/ocd/infra/playbooks/default-var.yml b/ocd/infra/playbooks/default-var.yml
index 22d0dc7..d839d08 100644 (file)
--- 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: latest
-HELM_TAG: 1.1.0
+EG_IMAGE_TAG: v1.3.0
+HELM_TAG: 1.3.0
 
 # Mode for online or offline install, currently only support offline
 NETWORK_MODE: offline
@@ -33,23 +33,58 @@ COPY_TAR_TO_TARGET: yes
 # true means clean and false means not clean
 TARBALL_PATH_CLEANUP: true
 
+# Whether enable ingress
+# true means enable and false means disable
+ENABLE_INGRESS: true
+
+# Whether deploy appPkgTransTool
+# true means deploy and false means undeploy
+ENABLE_APPD: true
+
 HELM_CHARTS_PATH: "{{ TARBALL_PATH }}/helm/helm-charts"
 
+MEP_HELM_RELEASE_NAME: mep-edgegallery
+MEPM_HELM_RELEASE_NAME: mecm-mepm-edgegallery
 APPSTORE_HELM_RELEASE_NAME: appstore-edgegallery
 DEVELOPER_HELM_RELEASE_NAME: developer-edgegallery
-MECM_FE_HELM_RELEASE_NAME: mecm-fe-edgegallery
+MECM_MEO_HELM_RELEASE_NAME: mecm-meo-edgegallery
 ATP_HELM_RELEASE_NAME: atp-edgegallery
+EG_VIEW_HELM_RELEASE_NAME: eg-view-edgegallery
 
+MEPM_PORT: 30097
 APPSTORE_PORT: 30091
 DEVELOPER_PORT: 30092
 MECM_PORT: 30093
 ATP_PORT: 30094
+EDGEGALLERY_PORT: 30095
 USER_MGMT_PORT: 30067
 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:
+
+# If harbor is setup in a remote system, then mention the remote system IP as harbor IP
+#HarborIP: xxx.xxx.xxx.xxx
+
+# If SIGNATURE_CERT_P12 and SIGNATURE_CERT_CER are set here, will use it. Otherwise will generate them automatically
+#SIGNATURE_CERT_P12: xxx/xxx/xxx.p12
+#SIGNATURE_CERT_CER: xxx/xxx/xxx.cer
 
-# Could be true or false, currently only support false
-ENABLE_PERSISTENCE: false
+# If the above 2 files are given, should also give the password used to generate them
+#SIGNATURE_PWD: xxx
 
-# Should set the following 2 params if ENABLE_PERSISTENCE is true
-# NFS_SERVER_IP:
-# NFS_PATH:
+# Params used by EG NFS persistence storage
+EGUSER_NAME: eguser
+EGGROUP_NAME: eggroup
+EGUSER_UID: 166
+EGGROUP_GID: 166
+APPSTORE_PACKAGES: /edgegallery/appstore/packages
+FILE_SYSTEM_PACKAGES: /edgegallery/filesystem/images

diff --git a/ocd/infra/playbooks/password-var.yml b/ocd/infra/playbooks/password-var.yml
new file mode 100644 (file)
index 0000000..35311db
--- /dev/null
+++ b/ocd/infra/playbooks/password-var.yml
@@ -0,0 +1,26 @@
+#
+#   Copyright 2021 Huawei Technologies Co., Ltd.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+# Set the Password of Harbor admin account, no default value, must set by users here
+HARBOR_ADMIN_PASSWORD: xxxxx
+
+# postgresPassword is used for all postgres DB of all roles, no default value, must set by users here
+postgresPassword: xxxxx
+
+# oauth2ClientPassword is used for user mgmt, no default value, must set by users here
+oauth2ClientPassword: xxxxx
+
+# Redis Password used by user mgmt, no default value, must set by users here
+userMgmtRedisPassword: xxxxx

diff --git a/ocd/infra/playbooks/roles/egallery-tar/tasks/install.yml b/ocd/infra/playbooks/roles/egallery-tar/tasks/install.yml
index ee01a08..93758ac 100644 (file)
--- a/ocd/infra/playbooks/roles/egallery-tar/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/egallery-tar/tasks/install.yml
@@ -12,7 +12,6 @@
 # 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
@@ -20,29 +19,29 @@
     chdir: "{{playbook_dir}}"
   ignore_errors: yes
 
-- name: Download 1.1 edgegallery x86
+- name: Download 1.3 edgegallery x86
 # yamllint disable rule:line-length
-  command: wget https://edgegallery.obs.cn-east-3.myhuaweicloud.com/releases/v1.1/x86/EdgeGallery-v1.1-all-x86.tar.gz
+  command: wget http://edgegallery-v1.3.0.obs.cn-north-4.myhuaweicloud.com/x86/EdgeGallery-v1.3.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.1-all-x86.tar.gz
+  command: tar -xvf EdgeGallery-v1.3.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/ansible-all-x86-latest/install
+  command: cp hosts-aio /tmp/eg_download/deploy/EdgeGallery-v1.3.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/ansible-all-x86-latest/install
+  command: cp var.yml /tmp/eg_download/deploy/EdgeGallery-v1.3.0-all-x86/install
   # yamllint disable rule:line-length
   args:
     chdir: "{{playbook_dir}}"
@@ -50,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/ansible-all-x86-latest/install
+  command: cp default-var.yml /tmp/eg_download/deploy/EdgeGallery-v1.3.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 9cb47bd..6da65df 100644 (file)
--- a/ocd/infra/playbooks/var.yml
+++ b/ocd/infra/playbooks/var.yml
@@ -1,4 +1,3 @@
-#
 #   Copyright 2021 Huawei Technologies Co., Ltd.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +12,31 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-# Password of Harbor admin
-HARBOR_ADMIN_PASSWORD: Harbor@edge
+# Set the regex name of the network interface for calico
+NETWORK_INTERFACE: ens.*
+
+# 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
 
-# ip for portals,will be set to private
-# iP of master node default or reset it here
-# PORTAL_IP: 111.222.333.444
+# 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: 192.168.17.47
 
-# If not set, will get the default one during the run time
+# 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
+CONTROLLER_MASTER_IP: 10.0.0.15
+
+# NIC name of master node
+# If master node is with single NIC, not need to set it here and will get the default NIC name during the run time
+# If master node is with multiple NICs, should set it here to be 2 different NICs
 # EG_NODE_EDGE_MP1: eth0
 # EG_NODE_EDGE_MM5: eth0
+
+# Email Server Config for User Mgmt
+usermgmt_mail_enabled: false
+# If usermgmt_mail_enabled is true, then the following 4 params need to be set
+# usermgmt_mail_host: xxxxx
+# usermgmt_mail_port: xxxxx
+# usermgmt_mail_sender: xxxxx
+# usermgmt_mail_authcode: xxxxx