Using env vars instead of template placeholders

Change-Id: Id80d681a9c57f1edbb9b27c10b17edf95c1d26bf Signed-off-by: David Caro <dcaroest@redhat.com>
oVirt · May 24, 2016 · 11de878 · 11de878
1 parent 2050923
commit 11de878
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/basic_suite_3.6/control.sh b/basic_suite_3.6/control.sh
@@ -4,7 +4,6 @@ prep_suite () {
     local suite_name="${SUITE##*/}"
     suite_name="${suite_name//./_}"
     sed \
-        -e "s,@SUITE@,${SUITE},g" \
         -e "s,\(^[[:space:]]*\)\(engine\):,\1lago_${suite_name}_\2:,g" \
         -e "s,\(^[[:space:]]*\)\(host[[:digit:]]\+\):,\1lago_${suite_name}_\2:,g" \
         -e "s,\(^[[:space:]]*\)\(lago\):,\1lago_${suite_name}_\2:,g" \

diff --git a/image_ng_suite_3.6/LagoInitFile.in b/image_ng_suite_3.6/LagoInitFile.in
@@ -7,10 +7,10 @@ domains:
     cpu: 4
     boot_time_sec : 500
     root-password: 12345
-    url: file://@SUITE@/images/ovirt-appliance.ova
+    url: file://$LAGO_INITFILE_PATH/images/ovirt-appliance.ova
     disks:
       - type: file
-        path: @SUITE@/utils/seed.iso
+        path: $LAGO_INITFILE_PATH/utils/seed.iso
         dev: sda
         format: iso
         name: cloud-init
@@ -71,7 +71,7 @@ domains:
     disks:
       - type: template
         template_type: qcow2
-        path: @SUITE@/images/ovirt-node-ng-image.installed.qcow2
+        path: $LAGO_INITFILE_PATH/images/ovirt-node-ng-image.installed.qcow2
         dev: sda
         format: qcow2
         name: src
@@ -87,7 +87,7 @@ domains:
     disks:
       - type: template
         template_type: qcow2
-        path: @SUITE@/images/ovirt-node-ng-image.installed.qcow2
+        path: $LAGO_INITFILE_PATH/images/ovirt-node-ng-image.installed.qcow2
         dev: sda
         format: qcow2
         name: src

diff --git a/image_ng_suite_3.6/control.sh b/image_ng_suite_3.6/control.sh
@@ -132,7 +132,6 @@ prep_suite(){
     mv -f "${appliance_image}" "${suite}/images/ovirt-appliance.ova"
     mv -f "${node_image}" "${suite}/images/ovirt-node-ng-image.installed.qcow2"
     sed \
-        -e "s,@SUITE@,$suite,g" \
         -e "s,\(^[[:space:]]*\)\(engine:\),\1lago_${suite_name}_\2,g" \
         -e "s,\(^[[:space:]]*\)\(node[[:digit:]]\+:\),\1lago_${suite_name}_\2,g" \
         -e "s,\(^[[:space:]]*\)\(lago:\),\1lago_${suite_name}_\2,g" \