From: Neha Ojha <nojha@redhat.com>
Date: Mon, 6 Aug 2018 17:40:58 +0000 (+0000)
Subject: infrastructure-playbooks/lv-create.yml: copy without using a template file
X-Git-Tag: v3.2.0beta2~55
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50a6d8141ced888f9c1ce5e90f9461e6a101d5bc;p=ceph-ansible.git

infrastructure-playbooks/lv-create.yml: copy without using a template file

Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/infrastructure-playbooks/lv-create.yml b/infrastructure-playbooks/lv-create.yml
index c485c8a63..519b889f3 100644
--- a/infrastructure-playbooks/lv-create.yml
+++ b/infrastructure-playbooks/lv-create.yml
@@ -2,6 +2,23 @@
   hosts:
   - osds
 
+  vars:
+    logfile: |
+      Suggested cut and paste into "group_vars/osds.yml" for configuring with osd_scenario=lvm
+      ----------------------------------------------------------------------------------------
+      {% for lv in nvme_device_lvs %}
+        - data: {{ lv.lv_name }}
+          data_vg: {{ nvme_vg_name }}
+          journal: {{ lv.journal_name }}
+          journal_vg: {{ nvme_vg_name }}
+      {% endfor %}
+      {% for hdd in hdd_devices %}
+        - data: {{ hdd_lv_prefix }}-{{ hdd.split('/')[-1] }}
+          data_vg: {{ hdd_vg_prefix }}-{{ hdd.split('/')[-1] }}
+          journal: {{ hdd_journal_prefix }}-{{ hdd.split('/')[-1] }}
+          journal_vg: {{ nvme_vg_name }}
+      {% endfor %}
+
   tasks:
 
   - name: include vars of lv_vars.yaml
@@ -71,7 +88,7 @@
 
   # Write ending configuration logfile
   - name: write output for osds.yml to logfile /tmp/logfile.txt
-    template:
-      src: templates/logfile.j2
-      dest: /tmp/logfile.txt
+    copy:
+      content: "{{ logfile }}"
+      dest: "/tmp/logfile.txt"
     delegate_to: localhost
diff --git a/infrastructure-playbooks/templates/logfile.j2 b/infrastructure-playbooks/templates/logfile.j2
deleted file mode 100644
index 7cb70f5e1..000000000
--- a/infrastructure-playbooks/templates/logfile.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-Suggested cut and paste into "group_vars/osds.yml" for configuring with osd_scenario=lvm
-----------------------------------------------------------------------------------------
-{% for lv in nvme_device_lvs %}
-  - data: {{ lv.lv_name }}
-    data_vg: {{ nvme_vg_name }}
-    journal: {{ lv.journal_name }}
-    journal_vg: {{ nvme_vg_name }}
-{% endfor %}
-{% for hdd in hdd_devices %}
-  - data: {{ hdd_lv_prefix }}-{{ hdd.split('/')[-1] }}
-    data_vg: {{ hdd_vg_prefix }}-{{ hdd.split('/')[-1] }}
-    journal: {{ hdd_journal_prefix }}-{{ hdd.split('/')[-1] }}
-    journal_vg: {{ nvme_vg_name }}
-{% endfor %}