From aee0e5b492b6aaf72b97612f2a5e592c31b6866a Mon Sep 17 00:00:00 2001 From: khemendra kumar Date: Thu, 23 Dec 2021 16:37:36 +0530 Subject: [PATCH] EG upgrade 1.3 for AIO and MUNO mode Signed-off-by: khemendra kumar Change-Id: I0c49aa24d5795e3ab51ae93d877ea1fba427ca6b --- ocd/infra/playbooks/hosts-muno-controller | 3 +++ ocd/infra/playbooks/hosts-muno-edge | 3 +++ ocd/infra/playbooks/muno-config/controller/var.yml | 31 +++++++++++++++------- ocd/infra/playbooks/muno-config/edge/var.yml | 31 +++++++++++++--------- .../roles/egallery-all-aiomode/tasks/install.yml | 4 +-- .../egallery-munomode-controller/tasks/install.yml | 18 ++++++------- .../roles/egallery-munomode-edge/tasks/install.yml | 25 +++++++++-------- .../playbooks/roles/egallery-tar/tasks/install.yml | 10 ++++++- 8 files changed, 77 insertions(+), 48 deletions(-) create mode 100644 ocd/infra/playbooks/hosts-muno-controller create mode 100644 ocd/infra/playbooks/hosts-muno-edge diff --git a/ocd/infra/playbooks/hosts-muno-controller b/ocd/infra/playbooks/hosts-muno-controller new file mode 100644 index 0000000..6a8d46d --- /dev/null +++ b/ocd/infra/playbooks/hosts-muno-controller @@ -0,0 +1,3 @@ + +[master] +10.0.0.15 diff --git a/ocd/infra/playbooks/hosts-muno-edge b/ocd/infra/playbooks/hosts-muno-edge new file mode 100644 index 0000000..87f8220 --- /dev/null +++ b/ocd/infra/playbooks/hosts-muno-edge @@ -0,0 +1,3 @@ + +[master] +master-ip diff --git a/ocd/infra/playbooks/muno-config/controller/var.yml b/ocd/infra/playbooks/muno-config/controller/var.yml index 1f40dda..95d8e1d 100644 --- a/ocd/infra/playbooks/muno-config/controller/var.yml +++ b/ocd/infra/playbooks/muno-config/controller/var.yml @@ -13,18 +13,31 @@ # 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: any_password +# 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 -# ENABLE_PERSISTENCE: true -ENABLE_PERSISTENCE: false +# 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 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 -PORTAL_IP: IP_master_node +# 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: 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 +# 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 diff --git a/ocd/infra/playbooks/muno-config/edge/var.yml b/ocd/infra/playbooks/muno-config/edge/var.yml index e584b7a..9195095 100644 --- a/ocd/infra/playbooks/muno-config/edge/var.yml +++ b/ocd/infra/playbooks/muno-config/edge/var.yml @@ -1,4 +1,3 @@ -# # Copyright 2021 Huawei Technologies Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,25 +12,31 @@ # 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: 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: false +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: 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 +#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 -# If master node is with multiple NICs, should set it here to be -# 2 different NICs +# 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 -OCD_IP: 10.0.0.33 +# 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 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 d633069..474afa0 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/ansible-all-arm-latest/install + chdir: /tmp/eg_download/deploy/EdgeGallery-v1.3.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/ansible-all-x86-latest/install + chdir: /tmp/eg_download/deploy/EdgeGallery-v1.3.0-all-x86/install when: ansible_architecture == 'x86_64' 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 42696b7..4acbdf4 100644 --- a/ocd/infra/playbooks/roles/egallery-munomode-controller/tasks/install.yml +++ b/ocd/infra/playbooks/roles/egallery-munomode-controller/tasks/install.yml @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. ---- -# tasks file for MUNO controller ### MUNO controller installation ### @@ -25,33 +23,33 @@ - name: Check edgegallery tar ball present stat: - path: /tmp/eg_download/deploy/EdgeGallery-v1.1.1-controller-x86.tar.gz + path: /tmp/eg_download/deploy/EdgeGallery-v1.3.0-controller-x86.tar.gz register: tar_var -- name: Download 1.1 edgegallery x86 controller +- name: Download 1.3 edgegallery x86 controller # yamllint disable rule:line-length - command: wget https://akraino.obs.ap-southeast-1.myhuaweicloud.com/v1.1.1/x86/EdgeGallery-v1.1.1-controller-x86.tar.gz + command: wget http://edgegallery-v1.3.0.obs.cn-north-4.myhuaweicloud.com/x86/EdgeGallery-v1.3.0-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.1.1-controller-x86.tar.gz + command: tar -xvf EdgeGallery-v1.3.0-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.1.1-controller-x86/install + ## yamllint disable rule:line-length + command: cp muno-config/controller/hosts-muno-controller /tmp/eg_download/deploy/EdgeGallery-v1.3.0-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.1.1-controller-x86/install + command: cp muno-config/controller/var.yml /tmp/eg_download/deploy/EdgeGallery-v1.3.0-controller-x86/install # yamllint disable rule:line-length args: chdir: "{{playbook_dir}}" @@ -61,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.1.1-controller-x86/install + chdir: /tmp/eg_download/deploy/EdgeGallery-v1.3.0-controller-x86/install 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 a4c587b..4c9a3ed 100644 --- a/ocd/infra/playbooks/roles/egallery-munomode-edge/tasks/install.yml +++ b/ocd/infra/playbooks/roles/egallery-munomode-edge/tasks/install.yml @@ -12,39 +12,38 @@ # See the License for the specific language governing permissions and # limitations under the License. ---- ### MUNO edge installation ### - name: Check edgegallery tar ball present stat: - path: /tmp/eg_download/deploy/EdgeGallery-v1.1.1-edge-x86.tar.gz + path: /tmp/eg_download/deploy/EdgeGallery-v1.3.0-edge-x86.tar.gz register: edge_tar_var -- name: Download 1.1 edgegallery x86 edge -# yamllint disable rule:line-length - command: wget https://akraino.obs.ap-southeast-1.myhuaweicloud.com/v1.1.1/x86/EdgeGallery-v1.1.1-edge-x86.tar.gz -# yamllint disable rule:line-length +- name: Download 1.3 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 + # 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.1.1-edge-x86.tar.gz + command: tar -xvf EdgeGallery-v1.3.0-edge-x86.tar.gz args: - chdir: /tmp/eg_download/deploy/ + chdir: /tmp/eg_download/deploy/ when: not edge_tar_var.stat.exists - name: Set inventory file for muno edge -# yamllint disable rule:line-length + # yamllint disable rule:line-length command: scp root@{{ OCD_IP }}:"{{playbook_dir}}"/muno-config/edge/hosts-muno-edge . -# yamllint disable rule:line-length + # yamllint disable rule:line-length args: chdir: "{{playbook_dir}}" - name: Set var.yml file for muno edge -# yamllint disable rule:line-length + # yamllint disable rule:line-length command: scp root@{{ OCD_IP }}:"{{playbook_dir}}"/muno-config/edge/var.yml . -# yamllint disable rule:line-length + # yamllint disable rule:line-length args: chdir: "{{playbook_dir}}" @@ -53,5 +52,5 @@ # yamllint disable rule:line-length cmd: ansible-playbook --inventory hosts-muno-edge -e "ansible_user=root" eg_edge_aio_install.yml >> muno_edge_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.0-edge-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 93758ac..1ebec32 100644 --- a/ocd/infra/playbooks/roles/egallery-tar/tasks/install.yml +++ b/ocd/infra/playbooks/roles/egallery-tar/tasks/install.yml @@ -48,9 +48,17 @@ when: ansible_architecture == 'x86_64' - name: Set default-var.yml to eg path - # yamllint disable rule:line-length + # yamllint disable rule:line-length 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}}" when: ansible_architecture == 'x86_64' + +- 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 + # yamllint disable rule:line-length + args: + chdir: "{{playbook_dir}}" + when: ansible_architecture == 'x86_64' -- 2.16.6