From ec5191e2382965215737d760beaba015af94371a Mon Sep 17 00:00:00 2001 From: agrawalgaurav Date: Fri, 6 Nov 2020 11:21:30 +0530 Subject: [PATCH] Restructuring of install and uninstall scripts Signed-off-by: agrawalgaurav Change-Id: Ic4f79b663ce7fa785f086d36170249d6d3797948 --- ocd/infra/playbooks/ealt-all-uninstall.yml | 119 +++++++++++++++++------- ocd/infra/playbooks/ealt-all.yml | 140 +++++++++++++++-------------- ocd/infra/playbooks/ealt-inventory.ini | 49 ++++++---- 3 files changed, 190 insertions(+), 118 deletions(-) diff --git a/ocd/infra/playbooks/ealt-all-uninstall.yml b/ocd/infra/playbooks/ealt-all-uninstall.yml index 9707be8..a8cc8ba 100644 --- a/ocd/infra/playbooks/ealt-all-uninstall.yml +++ b/ocd/infra/playbooks/ealt-all-uninstall.yml @@ -1,3 +1,4 @@ +# # Copyright 2020 Huawei Technologies Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,68 +15,122 @@ --- -- hosts: mecm +############ OCD ############ + +- hosts: ocdconsolidated + become: yes + tags: + - ocdhost + - ocdconsolidated + + roles: + - eg_helm-repo + - eg_certs + - helm + - k8s + +############ Center ############ + +### EdgeGallery related ### + +- hosts: egcenter + become: yes + tags: + - egcenter + - center + + roles: + - eg_mecm-meo + - eg_mecm-fe + - eg_appstore + - eg_developer + - eg_user-mgmt + - service_center + - eg_secrets + +### Other 3rd party related ### + +- hosts: thirdpartycenter become: yes tags: - - infra - - infra-mecm + - thirdpartycenter + - center roles: - - grafana - - helm + - grafana + +### Pre-Requisites ### -- hosts: certsmanager +- hosts: prerequisitecenter become: yes tags: - - certsmanager + - prerequisitecenter + - center roles: - - certmanager + - kubeconfig + - helm + +### Infrastructure ### -- hosts: mepautomate +- hosts: center-infra become: yes tags: - - mepautomate + - center-infra + - center roles: - - mepserver + - k8s -- hosts: mep +############ Edge ############ + +### EdgeGallery related ### + +- hosts: egedge become: yes tags: - - infra - - infra-mep + - egedge + - edge roles: - - rabbitmq - - cadvisor - - prometheus - - helm - - k3s - - docker - -- hosts: infra-helm + - eg_secrets + - eg_mep + - eg_mecm-mepm + +### Other 3rd party related ### + +- hosts: thirdpartyedge become: yes tags: - - helm + - thirdpartyedge + - edge roles: - - helm + - rabbitmq + - prometheus + - kubeconfig + - mepkubeconfig + - cadvisor + +### Pre-Requisites ### -- hosts: infra-k8s +- hosts: prerequisiteedge become: yes tags: - - k8s - - infra + - prerequisiteedge + - edge roles: - - k8s + - helm -- hosts: infra-k3s +### Infrastructure ### +- hosts: edge-infra become: yes tags: - - k3s - - infra + - edge-infra + - edge roles: - - k3s + - k3s + - docker + # yamllint disable rule:new-line-at-end-of-file \ No newline at end of file diff --git a/ocd/infra/playbooks/ealt-all.yml b/ocd/infra/playbooks/ealt-all.yml index e4d34a7..e359168 100644 --- a/ocd/infra/playbooks/ealt-all.yml +++ b/ocd/infra/playbooks/ealt-all.yml @@ -16,120 +16,124 @@ --- -- hosts: infra-k8s +############ OCD ############ + +- hosts: ocdconsolidated become: yes tags: - - k8s - - infra - - mecm + - ocdhost + - ocdconsolidated roles: - - k8s + - k8s + - helm + - eg_certs + - eg_helm-repo -- hosts: infra-k3s - become: yes - tags: - - k3s - - infra - - mep +############ Center ############ - roles: - - docker - - k3s +### Infrastructure ### -- hosts: infra-helm +- hosts: center-infra become: yes tags: - - helm + - center-infra + - center roles: - - helm + - k8s + +### Pre-Requisites ### -- hosts: mecm +- hosts: prerequisitecenter become: yes tags: - - infra - - infra-mecm - - mecm + - prerequisitecenter + - center roles: - - helm - - grafana - - kubeconfig - - applcm + - helm + - kubeconfig -- hosts: mep - become: yes - tags: - - infra - - infra-mep - - mep +### Other 3rd party related ### - roles: - - helm - - rabbitmq - - prometheus - - kubeconfig - - mepkubeconfig - - cadvisor - -- hosts: mecm +- hosts: thirdpartycenter become: yes tags: - - infra - - infra-mecm - - mecm + - thirdpartycenter + - center roles: - - mepconfig + - grafana + +### EdgeGallery related ### -- hosts: mepautomate +- hosts: egcenter become: yes tags: - - mepautomate + - egcenter + - center roles: - - mepserver - - mepagent + - eg_secrets + - service_center + - eg_user-mgmt + - eg_mecm-meo + - eg_mecm-fe + - eg_appstore + - eg_developer + -- hosts: mep-centos +############ Edge ############ + +### Infrastructure ### +- hosts: edge-infra become: yes tags: - - infra - - mep + - edge-infra + - edge roles: - - vault + - docker + - k3s + +### Pre-Requisites ### -- hosts: certsmanager +- hosts: prerequisiteedge become: yes tags: - - certsmanager + - prerequisiteedge + - edge roles: - - certmanager + - helm -- hosts: egcenter +### Other 3rd party related ### + +- hosts: thirdpartyedge become: yes tags: - - egcenter + - thirdpartyedge + - edge roles: - - eg_certs - - service_center - - eg_user-mgmt - - eg_mecm-meo - - eg_mecm-fe - - eg_appstore - - eg_developer + - rabbitmq + - prometheus + - kubeconfig + - mepkubeconfig + - cadvisor + + +### EdgeGallery related ### - hosts: egedge become: yes tags: - - egedge + - egedge + - edge roles: - - eg_certs - - eg_mep - - eg_mecm-mepm + - eg_secrets + - eg_mep + - eg_mecm-mepm # yamllint disable rule:new-line-at-end-of-file \ No newline at end of file diff --git a/ocd/infra/playbooks/ealt-inventory.ini b/ocd/infra/playbooks/ealt-inventory.ini index b859258..719aaf4 100644 --- a/ocd/infra/playbooks/ealt-inventory.ini +++ b/ocd/infra/playbooks/ealt-inventory.ini @@ -1,3 +1,4 @@ +# # Copyright 2020 Huawei Technologies Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,34 +12,46 @@ # 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. +# -[mecm] +[center] controller1 ansible_host="" ansible_user="" ansible_password="" -[mep] +[edge] edge1 ansible_host="" ansible_user="" ansible_password="" -[infra-k8s] +[ocdhost] ocdhost ansible_host="" ansible_user="" ansible_password="" -[infra-helm:children] -mecm -mep +### OCD childrens ### + +[ocdconsolidated:children] +ocdhost + +### Center node childrens ### + +[center-infra:children] +center + +[prerequisitecenter:children] +center + +[thirdpartycenter:children] +center -[mep-centos] -edge2 ansible_host="" ansible_user="" ansible_password="" +[egcenter:children] +center -[infra-k3s:children] -mep +### Edge node childrens ### -[mepautomate:children] -mep +[edge-infra:children] +edge -[platform-applcm:children] -mecm +[prerequisiteedge:children] +edge -[platform-vault:children] -mep-centos +[thirdpartyedge:children] +edge -[certsmanager:children] -mep +[egedge:children] +edge \ No newline at end of file -- 2.16.6