From 9feac8c69c9ef4e970689f7a8f1f92e4e688e85e Mon Sep 17 00:00:00 2001
From: Todd Malsbary <todd.malsbary@intel.com>
Date: Fri, 23 Oct 2020 16:18:58 -0700
Subject: Use same host in both copy and run of deploy_optane.sh

NOTE: This is not a complete fix, it is only a workaround so that
installer.sh can succeed when Optane hardware is not present.

Without this, "No such file or directory" is reported during the
"Apply Optane PMEM CSI Daemonset" task of the configure-optane
playbook.  This error was observed with kubespray 2.14.1 and not with
2.12.6.

Issue-ID: MULTICLOUD-1234
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I1e23741d704ab117a84b4ed11e2f7ac02f0f2ec2
---
 kud/deployment_infra/playbooks/configure-optane.yml    |  2 +-
 kud/deployment_infra/playbooks/preconfigure-optane.yml | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kud')

diff --git a/kud/deployment_infra/playbooks/configure-optane.yml b/kud/deployment_infra/playbooks/configure-optane.yml
index 8e000aa4..01189808 100644
--- a/kud/deployment_infra/playbooks/configure-optane.yml
+++ b/kud/deployment_infra/playbooks/configure-optane.yml
@@ -12,4 +12,4 @@
 - hosts: localhost
   tasks:
     - name: Apply Optane PMEM CSI Daemonset
-      command: "{{ base_dest }}/optane/deploy_optane.sh"
+      command: "{{ optane_dest }}/deploy_optane.sh"
diff --git a/kud/deployment_infra/playbooks/preconfigure-optane.yml b/kud/deployment_infra/playbooks/preconfigure-optane.yml
index 64622895..135371ea 100644
--- a/kud/deployment_infra/playbooks/preconfigure-optane.yml
+++ b/kud/deployment_infra/playbooks/preconfigure-optane.yml
@@ -22,6 +22,14 @@
         state: directory
         path: "{{ optane_dest }}"
       ignore_errors: yes
+    - copy:
+        src: "{{ playbook_dir }}/deploy_optane.sh"
+        dest: "{{ optane_dest }}"
+    - name: Changing perm of "sh", adding "+x"
+      shell: "chmod +x deploy_optane.sh"
+      args:
+        chdir: "{{ optane_dest }}"
+        warn: False
 
 - hosts: kube-node
   become: yes
@@ -60,14 +68,6 @@
       args:
         chdir: "optane"
         warn: False
-    - copy:
-        src: "{{ playbook_dir }}/deploy_optane.sh"
-        dest: optane
-    - name: Changing perm of "sh", adding "+x"
-      shell: "chmod +x deploy_optane.sh"
-      args:
-        chdir: "optane"
-        warn: False
     - copy:
         src: "{{ playbook_dir }}/../images/pmem-csi-lvm.yaml"
         dest: optane
-- 
cgit 1.2.3-korg