From: Robert Collins <rbtcollins@hp.com>
Date: Mon, 15 Jul 2013 01:54:58 +0000 (+1200)
Subject: Stop passing no longer honoured keys in.
X-Git-Tag: opnfv-6.0.0~2981
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=57706693ebdd4328f69db2ac462b56a9611b04d6;p=apex-tripleo-heat-templates.git

Stop passing no longer honoured keys in.

The undercloud (and boot-stack in general) no longer create baremetal
flavors or register baremetal ramdisks, so passing in keys for that
isn't needed.

Change-Id: I8c20e95f3a57418d7ae160a296a092cd71254e3d
---

diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index 9ba62854..5892d11f 100644
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -43,8 +43,6 @@ Resources:
         db: mysql://cinder:unset@localhost/cinder
         volume_size_mb: '5000'
       db-password: unset
-      dib:
-        ramdisk_elements: deploy
       glance:
         db: mysql://glance:unset@localhost/glance
         host: 127.0.0.1
@@ -85,7 +83,6 @@ Resources:
           ram_allocation_ratio: 1.0
           reserved_host_memory_mb: 0
         baremetal:
-          arch: i386
           db: mysql://nova:unset@localhost/nova_bm
           power_manager: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager
           pxe_deploy_timeout: 1200