From: Yibo Cai <yibo.cai@arm.com>
Date: Wed, 30 May 2018 07:33:39 +0000 (+0800)
Subject: stor4nfv: support multiple architecture images
X-Git-Tag: opnfv-7.0.0~54^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F58077%2F1;p=compass4nfv.git

stor4nfv: support multiple architecture images

Change-Id: I2a3482873e37f58c8f16a02988770d6e78fd3ab6
Signed-off-by: Yibo Cai <yibo.cai@arm.com>
---

diff --git a/plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml b/plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml
index 55d26d69..182c0a68 100644
--- a/plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml
+++ b/plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml
@@ -8,6 +8,10 @@
 # #############################################################################
 ---
 
+- name: define image architecture
+  set_fact:
+    imgarch: "{{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}"
+
 - name: ensure ceph-ansible dir exists
   stat:
     path: /opt/ceph-ansible
@@ -39,24 +43,24 @@
 
 - name: ensure osdsctl exists
   stat:
-    path: /opt/opensds-v0.1.5-linux-amd64/bin/osdsctl
+    path: /opt/opensds-v0.1.5-linux-{{ imgarch }}/bin/osdsctl
   ignore_errors: "true"
   register: osdsctl_exists
 
 - name: ensure opensds csi directory exists
   stat:
-    path: /opt/opensds-k8s-v0.1.0-linux-amd64
+    path: /opt/opensds-k8s-v0.1.0-linux-{{ imgarch }}
   ignore_errors: "true"
   register: csi_dir_exists
 
 - name: create opensds default profile, csi pods
   remote_user: root
   shell: |
-    cp /opt/opensds-v0.1.5-linux-amd64/bin/osdsctl /usr/local/bin;
+    cp /opt/opensds-v0.1.5-linux-{{ imgarch }}/bin/osdsctl /usr/local/bin;
     export OPENSDS_ENDPOINT=http://{{ public_vip.ip }}:50040;
     export OPENSDS_AUTH_STRATEGY=noauth;
     osdsctl profile create '{"name": "default", "description": "default policy"}'
-    cd /opt/opensds-k8s-v0.1.0-linux-amd64;
+    cd /opt/opensds-k8s-v0.1.0-linux-{{ imgarch }};
     kubectl create -f csi/deploy/kubernetes;
   ignore_errors: "true"
   when: