From 99da3c0d886a48078363905b4bb870d2cbed65c5 Mon Sep 17 00:00:00 2001
From: "arvind.patel@huawei.com" <arvind.patel@huawei.com>
Date: Mon, 7 Dec 2020 16:51:24 +0530
Subject: [PATCH] Inflexdb fixes host seperated

Signed-off-by: arvind.patel@huawei.com <arvind.patel@huawei.com>
Change-Id: I3d13b505a33b960561ab3506d77f7685e199ef29
---
 ocd/infra/playbooks/ealt-all-uninstall.yml                | 12 ++++++++++++
 ocd/infra/playbooks/ealt-all.yml                          | 14 ++++++++++++--
 ocd/infra/playbooks/ealt-inventory.ini                    |  3 +++
 ocd/infra/playbooks/roles/influxdb/tasks/install.yml      |  4 ++++
 ocd/infra/playbooks/roles/influxdb/tasks/uninstall.yml    |  2 ++
 ocd/infra/playbooks/roles/openebsrole/tasks/install.yml   | 11 ++++++++++-
 ocd/infra/playbooks/roles/openebsrole/tasks/uninstall.yml |  2 ++
 7 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/ocd/infra/playbooks/ealt-all-uninstall.yml b/ocd/infra/playbooks/ealt-all-uninstall.yml
index fb65e7e..c58298e 100644
--- a/ocd/infra/playbooks/ealt-all-uninstall.yml
+++ b/ocd/infra/playbooks/ealt-all-uninstall.yml
@@ -105,6 +105,18 @@
     - influxdb
     - openebsrole
 
+### Storage ###
+
+- hosts: openebsinfluxdb
+  become: yes
+  tags:
+    - ealt_ebs_influx
+    - edge
+
+  roles:
+    - influxdb
+    - openebsrole
+
 ### Pre-Requisites ###
 
 - hosts: prerequisiteedge
diff --git a/ocd/infra/playbooks/ealt-all.yml b/ocd/infra/playbooks/ealt-all.yml
index e92468c..296ad58 100644
--- a/ocd/infra/playbooks/ealt-all.yml
+++ b/ocd/infra/playbooks/ealt-all.yml
@@ -116,8 +116,6 @@
     - kubeconfig
     - mepkubeconfig
     - cadvisor
-    - influxdb
-    - openebsrole
 
 ### EdgeGallery related ###
 
@@ -132,3 +130,15 @@
     - eg_set-helm-repo
     - eg_mep
     - eg_mecm-mepm
+
+### Storage ###
+
+- hosts: openebsinfluxdb
+  become: yes
+  tags:
+    - ealt_ebs_influx
+    - edge
+
+  roles:
+    - influxdb
+    - openebsrole
diff --git a/ocd/infra/playbooks/ealt-inventory.ini b/ocd/infra/playbooks/ealt-inventory.ini
index d0d3792..72e1390 100644
--- a/ocd/infra/playbooks/ealt-inventory.ini
+++ b/ocd/infra/playbooks/ealt-inventory.ini
@@ -55,3 +55,6 @@ edge
 
 [egedge:children]
 edge
+
+[openebsinfluxdb:children]
+edge
diff --git a/ocd/infra/playbooks/roles/influxdb/tasks/install.yml b/ocd/infra/playbooks/roles/influxdb/tasks/install.yml
index bdffd3b..c0c856d 100644
--- a/ocd/infra/playbooks/roles/influxdb/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/influxdb/tasks/install.yml
@@ -19,7 +19,11 @@
 - name: "INSTALL: Install influxdata by helm charts"
   shell:
     cmd: helm repo add influxdata https://influxdata.github.io/helm-charts
+  ignore_errors: yes
+  no_log: True
 
 - name: "INSTALL: Deploye influxdata"
   shell:
     cmd: helm upgrade -i influxdb influxdata/influxdb --set image.tag=1.8.0
+  ignore_errors: yes
+  no_log: True
diff --git a/ocd/infra/playbooks/roles/influxdb/tasks/uninstall.yml b/ocd/infra/playbooks/roles/influxdb/tasks/uninstall.yml
index 94aa886..b8fa456 100644
--- a/ocd/infra/playbooks/roles/influxdb/tasks/uninstall.yml
+++ b/ocd/infra/playbooks/roles/influxdb/tasks/uninstall.yml
@@ -19,3 +19,5 @@
 - name: Uninstalling influxdb
   shell:
     cmd: helm uninstall influxdb
+  ignore_errors: yes
+  no_log: True
diff --git a/ocd/infra/playbooks/roles/openebsrole/tasks/install.yml b/ocd/infra/playbooks/roles/openebsrole/tasks/install.yml
index 6a15fab..b34d108 100644
--- a/ocd/infra/playbooks/roles/openebsrole/tasks/install.yml
+++ b/ocd/infra/playbooks/roles/openebsrole/tasks/install.yml
@@ -19,15 +19,24 @@
 - name: "create namespace openebs"
   shell:
     cmd: kubectl create ns openebs
+  ignore_errors: yes
+  no_log: True
 
 - name: "INSTALL: add helm repo add aarch64"
   shell:
     cmd: helm repo add openebs https://openebs.github.io/charts
+  ignore_errors: yes
+  no_log: True
 
 - name: "INSTALL: helm repo update aarch64"
   shell:
     cmd: helm repo update
+  ignore_errors: yes
+  no_log: True
 
 - name: "INSTALL: Install on Openebs aarch64"
   shell:
-  cmd: helm install --namespace openebs  --generate-name openebs --version 2.3.0
+  # yamllint disable rule:line-length
+    cmd: helm install --namespace openebs  --generate-name openebs --version 2.3.0
+  ignore_errors: yes
+  no_log: True
diff --git a/ocd/infra/playbooks/roles/openebsrole/tasks/uninstall.yml b/ocd/infra/playbooks/roles/openebsrole/tasks/uninstall.yml
index 5d8ef9a..61f6548 100644
--- a/ocd/infra/playbooks/roles/openebsrole/tasks/uninstall.yml
+++ b/ocd/infra/playbooks/roles/openebsrole/tasks/uninstall.yml
@@ -19,3 +19,5 @@
 - name: Uninstall openebs
   shell:
     cmd: kubectl delete ns openebs
+  ignore_errors: yes
+  no_log: True
-- 
2.16.6