summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2013-05-30 14:24:59 +0100
committerSteven Hardy <shardy@redhat.com>2013-05-30 14:24:59 +0100
commit5e92be740d9caf45a24224133d4e3ed82982a269 (patch)
tree5458096d1d3e3224437797863399bc4559b529fd
parent0f99951257f0b9e5233fd636249939f2c9f09ead (diff)
downloadheat-templates-5e92be740d9caf45a24224133d4e3ed82982a269.tar.gz
Fix F18 oz-install failures
F18 builds are unreliable (or for some people don't work at all), this seems due to the following bug: https://bugzilla.redhat.com/show_bug.cgi?id=906031 The simplest workaround is to use the netinst ISO instead of the DVD so we pick up the newer curl package which fixes the problem Fixes bug #1185810 Change-Id: I066356e8a780caa8ca2798644ec7594b0536005c
-rw-r--r--jeos/F18-i386-cfntools.tdl2
-rw-r--r--jeos/F18-x86_64-cfntools.tdl2
-rw-r--r--openshift-origin/F18-x86_64-openshift-origin-broker-cfntools.tdl2
-rw-r--r--openshift-origin/F18-x86_64-openshift-origin-node-cfntools.tdl2
4 files changed, 4 insertions, 4 deletions
diff --git a/jeos/F18-i386-cfntools.tdl b/jeos/F18-i386-cfntools.tdl
index 11c5f0f..39814b5 100644
--- a/jeos/F18-i386-cfntools.tdl
+++ b/jeos/F18-i386-cfntools.tdl
@@ -5,7 +5,7 @@
<version>18</version>
<arch>i386</arch>
<install type='iso'>
- <iso>file:/var/lib/libvirt/images/Fedora-18-i386-DVD.iso</iso>
+ <iso>file:/var/lib/libvirt/images/Fedora-18-i386-netinst.iso</iso>
</install>
</os>
<description>Fedora 18</description>
diff --git a/jeos/F18-x86_64-cfntools.tdl b/jeos/F18-x86_64-cfntools.tdl
index 103f513..9f8202b 100644
--- a/jeos/F18-x86_64-cfntools.tdl
+++ b/jeos/F18-x86_64-cfntools.tdl
@@ -5,7 +5,7 @@
<version>18</version>
<arch>x86_64</arch>
<install type='iso'>
- <iso>file:/var/lib/libvirt/images/Fedora-18-x86_64-DVD.iso</iso>
+ <iso>file:/var/lib/libvirt/images/Fedora-18-x86_64-netinst.iso</iso>
</install>
</os>
<description>Fedora 18</description>
diff --git a/openshift-origin/F18-x86_64-openshift-origin-broker-cfntools.tdl b/openshift-origin/F18-x86_64-openshift-origin-broker-cfntools.tdl
index 34bb610..a57c211 100644
--- a/openshift-origin/F18-x86_64-openshift-origin-broker-cfntools.tdl
+++ b/openshift-origin/F18-x86_64-openshift-origin-broker-cfntools.tdl
@@ -5,7 +5,7 @@
<version>18</version>
<arch>x86_64</arch>
<install type='iso'>
- <iso>file:/var/lib/libvirt/images/Fedora-18-x86_64-DVD.iso</iso>
+ <iso>file:/var/lib/libvirt/images/Fedora-18-x86_64-netinst.iso</iso>
</install>
</os>
<description>OpenShift Origin Broker</description>
diff --git a/openshift-origin/F18-x86_64-openshift-origin-node-cfntools.tdl b/openshift-origin/F18-x86_64-openshift-origin-node-cfntools.tdl
index 662fa56..dd5e4ef 100644
--- a/openshift-origin/F18-x86_64-openshift-origin-node-cfntools.tdl
+++ b/openshift-origin/F18-x86_64-openshift-origin-node-cfntools.tdl
@@ -5,7 +5,7 @@
<version>18</version>
<arch>x86_64</arch>
<install type='iso'>
- <iso>file:/var/lib/libvirt/images/Fedora-18-x86_64-DVD.iso</iso>
+ <iso>file:/var/lib/libvirt/images/Fedora-18-x86_64-netinst.iso</iso>
</install>
</os>
<description>OpenShift Origin Node</description>