From c030e91757126da5b7f1ed717184dff29e88e455 Mon Sep 17 00:00:00 2001 From: "arvind.patel@huawei.com" Date: Thu, 24 Dec 2020 18:06:04 +0530 Subject: [PATCH 1/1] x86 env issue fixed Signed-off-by: arvind.patel@huawei.com Change-Id: I483a4b2779a8103aca00072069917df50f19c0de --- blueprints/iotgateway/playbooks/eliot-all.yml | 3 +++ .../roles/eg_prerequisite/tasks/install.yml | 8 ------- .../roles/eg_trans_certs/tasks/install.yml | 25 ++++++++++++++++++++++ .../playbooks/roles/eg_trans_certs/tasks/main.yml | 22 +++++++++++++++++++ .../playbooks/roles/helm/tasks/install.yml | 2 +- .../playbooks/roles/helm/tasks/uninstall.yml | 4 ++++ .../playbooks/roles/prometheus/tasks/install.yml | 8 ------- 7 files changed, 55 insertions(+), 17 deletions(-) create mode 100644 blueprints/iotgateway/playbooks/roles/eg_trans_certs/tasks/install.yml create mode 100644 blueprints/iotgateway/playbooks/roles/eg_trans_certs/tasks/main.yml diff --git a/blueprints/iotgateway/playbooks/eliot-all.yml b/blueprints/iotgateway/playbooks/eliot-all.yml index 148acaf..20fca2d 100644 --- a/blueprints/iotgateway/playbooks/eliot-all.yml +++ b/blueprints/iotgateway/playbooks/eliot-all.yml @@ -28,6 +28,7 @@ - k8s - helm - docker + - eg_prerequisite - eg_registry - eg_helm-repo - eg_certs @@ -43,6 +44,7 @@ - master roles: + - eg_trans_certs - eg_prerequisite - helm - eg_set-helm-repo @@ -88,6 +90,7 @@ - edge roles: + - eg_trans_certs - docker - eg_prerequisite - k3s diff --git a/blueprints/iotgateway/playbooks/roles/eg_prerequisite/tasks/install.yml b/blueprints/iotgateway/playbooks/roles/eg_prerequisite/tasks/install.yml index 31c20a3..8511923 100644 --- a/blueprints/iotgateway/playbooks/roles/eg_prerequisite/tasks/install.yml +++ b/blueprints/iotgateway/playbooks/roles/eg_prerequisite/tasks/install.yml @@ -45,11 +45,3 @@ - name: Delete Execute script for docker daemon command: rm -rf /tmp/eg_prerequisite - -- name: Certificate copy - debug: - msg: Copy certificate from ocd to center and edge - -- synchronize: - src: /tmp/ssl-eg-keys-certs - dest: /tmp/ diff --git a/blueprints/iotgateway/playbooks/roles/eg_trans_certs/tasks/install.yml b/blueprints/iotgateway/playbooks/roles/eg_trans_certs/tasks/install.yml new file mode 100644 index 0000000..2207631 --- /dev/null +++ b/blueprints/iotgateway/playbooks/roles/eg_trans_certs/tasks/install.yml @@ -0,0 +1,25 @@ +# +# Copyright 2020 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. +# + +--- + +- name: Certificate copy + debug: + msg: Copy certificate from ocd to center and edge + +- synchronize: + src: /tmp/ssl-eg-keys-certs + dest: /tmp/ diff --git a/blueprints/iotgateway/playbooks/roles/eg_trans_certs/tasks/main.yml b/blueprints/iotgateway/playbooks/roles/eg_trans_certs/tasks/main.yml new file mode 100644 index 0000000..f67a423 --- /dev/null +++ b/blueprints/iotgateway/playbooks/roles/eg_trans_certs/tasks/main.yml @@ -0,0 +1,22 @@ +# +# Copyright 2020 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. +# + +--- + +# tasks file for eg_trans_certs +- include: "install.yml" + static: false + when: operation == 'install' diff --git a/blueprints/iotgateway/playbooks/roles/helm/tasks/install.yml b/blueprints/iotgateway/playbooks/roles/helm/tasks/install.yml index f855091..3ad5d11 100644 --- a/blueprints/iotgateway/playbooks/roles/helm/tasks/install.yml +++ b/blueprints/iotgateway/playbooks/roles/helm/tasks/install.yml @@ -55,7 +55,7 @@ - name: "INSTALL: Add helm repo" # yamllint disable rule:line-length - command: helm repo add stable https://kubernetes-charts.storage.googleapis.com/ + command: helm repo add stable https://charts.helm.sh/stable # yamllint disable rule:line-length when: result is failed diff --git a/blueprints/iotgateway/playbooks/roles/helm/tasks/uninstall.yml b/blueprints/iotgateway/playbooks/roles/helm/tasks/uninstall.yml index 78db3d1..08dfaf2 100644 --- a/blueprints/iotgateway/playbooks/roles/helm/tasks/uninstall.yml +++ b/blueprints/iotgateway/playbooks/roles/helm/tasks/uninstall.yml @@ -29,10 +29,14 @@ - name: "UNINSTALL: Helm Uninstall on x86_64" command: rm -rf linux-amd64/helm + ignore_errors: yes + no_log: True when: result is succeeded and ansible_architecture == 'x86_64' - name: "UNINSTALL: Remove download helm file on x86_64" command: rm ~/helm-v3.0.2-linux-amd64.tar.gz + ignore_errors: yes + no_log: True when: result is succeeded and ansible_architecture == 'x86_64' - name: "UNINSTALL: Helm Uninstall on aarch64" diff --git a/blueprints/iotgateway/playbooks/roles/prometheus/tasks/install.yml b/blueprints/iotgateway/playbooks/roles/prometheus/tasks/install.yml index 2c0d05a..a06891e 100644 --- a/blueprints/iotgateway/playbooks/roles/prometheus/tasks/install.yml +++ b/blueprints/iotgateway/playbooks/roles/prometheus/tasks/install.yml @@ -30,13 +30,6 @@ # yamllint disable rule:line-length when: result.stdout == "" -- name: "INSTALL: Install prometheus on x86_64" - shell: - cmd: helm install mep-prometheus stable/prometheus --version v9.3.1 - ignore_errors: yes - no_log: True - when: result is failed and ansible_architecture == 'x86_64' - - name: "INSTALL: copy values.yaml to host" copy: src: values.yaml @@ -49,7 +42,6 @@ # yamllint disable rule:line-length ignore_errors: yes no_log: True - when: result is failed and ansible_architecture == 'aarch64' - name: Expose promethious server # yamllint disable rule:line-length -- 2.16.6