From 24f40d5312fd6e92356936e22a1a5b8f4b3e04d5 Mon Sep 17 00:00:00 2001
From: Peter Belanyi <pbelanyi@redhat.com>
Date: Wed, 24 Sep 2014 07:51:13 -0400
Subject: Add converted version of block and object storage

This patch extends the previous 'Don't use merge.py for overcloud'
commit with the cinder-storage.yaml and swift-storage.yaml templates.

Requirements for this to deploy:

1. Block and object storage images have to be built
(overcloud-cinder-volume and overcloud-swift-storage)

2. The images have to be loaded by devtest_overcloud.sh
OVERCLOUD_CINDER_ID=$(load-image -d $TRIPLEO_ROOT/overcloud-cinder-volume.qcow2)
OVERCLOUD_SWIFT_ID=$(load-image -d $TRIPLEO_ROOT/overcloud-swift-storage.qcow2)

Change-Id: I45f9d9f051970a83e26c0fd924d7c98276958113
---
 compute.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'compute.yaml')

diff --git a/compute.yaml b/compute.yaml
index 350b5ec4..08e8153d 100644
--- a/compute.yaml
+++ b/compute.yaml
@@ -163,7 +163,7 @@ parameters:
     description: An OVS bridge to create for accessing external networks.
     type: string
   NeutronPublicInterface:
-    default: ''
+    default: eth0
     description: A port to add to the NeutronPhysicalBridge.
     type: string
   NeutronTunnelTypes:
-- 
cgit 1.2.3-korg