Update EG version 1.3.2

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

diff --git a/ocd/infra/playbooks/default-var.yml b/ocd/infra/playbooks/default-var.yml
index d839d08..11d58dd 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: v1.3.0
-HELM_TAG: 1.3.0
+EG_IMAGE_TAG: v1.3.2
+HELM_TAG: 1.3.2
 
 # Mode for online or offline install, currently only support offline
 NETWORK_MODE: offline

diff --git a/ocd/infra/playbooks/hosts-muno-controller b/ocd/infra/playbooks/hosts-muno-controller
index 6a8d46d..87f8220 100644 (file)
--- a/ocd/infra/playbooks/hosts-muno-controller
+++ b/ocd/infra/playbooks/hosts-muno-controller
@@ -1,3 +1,3 @@
 
 [master]
-10.0.0.15
+master-ip

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 474afa0..5b78a20 100644 (file)
--- 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.0-all-x86/install
+    chdir: /tmp/eg_download/deploy/EdgeGallery-v1.3.2-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.0-all-x86/install
+    chdir: /tmp/eg_download/deploy/EdgeGallery-v1.3.2-all-x86/install
   when: ansible_architecture == 'x86_64'

diff --git a/ocd/infra/playbooks/roles/egallery-all-aiomode/tasks/uninstall.yml b/ocd/infra/playbooks/roles/egallery-all-aiomode/tasks/uninstall.yml
index 6896328..68c1e47 100644 (file)
--- a/ocd/infra/playbooks/roles/egallery-all-aiomode/tasks/uninstall.yml
+++ b/ocd/infra/playbooks/roles/egallery-all-aiomode/tasks/uninstall.yml
@@ -26,12 +26,12 @@
     # yamllint disable rule:line-length
     cmd: ansible-playbook --inventory hosts-aio  eg_all_aio_uninstall.yml -e "ansible_user=root" >> aio_remove.log
     # yamllint disable rule:line-length
-    chdir: /tmp/eg_download/deploy/ansible-all-x86-latest/install
+    chdir: /tmp/eg_download/deploy/EdgeGallery-v1.3.2-all-x86/install
   when: ansible_architecture == 'x86_64'
 
 - name: Remove edgegallery tar
   shell:
-    cmd: rm -rf ansible-all*
+    cmd: rm -rf EdgeGallery*
     chdir: /tmp/eg_download/deploy/
 
 - name: Remove aio log

diff --git a/ocd/infra/playbooks/roles/egallery-munomode-controller/tasks/install.yml b/ocd/infra/playbooks/roles/egallery-munomode-controller/tasks/install.yml
index 4acbdf4..84ca431 100644 (file)
--- a/ocd/infra/playbooks/roles/egallery-munomode-controller/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/egallery-munomode-controller/tasks/install.yml
@@ -23,33 +23,33 @@
 
 - name: Check edgegallery tar ball present
   stat:
-    path: /tmp/eg_download/deploy/EdgeGallery-v1.3.0-controller-x86.tar.gz
+    path: /tmp/eg_download/deploy/EdgeGallery-v1.3.2-controller-x86.tar.gz
   register: tar_var
 
-- name: Download 1.3 edgegallery x86 controller
+- name: Download 1.3.2 edgegallery x86 controller
 # yamllint disable rule:line-length
-  command: wget http://edgegallery-v1.3.0.obs.cn-north-4.myhuaweicloud.com/x86/EdgeGallery-v1.3.0-controller-x86.tar.gz
+  command: wget http://edgegallery-v1.3.2.obs.cn-north-4.myhuaweicloud.com/x86/EdgeGallery-v1.3.2-controller-x86.tar.gz
 # yamllint disable rule:line-length
   args:
     chdir: /tmp/eg_download/deploy/
   when: not tar_var.stat.exists
 
 - name: Untar Edgegallery offline controller tar file
-  command: tar -xvf EdgeGallery-v1.3.0-controller-x86.tar.gz
+  command: tar -xvf EdgeGallery-v1.3.2-controller-x86.tar.gz
   args:
     chdir: /tmp/eg_download/deploy/
   when: not tar_var.stat.exists
 
 - name: Set inventory file for muno controller
   ## yamllint disable rule:line-length
-  command: cp muno-config/controller/hosts-muno-controller /tmp/eg_download/deploy/EdgeGallery-v1.3.0-controller-x86/install
+  command: cp muno-config/controller/hosts-muno-controller /tmp/eg_download/deploy/EdgeGallery-v1.3.2-controller-x86/install
 # yamllint disable rule:line-length
   args:
     chdir: "{{playbook_dir}}"
 
 - name: Set var.yml file for muno controller
 # yamllint disable rule:line-length
-  command: cp muno-config/controller/var.yml /tmp/eg_download/deploy/EdgeGallery-v1.3.0-controller-x86/install
+  command: cp muno-config/controller/var.yml /tmp/eg_download/deploy/EdgeGallery-v1.3.2-controller-x86/install
 # yamllint disable rule:line-length
   args:
     chdir: "{{playbook_dir}}"
@@ -59,5 +59,5 @@
     # yamllint disable rule:line-length
     cmd: ansible-playbook --inventory hosts-muno-controller -e "ansible_user=root" eg_controller_aio_install.yml >> muno_controller_log
     # yamllint disable rule:line-length
-    chdir: /tmp/eg_download/deploy/EdgeGallery-v1.3.0-controller-x86/install
+    chdir: /tmp/eg_download/deploy/EdgeGallery-v1.3.2-controller-x86/install
   when: ansible_architecture == 'x86_64'

diff --git a/ocd/infra/playbooks/roles/egallery-munomode-controller/tasks/uninstall.yml b/ocd/infra/playbooks/roles/egallery-munomode-controller/tasks/uninstall.yml
index 75ca312..6c7c337 100644 (file)
--- a/ocd/infra/playbooks/roles/egallery-munomode-controller/tasks/uninstall.yml
+++ b/ocd/infra/playbooks/roles/egallery-munomode-controller/tasks/uninstall.yml
@@ -19,11 +19,11 @@
     # yamllint disable rule:line-length
     cmd: ansible-playbook --inventory hosts-muno-controller  eg_controller_aio_uninstall.yml -e "ansible_user=root" >> muno_controller_remove.log
     # yamllint disable rule:line-length
-    chdir: /tmp/eg_download/deploy/EdgeGallery-v1.1.1-controller-x86/install
+    chdir: /tmp/eg_download/deploy/EdgeGallery-v1.3.2-controller-x86/install
   when: ansible_architecture == 'x86_64'
 
 - name: Remove edgegallery tar ball
   shell:
-    cmd: rm -rf EdgeGallery-v1.1.1-*
+    cmd: rm -rf EdgeGallery-v1.3.2-*
     chdir: /tmp/eg_download/deploy/
   when: ansible_architecture == 'x86_64'

diff --git a/ocd/infra/playbooks/roles/egallery-munomode-edge/tasks/install.yml b/ocd/infra/playbooks/roles/egallery-munomode-edge/tasks/install.yml
index 4c9a3ed..fa35f1b 100644 (file)
--- a/ocd/infra/playbooks/roles/egallery-munomode-edge/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/egallery-munomode-edge/tasks/install.yml
@@ -16,19 +16,19 @@
 
 - name: Check edgegallery tar ball present
   stat:
-    path: /tmp/eg_download/deploy/EdgeGallery-v1.3.0-edge-x86.tar.gz
+    path: /tmp/eg_download/deploy/EdgeGallery-v1.3.2-edge-x86.tar.gz
   register: edge_tar_var
 
-- name: Download 1.3 edgegallery x86 edge
+- name: Download 1.3.2 edgegallery x86 edge
   # yamllint disable rule:line-length
-  command: wget http://edgegallery-v1.3.0.obs.cn-north-4.myhuaweicloud.com/x86/EdgeGallery-v1.3.0-edge-x86.tar.gz
+  command: wget http://edgegallery-v1.3.2.obs.cn-north-4.myhuaweicloud.com/x86/EdgeGallery-v1.3.2-edge-x86.tar.gz
   # yamllint disable rule:line-length
   args:
     chdir: /tmp/eg_download/deploy/
   when: not edge_tar_var.stat.exists
 
 - name: Untar Edgegallery offline edge tar file
-  command: tar -xvf EdgeGallery-v1.3.0-edge-x86.tar.gz
+  command: tar -xvf EdgeGallery-v1.3.2-edge-x86.tar.gz
   args:
      chdir: /tmp/eg_download/deploy/
   when: not edge_tar_var.stat.exists

diff --git a/ocd/infra/playbooks/roles/egallery-munomode-edge/tasks/uninstall.yml b/ocd/infra/playbooks/roles/egallery-munomode-edge/tasks/uninstall.yml
index 71274da..89b62ff 100644 (file)
--- a/ocd/infra/playbooks/roles/egallery-munomode-edge/tasks/uninstall.yml
+++ b/ocd/infra/playbooks/roles/egallery-munomode-edge/tasks/uninstall.yml
@@ -20,7 +20,7 @@
     # yamllint disable rule:line-length
     cmd: ansible-playbook --inventory hosts-muno-edge  eg_edge_aio_uninstall.yml -e "ansible_user=root" >> muno_edge_remove.log
     # yamllint disable rule:line-length
-    chdir: /tmp/eg_download/deploy/EdgeGallery-v1.1.1-edge-x86/install
+    chdir: /tmp/eg_download/deploy/EdgeGallery-v1.3.2-edge-x86/install
   when: ansible_architecture == 'x86_64'
 
 - name: Remove edgegallery tar ball

diff --git a/ocd/infra/playbooks/roles/egallery-tar/tasks/install.yml b/ocd/infra/playbooks/roles/egallery-tar/tasks/install.yml
index 1ebec32..25ee024 100644 (file)
--- 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 edgegallery x86
+- name: Download 1.3.2 edgegallery x86
 # yamllint disable rule:line-length
-  command: wget http://edgegallery-v1.3.0.obs.cn-north-4.myhuaweicloud.com/x86/EdgeGallery-v1.3.0-all-x86.tar.gz
+  command: wget http://edgegallery-v1.3.2.obs.cn-north-4.myhuaweicloud.com/x86/EdgeGallery-v1.3.2-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.0-all-x86.tar.gz
+  command: tar -xvf EdgeGallery-v1.3.2-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.0-all-x86/install
+  command: cp hosts-aio /tmp/eg_download/deploy/EdgeGallery-v1.3.2-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.0-all-x86/install
+  command: cp var.yml /tmp/eg_download/deploy/EdgeGallery-v1.3.2-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.0-all-x86/install
+  command: cp default-var.yml /tmp/eg_download/deploy/EdgeGallery-v1.3.2-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.0-all-x86/install
+  command: cp password-var.yml /tmp/eg_download/deploy/EdgeGallery-v1.3.2-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 6da65df..bce616c 100644 (file)
--- a/ocd/infra/playbooks/var.yml
+++ b/ocd/infra/playbooks/var.yml
@@ -21,11 +21,11 @@ NETWORK_INTERFACE: ens.*
 ENABLE_PERSISTENCE: true
 
 # 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
+# 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
-CONTROLLER_MASTER_IP: 10.0.0.15
+# CONTROLLER_MASTER_IP: xxx.xxx.xxx.xxx
 
 # 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